From fcd2b34ca7fe86e306b7969eff1388f1096a639c Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Thu, 2 Sep 2021 13:18:53 +0300
Subject: [PATCH] validation: replace with requirementTelematic

---
 .../actions/calculate/validate/elements.ts    | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/validate/elements.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/validate/elements.ts
index a97087b..b6fa83e 100644
--- a/src/client/stores/CalculationStore/Effects/actions/calculate/validate/elements.ts
+++ b/src/client/stores/CalculationStore/Effects/actions/calculate/validate/elements.ts
@@ -81,35 +81,25 @@ const customConditions: TElements<ValidationCondition> = {
     }
     return { isValid: true };
   },
-  selectTracker: calculationStore => {
-    const { tracker, requirementTelematic } = calculationStore.getValues([
+
+  radioRequirementTelematic: calculationStore => {
+    const {
+      telematic,
+      tracker,
+      requirementTelematic,
+    } = calculationStore.getValues([
+      'telematic',
       'tracker',
       'requirementTelematic',
     ]);
-    if (requirementTelematic !== 100000004 && !tracker) {
+
+    if (requirementTelematic !== 100000004 && (!telematic || !tracker)) {
       return {
         isValid: false,
-        message: 'Не указан Тип средства контроля - Маяк',
+        message: 'Не указан Тип средства контроля: (Маяк или Телематика)',
       };
     }
-    return {
-      isValid: true,
-    };
-  },
-  selectTelematic: calculationStore => {
-    const { telematic, requirementTelematic } = calculationStore.getValues([
-      'telematic',
-      'requirementTelematic',
-    ]);
-    if (requirementTelematic !== 100000004 && !telematic) {
-      return {
-        isValid: false,
-        message: 'Не указан Тип средства контроля - Телематика',
-      };
-    }
-    return {
-      isValid: true,
-    };
+    return { isValid: true };
   },
 };