more Ben catches!

Enterprise-CMCS · Jan 21, 2025 · 6679fd7 · 6679fd7
1 parent 302f518
commit 6679fd7
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 19 deletions.
diff --git a/services/ui-src/src/measures/2021/measureTemplate.tsx b/services/ui-src/src/measures/2021/measureTemplate.tsx
@@ -48,6 +48,7 @@ export const measureTemplate = ({
         measureName={name}
         measureAbbreviation={measureId}
         removeLessThan30={custom?.removeLessThan30}
+        coreset={coreset}
       />
 
       {!isNotReportingData && (

diff --git a/services/ui-src/src/measures/2023/AABCH/data.ts b/services/ui-src/src/measures/2023/AABCH/data.ts
@@ -17,9 +17,7 @@ export const data: MeasureTemplateData = {
     qualifiers,
   },
   custom: {
-    calcTotal: true,
     customMask: positiveNumbersWithMaxDecimalPlaces(1),
-    allowNumeratorGreaterThanDenominator: true,
     rateCalc: AABRateCalculation,
   },
 };
diff --git a/services/ui-src/src/measures/2023/LSCCH/data.ts b/services/ui-src/src/measures/2023/LSCCH/data.ts
@@ -51,7 +51,4 @@ export const data: MeasureTemplateData = {
       { value: DC.OTHER_DATA_SOURCE, description: true },
     ],
   },
-  custom: {
-    calcTotal: true,
-  },
 };
diff --git a/services/ui-src/src/measures/2024/AABCH/data.ts b/services/ui-src/src/measures/2024/AABCH/data.ts
@@ -17,9 +17,7 @@ export const data: MeasureTemplateData = {
     qualifiers,
   },
   custom: {
-    calcTotal: true,
     customMask: positiveNumbersWithMaxDecimalPlaces(1),
-    allowNumeratorGreaterThanDenominator: true,
     rateCalc: AABRateCalculation,
   },
 };
diff --git a/services/ui-src/src/measures/2024/LSCCH/data.ts b/services/ui-src/src/measures/2024/LSCCH/data.ts
@@ -51,7 +51,4 @@ export const data: MeasureTemplateData = {
       { value: DC.OTHER_DATA_SOURCE, description: true },
     ],
   },
-  custom: {
-    calcTotal: true,
-  },
 };
diff --git a/services/ui-src/src/measures/2024/measureTemplate.tsx b/services/ui-src/src/measures/2024/measureTemplate.tsx
@@ -53,11 +53,11 @@ export const measureTemplate = ({
       {!isNotReportingData && (
         <>
           <CMQ.StatusOfData />
-          <CMQ.MeasurementSpecification type={type} />
+          <CMQ.MeasurementSpecification type={type} coreset={coreset} />
           {custom?.dataSrcRadio ? (
             <CMQ.DataSourceRadio />
           ) : (
-            <CMQ.DataSource data={dataSource} />
+            <CMQ.DataSource data={dataSource} type={coreset} />
           )}
           <CMQ.DateRange type={coreset} />
           <CMQ.DefinitionOfPopulation

diff --git a/services/ui-src/src/measures/2025/AABCH/data.ts b/services/ui-src/src/measures/2025/AABCH/data.ts
@@ -17,9 +17,7 @@ export const data: MeasureTemplateData = {
     qualifiers,
   },
   custom: {
-    calcTotal: true,
     customMask: positiveNumbersWithMaxDecimalPlaces(1),
-    allowNumeratorGreaterThanDenominator: true,
     rateCalc: AABRateCalculation,
   },
 };
diff --git a/services/ui-src/src/measures/2025/LSCCH/data.ts b/services/ui-src/src/measures/2025/LSCCH/data.ts
@@ -51,7 +51,4 @@ export const data: MeasureTemplateData = {
       { value: DC.OTHER_DATA_SOURCE, description: true },
     ],
   },
-  custom: {
-    calcTotal: true,
-  },
 };
diff --git a/services/ui-src/src/measures/2025/measureTemplate.tsx b/services/ui-src/src/measures/2025/measureTemplate.tsx
@@ -57,11 +57,11 @@ export const measureTemplate = ({
       {!isNotReportingData && (
         <>
           <CMQ.StatusOfData />
-          <CMQ.MeasurementSpecification type={type} />
+          <CMQ.MeasurementSpecification type={type} coreset={coreset} />
           {custom?.dataSrcRadio ? (
             <CMQ.DataSourceRadio />
           ) : (
-            <CMQ.DataSource data={dataSource} />
+            <CMQ.DataSource data={dataSource} type={coreset} />
           )}
           <CMQ.DateRange type={coreset} />
           <CMQ.DefinitionOfPopulation