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 = { } 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 }; }, };