diff --git a/services/ui-src/src/measures/2023/AABAD/index.test.tsx b/services/ui-src/src/measures/2023/AABAD/index.test.tsx index 1c04339170..a955ffbafd 100644 --- a/services/ui-src/src/measures/2023/AABAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/AABAD/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -196,6 +198,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled(); expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled(); expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/AABAD/validation.ts b/services/ui-src/src/measures/2023/AABAD/validation.ts index 42ffb18a65..d6397be223 100644 --- a/services/ui-src/src/measures/2023/AABAD/validation.ts +++ b/services/ui-src/src/measures/2023/AABAD/validation.ts @@ -48,6 +48,8 @@ const AABADValidation = (data: FormData) => { ...GV.validateHedisYear(data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/AABCH/index.test.tsx b/services/ui-src/src/measures/2023/AABCH/index.test.tsx index f527373799..6f87b28c9e 100644 --- a/services/ui-src/src/measures/2023/AABCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/AABCH/index.test.tsx @@ -181,6 +181,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect( V.validateRequiredRadioButtonForCombinedRates ).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -201,6 +203,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); expect(V.validateRequiredRadioButtonForCombinedRates).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/AABCH/validation.ts b/services/ui-src/src/measures/2023/AABCH/validation.ts index 446b5d34f5..d414c3387b 100644 --- a/services/ui-src/src/measures/2023/AABCH/validation.ts +++ b/services/ui-src/src/measures/2023/AABCH/validation.ts @@ -47,6 +47,8 @@ const AABCHValidation = (data: FormData) => { PMD.qualifiers ), ...GV.validateRequiredRadioButtonForCombinedRates(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), // OMS Validations diff --git a/services/ui-src/src/measures/2023/ADDCH/index.test.tsx b/services/ui-src/src/measures/2023/ADDCH/index.test.tsx index 991b7e0046..b8c4142535 100644 --- a/services/ui-src/src/measures/2023/ADDCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/ADDCH/index.test.tsx @@ -185,6 +185,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { ).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateOneQualDenomHigherThanOtherDenomOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/ADDCH/validation.ts b/services/ui-src/src/measures/2023/ADDCH/validation.ts index 7028aae70d..ce41192a41 100644 --- a/services/ui-src/src/measures/2023/ADDCH/validation.ts +++ b/services/ui-src/src/measures/2023/ADDCH/validation.ts @@ -49,6 +49,8 @@ const ADDCHValidation = (data: FormData) => { didCalculationsDeviate, deviationReason ), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), // OMS Validations diff --git a/services/ui-src/src/measures/2023/AIFHH/index.test.tsx b/services/ui-src/src/measures/2023/AIFHH/index.test.tsx index fd021e4234..dfd40458f3 100644 --- a/services/ui-src/src/measures/2023/AIFHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/AIFHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.ComplexValidateNDRTotals).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -195,6 +197,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateAtLeastOneDataSource).toHaveBeenCalled(); expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled(); expect(V.ComplexValidateNDRTotals).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/AIFHH/validation.ts b/services/ui-src/src/measures/2023/AIFHH/validation.ts index 51da688428..446b8ea127 100644 --- a/services/ui-src/src/measures/2023/AIFHH/validation.ts +++ b/services/ui-src/src/measures/2023/AIFHH/validation.ts @@ -55,6 +55,8 @@ const AIFHHValidation = (data: FormData) => { ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.ComplexValidateDualPopInformation( diff --git a/services/ui-src/src/measures/2023/AMBCH/index.test.tsx b/services/ui-src/src/measures/2023/AMBCH/index.test.tsx index 97b5362989..6db0f41855 100644 --- a/services/ui-src/src/measures/2023/AMBCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/AMBCH/index.test.tsx @@ -184,6 +184,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -207,6 +209,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/AMBCH/validation.ts b/services/ui-src/src/measures/2023/AMBCH/validation.ts index 2ab3c9e2b6..d45078867a 100644 --- a/services/ui-src/src/measures/2023/AMBCH/validation.ts +++ b/services/ui-src/src/measures/2023/AMBCH/validation.ts @@ -32,6 +32,8 @@ const AMBCHValidation = (data: FormData) => { ...GV.validateHedisYear(data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/AMBHH/index.test.tsx b/services/ui-src/src/measures/2023/AMBHH/index.test.tsx index 507e61a9b7..0a20a0b932 100644 --- a/services/ui-src/src/measures/2023/AMBHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/AMBHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -202,6 +204,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/AMBHH/validation.ts b/services/ui-src/src/measures/2023/AMBHH/validation.ts index 968f484ed8..4eb3161c35 100644 --- a/services/ui-src/src/measures/2023/AMBHH/validation.ts +++ b/services/ui-src/src/measures/2023/AMBHH/validation.ts @@ -37,6 +37,9 @@ const AMBHHValidation = (data: FormData) => { ...GV.validateYearFormat(dateRange), ...GV.validateOPMRates(OPM), ...GV.validateHedisYear(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), + ...GV.validateAtLeastOneDefinitionOfPopulation(data), // Performance Measure Validations ...GV.validateAtLeastOneRateComplete( diff --git a/services/ui-src/src/measures/2023/AMMAD/index.test.tsx b/services/ui-src/src/measures/2023/AMMAD/index.test.tsx index 68d8cdedc4..8aa15d0ad7 100644 --- a/services/ui-src/src/measures/2023/AMMAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/AMMAD/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -205,6 +207,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/AMMAD/validation.ts b/services/ui-src/src/measures/2023/AMMAD/validation.ts index b4f8f09384..760aadf573 100644 --- a/services/ui-src/src/measures/2023/AMMAD/validation.ts +++ b/services/ui-src/src/measures/2023/AMMAD/validation.ts @@ -72,6 +72,8 @@ const AMMADValidation = (data: FormData) => { ...GV.validateHedisYear(data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/AMRAD/index.test.tsx b/services/ui-src/src/measures/2023/AMRAD/index.test.tsx index 7ae8b910f1..65cd920ad2 100644 --- a/services/ui-src/src/measures/2023/AMRAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/AMRAD/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/AMRAD/validation.ts b/services/ui-src/src/measures/2023/AMRAD/validation.ts index 576c3d442c..863b78105a 100644 --- a/services/ui-src/src/measures/2023/AMRAD/validation.ts +++ b/services/ui-src/src/measures/2023/AMRAD/validation.ts @@ -39,6 +39,8 @@ const AMRADValidation = (data: FormData) => { ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateNumeratorsLessThanDenominatorsPM( performanceMeasureArray, OPM, diff --git a/services/ui-src/src/measures/2023/AMRCH/index.test.tsx b/services/ui-src/src/measures/2023/AMRCH/index.test.tsx index 975fea054c..0f527ab1de 100644 --- a/services/ui-src/src/measures/2023/AMRCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/AMRCH/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -205,6 +207,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/AMRCH/validation.ts b/services/ui-src/src/measures/2023/AMRCH/validation.ts index 28d9c1fab9..cdca9d165e 100644 --- a/services/ui-src/src/measures/2023/AMRCH/validation.ts +++ b/services/ui-src/src/measures/2023/AMRCH/validation.ts @@ -39,6 +39,8 @@ const AMRCHValidation = (data: FormData) => { ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateNumeratorsLessThanDenominatorsPM( performanceMeasureArray, OPM, diff --git a/services/ui-src/src/measures/2023/APMCH/index.test.tsx b/services/ui-src/src/measures/2023/APMCH/index.test.tsx index fd23c84684..58e4214170 100644 --- a/services/ui-src/src/measures/2023/APMCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/APMCH/index.test.tsx @@ -184,6 +184,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -207,6 +209,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/APMCH/validation.ts b/services/ui-src/src/measures/2023/APMCH/validation.ts index 992f80f2d4..1e94789dc6 100644 --- a/services/ui-src/src/measures/2023/APMCH/validation.ts +++ b/services/ui-src/src/measures/2023/APMCH/validation.ts @@ -44,6 +44,8 @@ const APMCHValidation = (data: FormData) => { ), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateNumeratorsLessThanDenominatorsPM( performanceMeasureArray, OPM, diff --git a/services/ui-src/src/measures/2023/APPCH/index.test.tsx b/services/ui-src/src/measures/2023/APPCH/index.test.tsx index 35516c4ce2..55a0f2a15a 100644 --- a/services/ui-src/src/measures/2023/APPCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/APPCH/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -205,6 +207,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/APPCH/validation.ts b/services/ui-src/src/measures/2023/APPCH/validation.ts index f0a7058416..f1f840502c 100644 --- a/services/ui-src/src/measures/2023/APPCH/validation.ts +++ b/services/ui-src/src/measures/2023/APPCH/validation.ts @@ -45,6 +45,8 @@ const APPCHValidation = (data: FormData) => { ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/BCSAD/index.test.tsx b/services/ui-src/src/measures/2023/BCSAD/index.test.tsx index 51aa32fc0d..e881b96eae 100644 --- a/services/ui-src/src/measures/2023/BCSAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/BCSAD/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -200,6 +202,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/BCSAD/validation.ts b/services/ui-src/src/measures/2023/BCSAD/validation.ts index 4d2efebed0..c5c3155175 100644 --- a/services/ui-src/src/measures/2023/BCSAD/validation.ts +++ b/services/ui-src/src/measures/2023/BCSAD/validation.ts @@ -41,6 +41,8 @@ const BCSValidation = (data: FormData) => { ), ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups), ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), // OMS Validations diff --git a/services/ui-src/src/measures/2023/CBPAD/index.test.tsx b/services/ui-src/src/measures/2023/CBPAD/index.test.tsx index 7442acd603..8fd0c7ed8b 100644 --- a/services/ui-src/src/measures/2023/CBPAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/CBPAD/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -200,6 +202,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CBPAD/validation.ts b/services/ui-src/src/measures/2023/CBPAD/validation.ts index 5b3401c7ee..5b99eb23fe 100644 --- a/services/ui-src/src/measures/2023/CBPAD/validation.ts +++ b/services/ui-src/src/measures/2023/CBPAD/validation.ts @@ -49,6 +49,8 @@ const CBPValidation = (data: FormData) => { ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateOPMRates(OPM), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.omsValidations({ diff --git a/services/ui-src/src/measures/2023/CBPHH/index.test.tsx b/services/ui-src/src/measures/2023/CBPHH/index.test.tsx index 63e460527d..ec8fc61103 100644 --- a/services/ui-src/src/measures/2023/CBPHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/CBPHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CBPHH/validation.ts b/services/ui-src/src/measures/2023/CBPHH/validation.ts index 8e00182ab8..52e09064a1 100644 --- a/services/ui-src/src/measures/2023/CBPHH/validation.ts +++ b/services/ui-src/src/measures/2023/CBPHH/validation.ts @@ -50,6 +50,8 @@ const CBPValidation = (data: FormData) => { ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateTotalNDR(performanceMeasureArray), ...GV.omsValidations({ diff --git a/services/ui-src/src/measures/2023/CCPAD/index.test.tsx b/services/ui-src/src/measures/2023/CCPAD/index.test.tsx index f7ca541144..fa946f9c26 100644 --- a/services/ui-src/src/measures/2023/CCPAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/CCPAD/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CCPAD/validation.ts b/services/ui-src/src/measures/2023/CCPAD/validation.ts index ebcefd165e..a2aa467d20 100644 --- a/services/ui-src/src/measures/2023/CCPAD/validation.ts +++ b/services/ui-src/src/measures/2023/CCPAD/validation.ts @@ -48,6 +48,8 @@ const CCPADValidation = (data: FormData) => { ), ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data), ...GV.validateRequiredRadioButtonForCombinedRates(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), // OMS Specific Validations diff --git a/services/ui-src/src/measures/2023/CCPCH/index.test.tsx b/services/ui-src/src/measures/2023/CCPCH/index.test.tsx index 9ef7e7e90e..5e02ef16ce 100644 --- a/services/ui-src/src/measures/2023/CCPCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/CCPCH/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -207,6 +209,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CCPCH/validation.ts b/services/ui-src/src/measures/2023/CCPCH/validation.ts index 1a00e7f138..b05831d0b9 100644 --- a/services/ui-src/src/measures/2023/CCPCH/validation.ts +++ b/services/ui-src/src/measures/2023/CCPCH/validation.ts @@ -34,6 +34,8 @@ const CCPCHValidation = (data: FormData) => { ...GV.validateEqualCategoryDenominatorsPM(data, PMD.categories), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/CCSAD/index.test.tsx b/services/ui-src/src/measures/2023/CCSAD/index.test.tsx index 30c965706c..a822d7ee9d 100644 --- a/services/ui-src/src/measures/2023/CCSAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/CCSAD/index.test.tsx @@ -179,6 +179,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -197,6 +199,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CCSAD/validation.ts b/services/ui-src/src/measures/2023/CCSAD/validation.ts index a5ffdfa8c6..49872bc58f 100644 --- a/services/ui-src/src/measures/2023/CCSAD/validation.ts +++ b/services/ui-src/src/measures/2023/CCSAD/validation.ts @@ -63,6 +63,8 @@ const CCSADValidation = (data: FormData) => { ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ]; diff --git a/services/ui-src/src/measures/2023/CCWAD/index.test.tsx b/services/ui-src/src/measures/2023/CCWAD/index.test.tsx index 85be247df9..cbc53929e1 100644 --- a/services/ui-src/src/measures/2023/CCWAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/CCWAD/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -205,6 +207,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CCWAD/validation.ts b/services/ui-src/src/measures/2023/CCWAD/validation.ts index c604f0cd14..81c0d6f212 100644 --- a/services/ui-src/src/measures/2023/CCWAD/validation.ts +++ b/services/ui-src/src/measures/2023/CCWAD/validation.ts @@ -38,6 +38,8 @@ const CCWADValidation = (data: FormData) => { ...GV.validateEqualCategoryDenominatorsPM(data, PMD.categories, ageGroups), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateDateRangeRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), diff --git a/services/ui-src/src/measures/2023/CCWCH/index.test.tsx b/services/ui-src/src/measures/2023/CCWCH/index.test.tsx index 874d22dcb5..f1368233a7 100644 --- a/services/ui-src/src/measures/2023/CCWCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/CCWCH/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualPM).not.toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualPM).toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CCWCH/validation.ts b/services/ui-src/src/measures/2023/CCWCH/validation.ts index e2e65ac52c..5e7208a4ce 100644 --- a/services/ui-src/src/measures/2023/CCWCH/validation.ts +++ b/services/ui-src/src/measures/2023/CCWCH/validation.ts @@ -37,6 +37,8 @@ const CCWCHValidation = (data: FormData) => { ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups), ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateOneQualRateHigherThanOtherQualPM(data, PMD), ...GV.omsValidations({ data, diff --git a/services/ui-src/src/measures/2023/CDFAD/index.test.tsx b/services/ui-src/src/measures/2023/CDFAD/index.test.tsx index aa7a88220f..c1da553465 100644 --- a/services/ui-src/src/measures/2023/CDFAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/CDFAD/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -200,6 +202,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CDFAD/validation.ts b/services/ui-src/src/measures/2023/CDFAD/validation.ts index db8f684223..f75f0ce025 100644 --- a/services/ui-src/src/measures/2023/CDFAD/validation.ts +++ b/services/ui-src/src/measures/2023/CDFAD/validation.ts @@ -49,6 +49,8 @@ const CDFADValidation = (data: FormData) => { ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.omsValidations({ data, diff --git a/services/ui-src/src/measures/2023/CDFCH/index.test.tsx b/services/ui-src/src/measures/2023/CDFCH/index.test.tsx index 6c3d7f4f64..c816bf9a77 100644 --- a/services/ui-src/src/measures/2023/CDFCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/CDFCH/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualPM).not.toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualPM).not.toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CDFCH/validation.ts b/services/ui-src/src/measures/2023/CDFCH/validation.ts index 1b5d43d5bf..341f52290f 100644 --- a/services/ui-src/src/measures/2023/CDFCH/validation.ts +++ b/services/ui-src/src/measures/2023/CDFCH/validation.ts @@ -49,6 +49,8 @@ const CDFCHValidation = (data: FormData) => { ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.omsValidations({ data, diff --git a/services/ui-src/src/measures/2023/CDFHH/index.test.tsx b/services/ui-src/src/measures/2023/CDFHH/index.test.tsx index 1361dd64fa..d891368785 100644 --- a/services/ui-src/src/measures/2023/CDFHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/CDFHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CDFHH/validation.ts b/services/ui-src/src/measures/2023/CDFHH/validation.ts index 9f35094144..3cb77e920d 100644 --- a/services/ui-src/src/measures/2023/CDFHH/validation.ts +++ b/services/ui-src/src/measures/2023/CDFHH/validation.ts @@ -35,6 +35,8 @@ const CDFHHValidation = (data: FormData) => { ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), // Performance Measure Validations diff --git a/services/ui-src/src/measures/2023/CHLAD/index.test.tsx b/services/ui-src/src/measures/2023/CHLAD/index.test.tsx index 10d3027a07..4d87adbe95 100644 --- a/services/ui-src/src/measures/2023/CHLAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/CHLAD/index.test.tsx @@ -179,6 +179,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -198,6 +200,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CHLAD/validation.ts b/services/ui-src/src/measures/2023/CHLAD/validation.ts index b29ce05850..bd21bd820d 100644 --- a/services/ui-src/src/measures/2023/CHLAD/validation.ts +++ b/services/ui-src/src/measures/2023/CHLAD/validation.ts @@ -41,6 +41,8 @@ const CHLValidation = (data: FormData) => { ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateOPMRates(OPM), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.omsValidations({ diff --git a/services/ui-src/src/measures/2023/CHLCH/index.test.tsx b/services/ui-src/src/measures/2023/CHLCH/index.test.tsx index eab55c2c0e..75cc936e9c 100644 --- a/services/ui-src/src/measures/2023/CHLCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/CHLCH/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualPM).not.toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualPM).not.toHaveBeenCalled(); expect(V.validateOneQualRateHigherThanOtherQualOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CHLCH/validation.ts b/services/ui-src/src/measures/2023/CHLCH/validation.ts index bfdc9e5bf6..7352f40d28 100644 --- a/services/ui-src/src/measures/2023/CHLCH/validation.ts +++ b/services/ui-src/src/measures/2023/CHLCH/validation.ts @@ -41,6 +41,8 @@ const CHLValidation = (data: FormData) => { ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateOPMRates(OPM), ...GV.omsValidations({ diff --git a/services/ui-src/src/measures/2023/CISCH/index.test.tsx b/services/ui-src/src/measures/2023/CISCH/index.test.tsx index 4c7845f408..aacf48e189 100644 --- a/services/ui-src/src/measures/2023/CISCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/CISCH/index.test.tsx @@ -185,6 +185,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateOneQualRateHigherThanOtherQualOMS).not.toHaveBeenCalled(); expect(V.validateEqualCategoryDenominatorsPM).not.toHaveBeenCalled(); expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -209,6 +211,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateOneQualRateHigherThanOtherQualOMS).not.toHaveBeenCalled(); expect(V.validateEqualCategoryDenominatorsPM).toHaveBeenCalled(); expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CISCH/validation.ts b/services/ui-src/src/measures/2023/CISCH/validation.ts index 60dcd8ca1e..e203580703 100644 --- a/services/ui-src/src/measures/2023/CISCH/validation.ts +++ b/services/ui-src/src/measures/2023/CISCH/validation.ts @@ -51,6 +51,8 @@ const CISCHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateNumeratorsLessThanDenominatorsPM( performanceMeasureArray, OPM, diff --git a/services/ui-src/src/measures/2023/COBAD/index.test.tsx b/services/ui-src/src/measures/2023/COBAD/index.test.tsx index 1388aa22cd..f35d134c0e 100644 --- a/services/ui-src/src/measures/2023/COBAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/COBAD/index.test.tsx @@ -181,6 +181,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -202,6 +204,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/COBAD/validation.ts b/services/ui-src/src/measures/2023/COBAD/validation.ts index cff1c0afdd..631fd3ab91 100644 --- a/services/ui-src/src/measures/2023/COBAD/validation.ts +++ b/services/ui-src/src/measures/2023/COBAD/validation.ts @@ -48,6 +48,8 @@ const COBADValidation = (data: FormData) => { ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), ...GV.validateDateRangeRadioButtonCompletion(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateOPMRates(OPM), diff --git a/services/ui-src/src/measures/2023/COLAD/index.test.tsx b/services/ui-src/src/measures/2023/COLAD/index.test.tsx index 5345a97253..9ac017a549 100644 --- a/services/ui-src/src/measures/2023/COLAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/COLAD/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -200,6 +202,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/COLAD/validation.ts b/services/ui-src/src/measures/2023/COLAD/validation.ts index 857e54cf0e..b4fc0c6334 100644 --- a/services/ui-src/src/measures/2023/COLAD/validation.ts +++ b/services/ui-src/src/measures/2023/COLAD/validation.ts @@ -48,6 +48,8 @@ const COLADValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), ...GV.validateDateRangeRadioButtonCompletion(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), diff --git a/services/ui-src/src/measures/2023/COLHH/index.test.tsx b/services/ui-src/src/measures/2023/COLHH/index.test.tsx index ec28ffde9c..59b64a2544 100644 --- a/services/ui-src/src/measures/2023/COLHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/COLHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/COLHH/validation.ts b/services/ui-src/src/measures/2023/COLHH/validation.ts index 77aacb8257..f8c7da4c2e 100644 --- a/services/ui-src/src/measures/2023/COLHH/validation.ts +++ b/services/ui-src/src/measures/2023/COLHH/validation.ts @@ -52,6 +52,8 @@ const COLHHValidation = (data: FormData) => { ...GV.validateYearFormat(dateRange), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateHedisYear(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateOPMRates(OPM), ...GV.omsValidations({ data, diff --git a/services/ui-src/src/measures/2023/CPUAD/index.test.tsx b/services/ui-src/src/measures/2023/CPUAD/index.test.tsx index 313bec501c..8c12082855 100644 --- a/services/ui-src/src/measures/2023/CPUAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/CPUAD/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled(); expect(V.validateOneCatRateHigherThanOtherCatPM).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -198,6 +200,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled(); expect(V.validateOneCatRateHigherThanOtherCatPM).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/CPUAD/validation.ts b/services/ui-src/src/measures/2023/CPUAD/validation.ts index 7f31094f58..8ac39ce29b 100644 --- a/services/ui-src/src/measures/2023/CPUAD/validation.ts +++ b/services/ui-src/src/measures/2023/CPUAD/validation.ts @@ -36,7 +36,8 @@ const CPUADValidation = (data: FormData) => { ...GV.validateRateZeroPM(performanceMeasureArray, OPM, carePlans, data), ...GV.validateEqualCategoryDenominatorsPM(data, PMD.categories, carePlans), ...GV.validateOneQualRateHigherThanOtherQualPM(data, PMD), - + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateRequiredRadioButtonForCombinedRates(data), ...GV.validateDateRangeRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), diff --git a/services/ui-src/src/measures/2023/DEVCH/index.test.tsx b/services/ui-src/src/measures/2023/DEVCH/index.test.tsx index 24c0df22f9..9555daa442 100644 --- a/services/ui-src/src/measures/2023/DEVCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/DEVCH/index.test.tsx @@ -187,6 +187,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -213,6 +215,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/DEVCH/validation.ts b/services/ui-src/src/measures/2023/DEVCH/validation.ts index 9d7dca2793..d003c0ee01 100644 --- a/services/ui-src/src/measures/2023/DEVCH/validation.ts +++ b/services/ui-src/src/measures/2023/DEVCH/validation.ts @@ -52,6 +52,8 @@ const DEVCHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/FUAAD/index.test.tsx b/services/ui-src/src/measures/2023/FUAAD/index.test.tsx index 9a736fc31f..eb1a7f10b3 100644 --- a/services/ui-src/src/measures/2023/FUAAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/FUAAD/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/FUAAD/validation.ts b/services/ui-src/src/measures/2023/FUAAD/validation.ts index 7a1ca6e8c6..79be820860 100644 --- a/services/ui-src/src/measures/2023/FUAAD/validation.ts +++ b/services/ui-src/src/measures/2023/FUAAD/validation.ts @@ -51,6 +51,8 @@ const FUAADValidation = (data: FormData) => { ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data), ...GV.validateRequiredRadioButtonForCombinedRates(data), ...GV.validateDateRangeRadioButtonCompletion(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), diff --git a/services/ui-src/src/measures/2023/FUACH/index.test.tsx b/services/ui-src/src/measures/2023/FUACH/index.test.tsx index f8fb7cebb4..57ac5f4650 100644 --- a/services/ui-src/src/measures/2023/FUACH/index.test.tsx +++ b/services/ui-src/src/measures/2023/FUACH/index.test.tsx @@ -187,6 +187,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -213,6 +215,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/FUACH/validation.ts b/services/ui-src/src/measures/2023/FUACH/validation.ts index daaf22d78d..710c1055d7 100644 --- a/services/ui-src/src/measures/2023/FUACH/validation.ts +++ b/services/ui-src/src/measures/2023/FUACH/validation.ts @@ -45,6 +45,8 @@ const FUACHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/FUAHH/index.test.tsx b/services/ui-src/src/measures/2023/FUAHH/index.test.tsx index 89916377cd..85ae8bcf11 100644 --- a/services/ui-src/src/measures/2023/FUAHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/FUAHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/FUAHH/validation.ts b/services/ui-src/src/measures/2023/FUAHH/validation.ts index 52a528c23a..8fc30e5513 100644 --- a/services/ui-src/src/measures/2023/FUAHH/validation.ts +++ b/services/ui-src/src/measures/2023/FUAHH/validation.ts @@ -34,6 +34,8 @@ const FUAHHValidation = (data: FormData) => { ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateOPMRates(OPM), ...GV.validateAtLeastOneRateComplete( performanceMeasureArray, diff --git a/services/ui-src/src/measures/2023/FUHAD/index.test.tsx b/services/ui-src/src/measures/2023/FUHAD/index.test.tsx index 86f4fb85ee..68e6cc0b83 100644 --- a/services/ui-src/src/measures/2023/FUHAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/FUHAD/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/FUHAD/validation.ts b/services/ui-src/src/measures/2023/FUHAD/validation.ts index 54fb888280..ed225baa3a 100644 --- a/services/ui-src/src/measures/2023/FUHAD/validation.ts +++ b/services/ui-src/src/measures/2023/FUHAD/validation.ts @@ -63,6 +63,8 @@ const FUHValidation = (data: FormData) => { ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), ...GV.validateRequiredRadioButtonForCombinedRates(data), ...GV.validateDateRangeRadioButtonCompletion(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), diff --git a/services/ui-src/src/measures/2023/FUHCH/index.test.tsx b/services/ui-src/src/measures/2023/FUHCH/index.test.tsx index 330a83e447..6f174c5a12 100644 --- a/services/ui-src/src/measures/2023/FUHCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/FUHCH/index.test.tsx @@ -187,6 +187,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -213,6 +215,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/FUHCH/validation.ts b/services/ui-src/src/measures/2023/FUHCH/validation.ts index cc2ad07f85..b1f4478783 100644 --- a/services/ui-src/src/measures/2023/FUHCH/validation.ts +++ b/services/ui-src/src/measures/2023/FUHCH/validation.ts @@ -64,6 +64,8 @@ const FUHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/FUHHH/index.test.tsx b/services/ui-src/src/measures/2023/FUHHH/index.test.tsx index e02c5ba0aa..174012b110 100644 --- a/services/ui-src/src/measures/2023/FUHHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/FUHHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/FUHHH/validation.ts b/services/ui-src/src/measures/2023/FUHHH/validation.ts index 270d0002c3..a5e43b9315 100644 --- a/services/ui-src/src/measures/2023/FUHHH/validation.ts +++ b/services/ui-src/src/measures/2023/FUHHH/validation.ts @@ -44,6 +44,8 @@ const FUHHHValidation = (data: FormData) => { ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), // Performance Measure Validations ...GV.validateDualPopInformationPM( performanceMeasureArray, diff --git a/services/ui-src/src/measures/2023/FUMAD/index.test.tsx b/services/ui-src/src/measures/2023/FUMAD/index.test.tsx index 10a7781433..688ce2c007 100644 --- a/services/ui-src/src/measures/2023/FUMAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/FUMAD/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/FUMAD/validation.ts b/services/ui-src/src/measures/2023/FUMAD/validation.ts index 5014cac85c..02e4294940 100644 --- a/services/ui-src/src/measures/2023/FUMAD/validation.ts +++ b/services/ui-src/src/measures/2023/FUMAD/validation.ts @@ -54,6 +54,8 @@ const FUMADValidation = (data: FormData) => { ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateDateRangeRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), diff --git a/services/ui-src/src/measures/2023/FUMCH/index.test.tsx b/services/ui-src/src/measures/2023/FUMCH/index.test.tsx index fecb44707b..23bba63999 100644 --- a/services/ui-src/src/measures/2023/FUMCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/FUMCH/index.test.tsx @@ -187,6 +187,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -213,6 +215,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/FUMCH/validation.ts b/services/ui-src/src/measures/2023/FUMCH/validation.ts index 23ad3834de..f7d83be7bf 100644 --- a/services/ui-src/src/measures/2023/FUMCH/validation.ts +++ b/services/ui-src/src/measures/2023/FUMCH/validation.ts @@ -63,6 +63,8 @@ const FUMCHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/FUMHH/index.test.tsx b/services/ui-src/src/measures/2023/FUMHH/index.test.tsx index 7dc2693d2c..0af82b6680 100644 --- a/services/ui-src/src/measures/2023/FUMHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/FUMHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/FUMHH/validation.ts b/services/ui-src/src/measures/2023/FUMHH/validation.ts index f2f9d2461f..dfb8a0d92c 100644 --- a/services/ui-src/src/measures/2023/FUMHH/validation.ts +++ b/services/ui-src/src/measures/2023/FUMHH/validation.ts @@ -38,6 +38,8 @@ const FUMHHValidation = (data: FormData) => { ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), // Performance Measure Validations diff --git a/services/ui-src/src/measures/2023/FVAAD/index.test.tsx b/services/ui-src/src/measures/2023/FVAAD/index.test.tsx index db1e95f6c0..8274b56d57 100644 --- a/services/ui-src/src/measures/2023/FVAAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/FVAAD/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -205,6 +207,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); }); jest.setTimeout(15000); diff --git a/services/ui-src/src/measures/2023/FVAAD/validation.ts b/services/ui-src/src/measures/2023/FVAAD/validation.ts index a14400e370..f3c9b62f9a 100644 --- a/services/ui-src/src/measures/2023/FVAAD/validation.ts +++ b/services/ui-src/src/measures/2023/FVAAD/validation.ts @@ -40,6 +40,8 @@ const FVAADValidation = (data: FormData) => { ...GV.validateYearFormat(dateRange), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), ...GV.validateOPMRates(OPM), diff --git a/services/ui-src/src/measures/2023/HBDAD/index.test.tsx b/services/ui-src/src/measures/2023/HBDAD/index.test.tsx index dd019de680..e5dfabb3c5 100644 --- a/services/ui-src/src/measures/2023/HBDAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/HBDAD/index.test.tsx @@ -179,6 +179,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -198,6 +200,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/HBDAD/validation.ts b/services/ui-src/src/measures/2023/HBDAD/validation.ts index b7b64600ac..9bcbe07370 100644 --- a/services/ui-src/src/measures/2023/HBDAD/validation.ts +++ b/services/ui-src/src/measures/2023/HBDAD/validation.ts @@ -59,6 +59,8 @@ const HBDADValidation = (data: FormData) => { ), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateNumeratorsLessThanDenominatorsPM( performanceMeasureArray, OPM, diff --git a/services/ui-src/src/measures/2023/HPCMIAD/index.test.tsx b/services/ui-src/src/measures/2023/HPCMIAD/index.test.tsx index 4683949099..b1b017e27b 100644 --- a/services/ui-src/src/measures/2023/HPCMIAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/HPCMIAD/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateDualPopInformationPM).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -200,6 +202,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateDualPopInformationPM).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/HPCMIAD/validation.ts b/services/ui-src/src/measures/2023/HPCMIAD/validation.ts index 5d9577ddb0..9c3af98875 100644 --- a/services/ui-src/src/measures/2023/HPCMIAD/validation.ts +++ b/services/ui-src/src/measures/2023/HPCMIAD/validation.ts @@ -51,6 +51,8 @@ const HPCMIADValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/HVLAD/index.test.tsx b/services/ui-src/src/measures/2023/HVLAD/index.test.tsx index 26c37650eb..da573cfbc0 100644 --- a/services/ui-src/src/measures/2023/HVLAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/HVLAD/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/HVLAD/validation.ts b/services/ui-src/src/measures/2023/HVLAD/validation.ts index 985e19796c..15d412dc49 100644 --- a/services/ui-src/src/measures/2023/HVLAD/validation.ts +++ b/services/ui-src/src/measures/2023/HVLAD/validation.ts @@ -66,6 +66,8 @@ const HVLADValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/IETAD/index.test.tsx b/services/ui-src/src/measures/2023/IETAD/index.test.tsx index 3d2d3ccb9b..3336e908f8 100644 --- a/services/ui-src/src/measures/2023/IETAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/IETAD/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsPM).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -206,6 +208,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsPM).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/IETAD/validation.ts b/services/ui-src/src/measures/2023/IETAD/validation.ts index 7beebdce7f..b4393d3094 100644 --- a/services/ui-src/src/measures/2023/IETAD/validation.ts +++ b/services/ui-src/src/measures/2023/IETAD/validation.ts @@ -101,6 +101,8 @@ const IETValidation = (data: FormData) => { ...GV.validateOPMRates(OPM), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/IETHH/index.test.tsx b/services/ui-src/src/measures/2023/IETHH/index.test.tsx index 58c5585a21..7eda7c9508 100644 --- a/services/ui-src/src/measures/2023/IETHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/IETHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/IETHH/validation.ts b/services/ui-src/src/measures/2023/IETHH/validation.ts index 0d59db6a64..63bba4e43e 100644 --- a/services/ui-src/src/measures/2023/IETHH/validation.ts +++ b/services/ui-src/src/measures/2023/IETHH/validation.ts @@ -102,6 +102,8 @@ const IETValidation = (data: FormData) => { ...GV.validateOPMRates(OPM), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/IMACH/index.test.tsx b/services/ui-src/src/measures/2023/IMACH/index.test.tsx index 28024ac0f1..857aa575ea 100644 --- a/services/ui-src/src/measures/2023/IMACH/index.test.tsx +++ b/services/ui-src/src/measures/2023/IMACH/index.test.tsx @@ -187,6 +187,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -213,6 +215,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/IMACH/validation.ts b/services/ui-src/src/measures/2023/IMACH/validation.ts index d0aa7bbb2d..b6e78ab78b 100644 --- a/services/ui-src/src/measures/2023/IMACH/validation.ts +++ b/services/ui-src/src/measures/2023/IMACH/validation.ts @@ -53,6 +53,8 @@ const DEVCHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/IUHH/index.test.tsx b/services/ui-src/src/measures/2023/IUHH/index.test.tsx index 3c120c95ce..928fa2d467 100644 --- a/services/ui-src/src/measures/2023/IUHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/IUHH/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.ComplexValidateNDRTotals).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -193,6 +195,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateAtLeastOneDataSource).toHaveBeenCalled(); expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled(); expect(V.ComplexValidateNDRTotals).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/IUHH/validation.ts b/services/ui-src/src/measures/2023/IUHH/validation.ts index 7c718513ba..0001f1c3ef 100644 --- a/services/ui-src/src/measures/2023/IUHH/validation.ts +++ b/services/ui-src/src/measures/2023/IUHH/validation.ts @@ -49,6 +49,8 @@ const IUHHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateDateRangeRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), diff --git a/services/ui-src/src/measures/2023/LSCCH/index.test.tsx b/services/ui-src/src/measures/2023/LSCCH/index.test.tsx index b06d9fecaf..2390a560df 100644 --- a/services/ui-src/src/measures/2023/LSCCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/LSCCH/index.test.tsx @@ -190,6 +190,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -216,6 +218,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/LSCCH/validation.ts b/services/ui-src/src/measures/2023/LSCCH/validation.ts index 3b0e3390f8..a5afe6f26f 100644 --- a/services/ui-src/src/measures/2023/LSCCH/validation.ts +++ b/services/ui-src/src/measures/2023/LSCCH/validation.ts @@ -26,6 +26,8 @@ const LSCCHValidation = (data: FormData) => { ...GV.validateHedisYear(data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/MSCAD/index.test.tsx b/services/ui-src/src/measures/2023/MSCAD/index.test.tsx index 6aa7ec5473..ae5bb0d25b 100644 --- a/services/ui-src/src/measures/2023/MSCAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/MSCAD/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -200,6 +202,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/MSCAD/validation.ts b/services/ui-src/src/measures/2023/MSCAD/validation.ts index a39e5eb114..0c7769fb59 100644 --- a/services/ui-src/src/measures/2023/MSCAD/validation.ts +++ b/services/ui-src/src/measures/2023/MSCAD/validation.ts @@ -50,6 +50,8 @@ const MSCADValidation = (data: Types.DefaultFormData) => { ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/OEVCH/index.test.tsx b/services/ui-src/src/measures/2023/OEVCH/index.test.tsx index a867fd1d7b..1848b476df 100644 --- a/services/ui-src/src/measures/2023/OEVCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/OEVCH/index.test.tsx @@ -187,6 +187,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -213,6 +215,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/OEVCH/validation.ts b/services/ui-src/src/measures/2023/OEVCH/validation.ts index b7f8d2c625..6b2dddf615 100644 --- a/services/ui-src/src/measures/2023/OEVCH/validation.ts +++ b/services/ui-src/src/measures/2023/OEVCH/validation.ts @@ -31,6 +31,8 @@ const OEVCHValidation = (data: FormData) => { deviationReason ), ...GV.validateRequiredRadioButtonForCombinedRates(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), // Performance Measure Validations ...GV.validateAtLeastOneRateComplete( diff --git a/services/ui-src/src/measures/2023/OHDAD/index.test.tsx b/services/ui-src/src/measures/2023/OHDAD/index.test.tsx index 8a4f6410af..d7b4a01b5a 100644 --- a/services/ui-src/src/measures/2023/OHDAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/OHDAD/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/OHDAD/validation.ts b/services/ui-src/src/measures/2023/OHDAD/validation.ts index 2d7c31f29e..30dac90929 100644 --- a/services/ui-src/src/measures/2023/OHDAD/validation.ts +++ b/services/ui-src/src/measures/2023/OHDAD/validation.ts @@ -49,6 +49,8 @@ const OHDValidation = (data: FormData) => { ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.omsValidations({ data, qualifiers: PMD.qualifiers, diff --git a/services/ui-src/src/measures/2023/OUDAD/index.test.tsx b/services/ui-src/src/measures/2023/OUDAD/index.test.tsx index 20b0500af3..85a89f7c68 100644 --- a/services/ui-src/src/measures/2023/OUDAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/OUDAD/index.test.tsx @@ -185,6 +185,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsPM).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -209,6 +211,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsPM).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); expect(V.validateEqualCategoryDenominatorsOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/OUDAD/validation.ts b/services/ui-src/src/measures/2023/OUDAD/validation.ts index 94ff016d98..88e7db8153 100644 --- a/services/ui-src/src/measures/2023/OUDAD/validation.ts +++ b/services/ui-src/src/measures/2023/OUDAD/validation.ts @@ -45,6 +45,8 @@ const OUDValidation = (data: FormData) => { ...GV.validateRequiredRadioButtonForCombinedRates(data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateEqualCategoryDenominatorsPM(data, PMD.categories, ageGroups), ...GV.omsValidations({ data, diff --git a/services/ui-src/src/measures/2023/OUDHH/index.test.tsx b/services/ui-src/src/measures/2023/OUDHH/index.test.tsx index 6356369312..e852fe3135 100644 --- a/services/ui-src/src/measures/2023/OUDHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/OUDHH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/OUDHH/validation.ts b/services/ui-src/src/measures/2023/OUDHH/validation.ts index b36e564e2c..d71ceec7c9 100644 --- a/services/ui-src/src/measures/2023/OUDHH/validation.ts +++ b/services/ui-src/src/measures/2023/OUDHH/validation.ts @@ -44,6 +44,8 @@ const OUDValidation = (data: FormData) => { ...GV.validateRequiredRadioButtonForCombinedRates(data), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateEqualCategoryDenominatorsPM(data, PMD.categories, ageGroups), ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups), diff --git a/services/ui-src/src/measures/2023/PCRAD/index.test.tsx b/services/ui-src/src/measures/2023/PCRAD/index.test.tsx index a617e8b23e..0f0b2ef4ac 100644 --- a/services/ui-src/src/measures/2023/PCRAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/PCRAD/index.test.tsx @@ -181,6 +181,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.PCRnoNonZeroNumOrDenom).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -201,6 +203,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.PCRnoNonZeroNumOrDenom).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/PCRAD/validation.ts b/services/ui-src/src/measures/2023/PCRAD/validation.ts index ba2d0178d6..af45287193 100644 --- a/services/ui-src/src/measures/2023/PCRAD/validation.ts +++ b/services/ui-src/src/measures/2023/PCRAD/validation.ts @@ -54,6 +54,8 @@ const PCRADValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), // Performance Measure Validations ...GV.PCRatLeastOneRateComplete(performanceMeasureArray, OPM, ageGroups), diff --git a/services/ui-src/src/measures/2023/PCRHH/index.test.tsx b/services/ui-src/src/measures/2023/PCRHH/index.test.tsx index 07ecbb845e..2e72ddcfb3 100644 --- a/services/ui-src/src/measures/2023/PCRHH/index.test.tsx +++ b/services/ui-src/src/measures/2023/PCRHH/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.ComplexValidateNDRTotals).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -193,6 +195,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateAtLeastOneDataSource).toHaveBeenCalled(); expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled(); expect(V.ComplexValidateNDRTotals).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/PCRHH/validation.ts b/services/ui-src/src/measures/2023/PCRHH/validation.ts index c6b7e429e8..ed8c03098a 100644 --- a/services/ui-src/src/measures/2023/PCRHH/validation.ts +++ b/services/ui-src/src/measures/2023/PCRHH/validation.ts @@ -53,6 +53,9 @@ const PCRHHValidation = (data: FormData) => { ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), + ...GV.validateAtLeastOneDefinitionOfPopulation(data), // Performance Measure Validations ...GV.PCRatLeastOneRateComplete(performanceMeasureArray, OPM, ageGroups), diff --git a/services/ui-src/src/measures/2023/PPCAD/index.test.tsx b/services/ui-src/src/measures/2023/PPCAD/index.test.tsx index 95c0a11e9e..8de7f05df3 100644 --- a/services/ui-src/src/measures/2023/PPCAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/PPCAD/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/PPCAD/validation.ts b/services/ui-src/src/measures/2023/PPCAD/validation.ts index 7f1520b6de..3ab20c8f50 100644 --- a/services/ui-src/src/measures/2023/PPCAD/validation.ts +++ b/services/ui-src/src/measures/2023/PPCAD/validation.ts @@ -50,6 +50,8 @@ const PPCADValidation = (data: FormData) => { ), ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateNumeratorsLessThanDenominatorsPM( performanceMeasureArray, OPM, diff --git a/services/ui-src/src/measures/2023/PPCCH/index.test.tsx b/services/ui-src/src/measures/2023/PPCCH/index.test.tsx index 87fa13035c..0fca5d23db 100644 --- a/services/ui-src/src/measures/2023/PPCCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/PPCCH/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -207,6 +209,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/PPCCH/validation.ts b/services/ui-src/src/measures/2023/PPCCH/validation.ts index af16dab114..c4c0b58eb6 100644 --- a/services/ui-src/src/measures/2023/PPCCH/validation.ts +++ b/services/ui-src/src/measures/2023/PPCCH/validation.ts @@ -63,6 +63,8 @@ const PPCCHValidation = (data: FormData) => { ...GV.validateYearFormat(dateRange), ...GV.validateHedisYear(data), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ]; diff --git a/services/ui-src/src/measures/2023/PQI01AD/index.test.tsx b/services/ui-src/src/measures/2023/PQI01AD/index.test.tsx index 5a8c54005e..ac8b163f55 100644 --- a/services/ui-src/src/measures/2023/PQI01AD/index.test.tsx +++ b/services/ui-src/src/measures/2023/PQI01AD/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/PQI01AD/validation.ts b/services/ui-src/src/measures/2023/PQI01AD/validation.ts index 808ee26680..e89660a3f4 100644 --- a/services/ui-src/src/measures/2023/PQI01AD/validation.ts +++ b/services/ui-src/src/measures/2023/PQI01AD/validation.ts @@ -60,6 +60,8 @@ const PQI01Validation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.omsValidations({ data, qualifiers: PMD.qualifiers, diff --git a/services/ui-src/src/measures/2023/PQI05AD/index.test.tsx b/services/ui-src/src/measures/2023/PQI05AD/index.test.tsx index 0aee31de15..02d990b45c 100644 --- a/services/ui-src/src/measures/2023/PQI05AD/index.test.tsx +++ b/services/ui-src/src/measures/2023/PQI05AD/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/PQI05AD/validation.ts b/services/ui-src/src/measures/2023/PQI05AD/validation.ts index 0b4b646de0..dafca2aaa1 100644 --- a/services/ui-src/src/measures/2023/PQI05AD/validation.ts +++ b/services/ui-src/src/measures/2023/PQI05AD/validation.ts @@ -65,6 +65,8 @@ const PQI05Validation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.omsValidations({ data, qualifiers: PMD.qualifiers, diff --git a/services/ui-src/src/measures/2023/PQI08AD/index.test.tsx b/services/ui-src/src/measures/2023/PQI08AD/index.test.tsx index ab362023f1..f566e54dbf 100644 --- a/services/ui-src/src/measures/2023/PQI08AD/index.test.tsx +++ b/services/ui-src/src/measures/2023/PQI08AD/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/PQI08AD/validation.ts b/services/ui-src/src/measures/2023/PQI08AD/validation.ts index f7093ec231..40e22d543b 100644 --- a/services/ui-src/src/measures/2023/PQI08AD/validation.ts +++ b/services/ui-src/src/measures/2023/PQI08AD/validation.ts @@ -38,6 +38,8 @@ const PQI08Validation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateDualPopInformationPM( validateDualPopInformationArray, OPM, diff --git a/services/ui-src/src/measures/2023/PQI15AD/index.test.tsx b/services/ui-src/src/measures/2023/PQI15AD/index.test.tsx index e00c60194c..b1690b7304 100644 --- a/services/ui-src/src/measures/2023/PQI15AD/index.test.tsx +++ b/services/ui-src/src/measures/2023/PQI15AD/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/PQI15AD/validation.ts b/services/ui-src/src/measures/2023/PQI15AD/validation.ts index 4656605d68..2f9727ff68 100644 --- a/services/ui-src/src/measures/2023/PQI15AD/validation.ts +++ b/services/ui-src/src/measures/2023/PQI15AD/validation.ts @@ -36,6 +36,8 @@ const PQI15Validation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/PQI92HH/index.test.tsx b/services/ui-src/src/measures/2023/PQI92HH/index.test.tsx index 7d6c7b2373..cbe52f56e0 100644 --- a/services/ui-src/src/measures/2023/PQI92HH/index.test.tsx +++ b/services/ui-src/src/measures/2023/PQI92HH/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/PQI92HH/validation.ts b/services/ui-src/src/measures/2023/PQI92HH/validation.ts index f36e3bc13e..e953567bef 100644 --- a/services/ui-src/src/measures/2023/PQI92HH/validation.ts +++ b/services/ui-src/src/measures/2023/PQI92HH/validation.ts @@ -35,6 +35,9 @@ const PQI92Validation = (data: FormData) => { ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateOPMRates(OPM), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), + ...GV.validateAtLeastOneDefinitionOfPopulation(data), // Performance Measure Validations ...GV.validateAtLeastOneRateComplete( diff --git a/services/ui-src/src/measures/2023/SAAAD/index.test.tsx b/services/ui-src/src/measures/2023/SAAAD/index.test.tsx index c1cffc3624..ab2cb207a3 100644 --- a/services/ui-src/src/measures/2023/SAAAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/SAAAD/index.test.tsx @@ -182,6 +182,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -203,6 +205,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/SAAAD/validation.ts b/services/ui-src/src/measures/2023/SAAAD/validation.ts index 1f3cc87708..2b26a77047 100644 --- a/services/ui-src/src/measures/2023/SAAAD/validation.ts +++ b/services/ui-src/src/measures/2023/SAAAD/validation.ts @@ -35,6 +35,8 @@ const SAAADValidation = (data: FormData) => { ), ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups), ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), // OMS Validations ...GV.omsValidations({ diff --git a/services/ui-src/src/measures/2023/SFMCH/index.test.tsx b/services/ui-src/src/measures/2023/SFMCH/index.test.tsx index 0f2b25e665..c305ab1cc4 100644 --- a/services/ui-src/src/measures/2023/SFMCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/SFMCH/index.test.tsx @@ -187,6 +187,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsPM).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateEqualCategoryDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -213,6 +215,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateEqualCategoryDenominatorsPM).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); expect(V.validateEqualCategoryDenominatorsOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/SFMCH/validation.ts b/services/ui-src/src/measures/2023/SFMCH/validation.ts index c7fdb415dc..1687975ae4 100644 --- a/services/ui-src/src/measures/2023/SFMCH/validation.ts +++ b/services/ui-src/src/measures/2023/SFMCH/validation.ts @@ -52,6 +52,8 @@ const SFMCHValidation = (data: FormData) => { ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), ...GV.validateRequiredRadioButtonForCombinedRates(data), ...GV.validateDateRangeRadioButtonCompletion(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), ...GV.validateYearFormat(dateRange), ...GV.validateOPMRates(OPM), diff --git a/services/ui-src/src/measures/2023/SSDAD/index.test.tsx b/services/ui-src/src/measures/2023/SSDAD/index.test.tsx index e954dcf210..56292578a1 100644 --- a/services/ui-src/src/measures/2023/SSDAD/index.test.tsx +++ b/services/ui-src/src/measures/2023/SSDAD/index.test.tsx @@ -180,6 +180,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled(); expect(V.validateRateZeroOMS).not.toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -200,6 +202,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled(); expect(V.validateRateZeroOMS).toHaveBeenCalled(); expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/SSDAD/validation.ts b/services/ui-src/src/measures/2023/SSDAD/validation.ts index a74d13498c..e79da61b5e 100644 --- a/services/ui-src/src/measures/2023/SSDAD/validation.ts +++ b/services/ui-src/src/measures/2023/SSDAD/validation.ts @@ -34,6 +34,8 @@ const SSDValidation = (data: FormData) => { ), ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups), ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), // OMS Validations ...GV.omsValidations({ diff --git a/services/ui-src/src/measures/2023/TFLCH/index.test.tsx b/services/ui-src/src/measures/2023/TFLCH/index.test.tsx index f43a551f68..046a092ca2 100644 --- a/services/ui-src/src/measures/2023/TFLCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/TFLCH/index.test.tsx @@ -185,6 +185,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsPM).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -209,6 +211,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateOMSTotalNDR).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsPM).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/TFLCH/validation.ts b/services/ui-src/src/measures/2023/TFLCH/validation.ts index 2f0cef3e70..39d85f829a 100644 --- a/services/ui-src/src/measures/2023/TFLCH/validation.ts +++ b/services/ui-src/src/measures/2023/TFLCH/validation.ts @@ -50,6 +50,8 @@ const TFLCHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateTotalNDR(performanceMeasureArray), ...sameDenominatorError, ...GV.validateAtLeastOneDeviationFieldFilled( diff --git a/services/ui-src/src/measures/2023/W30CH/index.test.tsx b/services/ui-src/src/measures/2023/W30CH/index.test.tsx index 04c9083400..d3e2c94b55 100644 --- a/services/ui-src/src/measures/2023/W30CH/index.test.tsx +++ b/services/ui-src/src/measures/2023/W30CH/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -205,6 +207,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/W30CH/validation.ts b/services/ui-src/src/measures/2023/W30CH/validation.ts index 54a0d5f22d..d2af5537b4 100644 --- a/services/ui-src/src/measures/2023/W30CH/validation.ts +++ b/services/ui-src/src/measures/2023/W30CH/validation.ts @@ -58,6 +58,8 @@ const W30CHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateAtLeastOneDeviationFieldFilled( didCalculationsDeviate, deviationReason diff --git a/services/ui-src/src/measures/2023/WCCCH/index.test.tsx b/services/ui-src/src/measures/2023/WCCCH/index.test.tsx index d4a19da3fc..d0d05b8b22 100644 --- a/services/ui-src/src/measures/2023/WCCCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/WCCCH/index.test.tsx @@ -185,6 +185,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsPM).not.toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -209,6 +211,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateOMSTotalNDR).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsPM).toHaveBeenCalled(); expect(V.validateEqualQualifierDenominatorsOMS).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/WCCCH/validation.ts b/services/ui-src/src/measures/2023/WCCCH/validation.ts index 27e260d8c8..7e6eddb01c 100644 --- a/services/ui-src/src/measures/2023/WCCCH/validation.ts +++ b/services/ui-src/src/measures/2023/WCCCH/validation.ts @@ -37,6 +37,8 @@ const WCCHValidation = (data: FormData) => { errorArray = [ ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateRequiredRadioButtonForCombinedRates(data), ...GV.validateDateRangeRadioButtonCompletion(data), ...GV.validateBothDatesCompleted(dateRange), diff --git a/services/ui-src/src/measures/2023/WCVCH/index.test.tsx b/services/ui-src/src/measures/2023/WCVCH/index.test.tsx index 7359f3cb1c..55735979a4 100644 --- a/services/ui-src/src/measures/2023/WCVCH/index.test.tsx +++ b/services/ui-src/src/measures/2023/WCVCH/index.test.tsx @@ -183,6 +183,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).not.toHaveBeenCalled(); expect(V.validateTotalNDR).not.toHaveBeenCalled(); expect(V.validateOMSTotalNDR).not.toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).not.toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).not.toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).not.toHaveBeenCalled(); }); @@ -205,6 +207,8 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => { expect(V.validateRateNotZeroOMS).toHaveBeenCalled(); expect(V.validateTotalNDR).toHaveBeenCalled(); expect(V.validateOMSTotalNDR).toHaveBeenCalled(); + expect(V.validateAtLeastOneDeliverySystem).toHaveBeenCalled(); + expect(V.validateFfsRadioButtonCompletion).toHaveBeenCalled(); expect(V.validateAtLeastOneDefinitionOfPopulation).toHaveBeenCalled(); }); diff --git a/services/ui-src/src/measures/2023/WCVCH/validation.ts b/services/ui-src/src/measures/2023/WCVCH/validation.ts index 3ba1f7276d..d351457c59 100644 --- a/services/ui-src/src/measures/2023/WCVCH/validation.ts +++ b/services/ui-src/src/measures/2023/WCVCH/validation.ts @@ -51,6 +51,8 @@ const WCVCHValidation = (data: FormData) => { ...GV.validateAtLeastOneDataSource(data), ...GV.validateAtLeastOneDefinitionOfPopulation(data), ...GV.validateAtLeastOneDataSourceType(data), + ...GV.validateAtLeastOneDeliverySystem(data), + ...GV.validateFfsRadioButtonCompletion(data), ...GV.validateNumeratorsLessThanDenominatorsPM( performanceMeasureArray, OPM, diff --git a/services/ui-src/src/measures/2023/shared/globalValidations/index.ts b/services/ui-src/src/measures/2023/shared/globalValidations/index.ts index 9ba0f84f30..4745344788 100644 --- a/services/ui-src/src/measures/2023/shared/globalValidations/index.ts +++ b/services/ui-src/src/measures/2023/shared/globalValidations/index.ts @@ -5,6 +5,7 @@ export * as Types from "./types"; export * from "./validateAtLeastOneDataSource"; export * from "./validateAtLeastOneDefinitionOfPopulation"; export * from "./validateAtLeastOneDataSourceType"; +export * from "./validateAtLeastOneDeliverySystem"; export * from "./validateAtLeastOneDeviationFieldFilled"; export * from "./validateAtLeastOneRateComplete"; export * from "./validateBothDatesInRange"; @@ -12,6 +13,7 @@ export * from "./validateDateRangeRadioButtonCompletion"; export * from "./validateDualPopInformation"; export * from "./validateEqualCategoryDenominators"; export * from "./validateEqualQualifierDenominators"; +export * from "./validateFfsRadioButtonCompletion"; export * from "./validateRateNotZero"; export * from "./validateRateZero"; export * from "./validateNumeratorsLessThanDenominators"; diff --git a/services/ui-src/src/measures/2023/shared/globalValidations/validateAtLeastOneDeliverySystem/index.test.ts b/services/ui-src/src/measures/2023/shared/globalValidations/validateAtLeastOneDeliverySystem/index.test.ts new file mode 100644 index 0000000000..52f188ae26 --- /dev/null +++ b/services/ui-src/src/measures/2023/shared/globalValidations/validateAtLeastOneDeliverySystem/index.test.ts @@ -0,0 +1,47 @@ +import { testFormData } from "../testHelpers/_testFormData"; +import * as DC from "dataConstants"; +import { validateAtLeastOneDeliverySystem } from "."; + +describe("validateAtLeastOneDeliverySystem", () => { + let formData: any; + let errorArray: FormError[]; + + const _check_errors = (data: any, numErrors: number) => { + errorArray = [...validateAtLeastOneDeliverySystem(data)]; + expect(errorArray.length).toBe(numErrors); + }; + + beforeEach(() => { + formData = JSON.parse(JSON.stringify(testFormData)); // reset data + errorArray = []; + }); + + it("When no Delivery System is Selected a validation warning shows", () => { + formData[DC.DELIVERY_SYS_REPRESENTATION_DENOMINATOR] = []; + _check_errors(formData, 1); + }); + + it("When a Delivery System is Selected no validation warning shows", () => { + formData[DC.DELIVERY_SYS_REPRESENTATION_DENOMINATOR] = [ + DC.DELIVERY_SYS_FFS, + ]; + _check_errors(formData, 0); + }); + + it("Error message text should match default errorMessage", () => { + formData[DC.DELIVERY_SYS_REPRESENTATION_DENOMINATOR] = []; + errorArray = [...validateAtLeastOneDeliverySystem(formData)]; + expect(errorArray.length).toBe(1); + expect(errorArray[0].errorMessage).toBe( + "You must select at least one delivery system option" + ); + }); + + it("Error message text should match provided errorMessage", () => { + formData[DC.DELIVERY_SYS_REPRESENTATION_DENOMINATOR] = []; + const errorMessage = "Another one bites the dust."; + errorArray = [...validateAtLeastOneDeliverySystem(formData, errorMessage)]; + expect(errorArray.length).toBe(1); + expect(errorArray[0].errorMessage).toBe(errorMessage); + }); +}); diff --git a/services/ui-src/src/measures/2023/shared/globalValidations/validateAtLeastOneDeliverySystem/index.ts b/services/ui-src/src/measures/2023/shared/globalValidations/validateAtLeastOneDeliverySystem/index.ts new file mode 100644 index 0000000000..8f5f309190 --- /dev/null +++ b/services/ui-src/src/measures/2023/shared/globalValidations/validateAtLeastOneDeliverySystem/index.ts @@ -0,0 +1,20 @@ +import * as Types from "measures/2023/shared/CommonQuestions/types"; + +export const validateAtLeastOneDeliverySystem = ( + data: Types.DefinitionOfPopulation, + errorMessage?: string +) => { + const errorArray: FormError[] = []; + if ( + !data.DeliverySysRepresentationDenominator || + data.DeliverySysRepresentationDenominator.length === 0 + ) { + errorArray.push({ + errorLocation: "Delivery Systems", + errorMessage: + errorMessage ?? "You must select at least one delivery system option", + }); + } + + return errorArray; +}; diff --git a/services/ui-src/src/measures/2023/shared/globalValidations/validateFfsRadioButtonCompletion/index.test.ts b/services/ui-src/src/measures/2023/shared/globalValidations/validateFfsRadioButtonCompletion/index.test.ts new file mode 100644 index 0000000000..bbad461994 --- /dev/null +++ b/services/ui-src/src/measures/2023/shared/globalValidations/validateFfsRadioButtonCompletion/index.test.ts @@ -0,0 +1,49 @@ +import { testFormData } from "../testHelpers/_testFormData"; +import * as DC from "dataConstants"; +import { validateFfsRadioButtonCompletion } from "."; + +describe("validateFfsRadioButtonCompletion", () => { + let formData: any; + let errorArray: FormError[]; + + const _check_errors = (data: any, numErrors: number) => { + errorArray = [...validateFfsRadioButtonCompletion(data)]; + expect(errorArray.length).toBe(numErrors); + }; + + beforeEach(() => { + formData = JSON.parse(JSON.stringify(testFormData)); // reset data + errorArray = []; + }); + + it("When no Delivery System nested question is checked a validation warning shows", () => { + formData[DC.DELIVERY_SYS_REPRESENTATION_DENOMINATOR] = [DC.FFS]; + formData[DC.DELIVERY_SYS_FFS] = undefined; + _check_errors(formData, 1); + }); + + it("When a Delivery System nested question is checked no validation warning shows", () => { + formData[DC.DELIVERY_SYS_REPRESENTATION_DENOMINATOR] = [DC.FFS]; + formData[DC.DELIVERY_SYS_FFS] = "yes"; + _check_errors(formData, 0); + }); + + it("Error message text should match default errorMessage", () => { + formData[DC.DELIVERY_SYS_REPRESENTATION_DENOMINATOR] = [DC.FFS]; + formData[DC.DELIVERY_SYS_FFS] = undefined; + errorArray = [...validateFfsRadioButtonCompletion(formData)]; + expect(errorArray.length).toBe(1); + expect(errorArray[0].errorMessage).toBe( + "You must indicate if the measure-eligible population is included" + ); + }); + + it("Error message text should match provided errorMessage", () => { + formData[DC.DELIVERY_SYS_REPRESENTATION_DENOMINATOR] = [DC.FFS]; + formData[DC.DELIVERY_SYS_FFS] = undefined; + const errorMessage = "Another one bites the dust."; + errorArray = [...validateFfsRadioButtonCompletion(formData, errorMessage)]; + expect(errorArray.length).toBe(1); + expect(errorArray[0].errorMessage).toBe(errorMessage); + }); +}); diff --git a/services/ui-src/src/measures/2023/shared/globalValidations/validateFfsRadioButtonCompletion/index.ts b/services/ui-src/src/measures/2023/shared/globalValidations/validateFfsRadioButtonCompletion/index.ts new file mode 100644 index 0000000000..c2aea2ae3a --- /dev/null +++ b/services/ui-src/src/measures/2023/shared/globalValidations/validateFfsRadioButtonCompletion/index.ts @@ -0,0 +1,37 @@ +import * as Types from "measures/2023/shared/CommonQuestions/types"; +import * as DC from "dataConstants"; + +export const validateFfsRadioButtonCompletion = ( + data: Types.DefinitionOfPopulation, + errorMessage?: string +) => { + const errorArray: FormError[] = []; + + // map the delivery systems to their respective nested selections + const deliverySystemsMap = { + [DC.FFS]: DC.DELIVERY_SYS_FFS, + [DC.ICM]: DC.DELIVERY_SYS_ICM, + [DC.PCCM]: DC.DELIVERY_SYS_PCCM, + [DC.MCO_PIHP]: DC.DELIVERY_SYS_MCO_PIHP, + [DC.OTHER]: DC.DELIVERY_SYS_OTHER, + }; + + const selectedDeliverySystems = data.DeliverySysRepresentationDenominator; + if (selectedDeliverySystems) { + selectedDeliverySystems.forEach((system) => { + Object.entries(data).forEach((selection) => { + // check if user has actually checked the nested radio button selection + if (selection[0] === deliverySystemsMap[system] && !selection[1]) { + errorArray.push({ + errorLocation: "Delivery Systems", + errorMessage: + errorMessage ?? + "You must indicate if the measure-eligible population is included", + }); + } + }); + }); + } + + return errorArray; +}; diff --git a/services/ui-src/src/measures/2023/shared/util/validationsMock.tsx b/services/ui-src/src/measures/2023/shared/util/validationsMock.tsx index dd8ccaef48..bd69ee0367 100644 --- a/services/ui-src/src/measures/2023/shared/util/validationsMock.tsx +++ b/services/ui-src/src/measures/2023/shared/util/validationsMock.tsx @@ -1,12 +1,14 @@ import * as validateAtLeastOneDataSource from "measures/2023/shared/globalValidations/validateAtLeastOneDataSource"; import * as validateAtLeastOneDefinitionOfPopulation from "measures/2023/shared/globalValidations/validateAtLeastOneDefinitionOfPopulation"; import * as validateAtLeastOneDataSourceType from "measures/2023/shared/globalValidations/validateAtLeastOneDataSourceType"; +import * as validateAtLeastOneDeliverySystem from "measures/2023/shared/globalValidations/validateAtLeastOneDeliverySystem"; import * as validateAtLeastOneDeviationFieldFilled from "measures/2023/shared/globalValidations/validateAtLeastOneDeviationFieldFilled"; import * as validateAtLeastOneRateComplete from "measures/2023/shared/globalValidations/validateAtLeastOneRateComplete"; import * as validateBothDatesInRange from "measures/2023/shared/globalValidations/validateBothDatesInRange"; import * as validateDualPopInformation from "measures/2023/shared/globalValidations/validateDualPopInformation"; import * as validateEqualCategoryDenominators from "measures/2023/shared/globalValidations/validateEqualCategoryDenominators"; import * as validateEqualQualifierDenominators from "measures/2023/shared/globalValidations/validateEqualQualifierDenominators"; +import * as validateFfsRadioButtonCompletion from "measures/2023/shared/globalValidations/validateFfsRadioButtonCompletion"; import * as validateRateNotZero from "measures/2023/shared/globalValidations/validateRateNotZero"; import * as validateRateZero from "measures/2023/shared/globalValidations/validateRateZero"; import * as validateNumeratorsLessThanDenominators from "measures/2023/shared/globalValidations/validateNumeratorsLessThanDenominators"; @@ -57,6 +59,10 @@ export const validationsMockObj: any = { validateAtLeastOneDataSourceType, "validateAtLeastOneDataSourceType" ), + validateAtLeastOneDeliverySystem: jest.spyOn( + validateAtLeastOneDeliverySystem, + "validateAtLeastOneDeliverySystem" + ), validateAtLeastOneDeviationFieldFilled: jest.spyOn( validateAtLeastOneDeviationFieldFilled, "validateAtLeastOneDeviationFieldFilled" @@ -89,6 +95,10 @@ export const validationsMockObj: any = { validateEqualQualifierDenominators, "validateEqualQualifierDenominatorsOMS" ), + validateFfsRadioButtonCompletion: jest.spyOn( + validateFfsRadioButtonCompletion, + "validateFfsRadioButtonCompletion" + ), validateRateNotZeroPM: jest.spyOn( validateRateNotZero, "validateRateNotZeroPM"