validation import fix

Enterprise-CMCS · Jan 14, 2025 · 9779771 · 9779771
1 parent 4ef9f8d
commit 9779771
Show file tree

Hide file tree

Showing 19 changed files with 80 additions and 23 deletions.
diff --git a/services/ui-src/src/measures/2022/ADDCH/validation.ts b/services/ui-src/src/measures/2022/ADDCH/validation.ts
@@ -8,7 +8,10 @@ import { DefaultFormDataLegacy as FormData } from "shared/types/FormData";
 
 const ADDCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
-  const performanceMeasureArray = getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   let errorArray: any[] = [];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];

diff --git a/services/ui-src/src/measures/2022/CCPAD/validation.ts b/services/ui-src/src/measures/2022/CCPAD/validation.ts
@@ -37,7 +37,12 @@ const CCPADValidation = (data: FormData) => {
     ),
     ...GV.validateBothDatesCompleted(dateRange),
     ...GV.validateYearFormat(dateRange),
-    ...GV.validateOneQualRateHigherThanOtherQualPM(data, PMD.data, 1, 0),
+    ...GV.validateOneQualRateHigherThanOtherQualPM(
+      data,
+      PMD.data.performanceMeasure,
+      1,
+      0
+    ),
     ...GV.validateEqualCategoryDenominatorsPM(data, PMD.categories),
     ...GV.validateAtLeastOneDataSource(data),
     ...GV.validateAtLeastOneDeviationFieldFilled(
@@ -53,7 +58,10 @@ const CCPADValidation = (data: FormData) => {
       OPM,
       ageGroups
     ),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
     ...GV.validateRequiredRadioButtonForCombinedRates(data),
 
     // OMS Specific Validations

diff --git a/services/ui-src/src/measures/2022/CCPCH/validation.ts b/services/ui-src/src/measures/2022/CCPCH/validation.ts
@@ -52,9 +52,17 @@ const CCPCHValidation = (data: FormData) => {
       OPM,
       ageGroups
     ),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
     ...GV.validateRequiredRadioButtonForCombinedRates(data),
-    ...GV.validateOneQualRateHigherThanOtherQualPM(data, PMD.data, 1, 0),
+    ...GV.validateOneQualRateHigherThanOtherQualPM(
+      data,
+      PMD.data.performanceMeasure,
+      1,
+      0
+    ),
 
     // OMS Specific Validations
     ...GV.omsValidations({

diff --git a/services/ui-src/src/measures/2022/CCSAD/validation.ts b/services/ui-src/src/measures/2022/CCSAD/validation.ts
@@ -10,7 +10,7 @@ const CCSADValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const deviationArray = GV.getDeviationNDRArray(
     data.DeviationOptions,

diff --git a/services/ui-src/src/measures/2022/CISCH/validation.ts b/services/ui-src/src/measures/2022/CISCH/validation.ts
@@ -10,7 +10,7 @@ const CISCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const deviationArray = GV.getDeviationNDRArray(
     data.DeviationOptions,

diff --git a/services/ui-src/src/measures/2022/FUAAD/validation.ts b/services/ui-src/src/measures/2022/FUAAD/validation.ts
@@ -56,7 +56,10 @@ const FUAADValidation = (data: FormData) => {
     ),
     ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
     ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
     ...GV.validateRequiredRadioButtonForCombinedRates(data),
     ...GV.validateBothDatesCompleted(dateRange),
     ...GV.validateYearFormat(dateRange),

diff --git a/services/ui-src/src/measures/2022/FUACH/validation.ts b/services/ui-src/src/measures/2022/FUACH/validation.ts
@@ -8,7 +8,10 @@ import { DefaultFormDataLegacy as FormData } from "shared/types/FormData";
 
 const FUACHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
-  const performanceMeasureArray = getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const dateRange = data[DC.DATE_RANGE];
@@ -52,7 +55,10 @@ const FUACHValidation = (data: FormData) => {
       deviationArray,
       didCalculationsDeviate
     ),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
 
     // OMS Validations
     ...GV.omsValidations({

diff --git a/services/ui-src/src/measures/2022/FUAHH/validation.ts b/services/ui-src/src/measures/2022/FUAHH/validation.ts
@@ -71,7 +71,10 @@ const FUAHHValidation = (data: FormData) => {
     ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
     ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
     ...GV.validateTotalNDR(performanceMeasureArray),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
 
     // OMS Validations
     ...GV.omsValidations({

diff --git a/services/ui-src/src/measures/2022/FUHHH/validation.ts b/services/ui-src/src/measures/2022/FUHHH/validation.ts
@@ -70,7 +70,10 @@ const FUHHHValidation = (data: FormData) => {
     ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
     ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
     ...GV.validateTotalNDR(performanceMeasureArray),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
 
     // OMS Validations
     ...GV.omsValidations({

diff --git a/services/ui-src/src/measures/2022/FUMAD/validation.ts b/services/ui-src/src/measures/2022/FUMAD/validation.ts
@@ -64,7 +64,10 @@ const FUMADValidation = (data: FormData) => {
     ...GV.validateAtLeastOneDataSource(data),
     ...GV.validateBothDatesCompleted(dateRange),
     ...GV.validateYearFormat(dateRange),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
     ...GV.validateRequiredRadioButtonForCombinedRates(data),
     ...GV.validateAtLeastOneDeviationFieldFilled(
       performanceMeasureArray,

diff --git a/services/ui-src/src/measures/2022/HPCAD/validation.ts b/services/ui-src/src/measures/2022/HPCAD/validation.ts
@@ -11,7 +11,7 @@ const HPCADValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const deviationArray = GV.getDeviationNDRArray(
     data.DeviationOptions,

diff --git a/services/ui-src/src/measures/2022/IETAD/validation.ts b/services/ui-src/src/measures/2022/IETAD/validation.ts
@@ -124,7 +124,13 @@ const IETValidation = (data: FormData) => {
     ...filteredSameDenominatorErrors,
     ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
     ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data, 0, 1, 2),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure,
+      0,
+      1,
+      2
+    ),
 
     // OMS Validations
     ...GV.omsValidations({

diff --git a/services/ui-src/src/measures/2022/IETHH/validation.ts b/services/ui-src/src/measures/2022/IETHH/validation.ts
@@ -106,7 +106,13 @@ const IETValidation = (data: FormData) => {
 
   errorArray = [
     ...errorArray,
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data, 0, 1, 2),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure,
+      0,
+      1,
+      2
+    ),
     ...GV.validateAtLeastOneRateComplete(
       performanceMeasureArray,
       OPM,

diff --git a/services/ui-src/src/measures/2022/OUDAD/validation.ts b/services/ui-src/src/measures/2022/OUDAD/validation.ts
@@ -9,7 +9,7 @@ const OUDValidation = (data: FormData) => {
   const OPM = data[DC.OPM_RATES];
   const ageGroups = PMD.qualifiers;
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;

diff --git a/services/ui-src/src/measures/2022/OUDHH/validation.ts b/services/ui-src/src/measures/2022/OUDHH/validation.ts
@@ -9,7 +9,7 @@ const OUDValidation = (data: FormData) => {
   const OPM = data[DC.OPM_RATES];
   const ageGroups = PMD.qualifiers;
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;

diff --git a/services/ui-src/src/measures/2022/PPCAD/validation.ts b/services/ui-src/src/measures/2022/PPCAD/validation.ts
@@ -10,7 +10,7 @@ const PPCADValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const deviationArray = GV.getDeviationNDRArray(
     data.DeviationOptions,

diff --git a/services/ui-src/src/measures/2022/PPCCH/validation.ts b/services/ui-src/src/measures/2022/PPCCH/validation.ts
@@ -10,7 +10,7 @@ const PPCCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const deviationArray = GV.getDeviationNDRArray(
     data.DeviationOptions,

diff --git a/services/ui-src/src/measures/2022/TFLCH/validation.ts b/services/ui-src/src/measures/2022/TFLCH/validation.ts
@@ -38,9 +38,17 @@ const TFLCHValidation = (data: FormData) => {
   errorArray = [
     ...errorArray,
     // Dental Services rate cannot be larger than the Dental or Oral Health Services rate
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
     // Oral Health Services rate cannot be larger than the Dental or Oral Health Services rate
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data, 0, 2),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure,
+      0,
+      2
+    ),
     ...GV.validateAtLeastOneRateComplete(
       performanceMeasureArray,
       OPM,

diff --git a/services/ui-src/src/measures/2022/WCVCH/validation.ts b/services/ui-src/src/measures/2022/WCVCH/validation.ts
@@ -10,7 +10,7 @@ const WCVCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const deviationArray = GV.getDeviationNDRArray(
     data.DeviationOptions,