Cmdct 3352x - StatusOfData refactor (#2150)

Enterprise-CMCS · Mar 29, 2024 · 81dfeed · 81dfeed
1 parent d036ec0
commit 81dfeed
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 288 deletions.
diff --git a/services/ui-src/src/measures/2021/AMRAD/types.ts b/services/ui-src/src/measures/2021/AMRAD/types.ts
@@ -28,7 +28,7 @@ export namespace Measure {
       Type.CombinedRates,
       Types.DateRange,
       Types.DefinitionOfPopulation,
-      Types.StatusOfData,
+      Type.StatusOfData,
       Types.DidReport,
       Types.WhyAreYouNotReporting,
       Types.DataSource,

diff --git a/services/ui-src/src/measures/2021/CommonQuestions/StatusOfData/index.tsx b/services/ui-src/src/measures/2021/CommonQuestions/StatusOfData/index.tsx
diff --git a/services/ui-src/src/measures/2021/CommonQuestions/index.tsx b/services/ui-src/src/measures/2021/CommonQuestions/index.tsx
@@ -6,7 +6,7 @@ export * from "shared/commonQuestions/DataSourceCahps";
 export * from "shared/commonQuestions/AdditionalNotes";
 export * from "./OtherPerformanceMeasure";
 export * from "./Reporting";
-export * from "./StatusOfData";
+export * from "shared/commonQuestions/StatusOfData";
 export * from "./WhyAreYouNotReporting";
 export * from "./OptionalMeasureStrat";
 export * from "shared/commonQuestions/DeviationFromMeasureSpecificationCheckboxes";

diff --git a/services/ui-src/src/measures/2021/CommonQuestions/types.ts b/services/ui-src/src/measures/2021/CommonQuestions/types.ts
@@ -135,13 +135,6 @@ export interface DidCollect {
   [DC.DID_COLLECT]: YesNo;
 }
 
-export interface StatusOfData {
-  [DC.DATA_STATUS]:
-    | typeof DC.REPORTING_FINAL_DATA
-    | typeof DC.REPORTING_PROVISIONAL_DATA;
-  [DC.DATA_STATUS_PROVISIONAL_EXPLAINATION]: string;
-}
-
 export interface DataSource {
   [DC.DATA_SOURCE]: string[];
   [DC.DATA_SOURCE_SELECTIONS]: {
@@ -284,7 +277,7 @@ export type DeviationKeys =
 
 export type DefaultFormData = Types.AdditionalNotes &
   DidCollect &
-  StatusOfData &
+  Types.StatusOfData &
   WhyAreYouNotReporting &
   DidReport &
   Types.CombinedRates &

diff --git a/services/ui-src/src/measures/2021/MSCAD/types.ts b/services/ui-src/src/measures/2021/MSCAD/types.ts
@@ -3,7 +3,7 @@ import * as Type from "shared/types";
 
 export interface FormData
   extends Types.DefinitionOfPopulation,
-    Types.StatusOfData,
+    Type.StatusOfData,
     Types.DateRange,
     Types.DidReport,
     Type.AdditionalNotes,

diff --git a/services/ui-src/src/measures/2022/AMRAD/types.ts b/services/ui-src/src/measures/2022/AMRAD/types.ts
@@ -28,7 +28,7 @@ export namespace Measure {
       Type.CombinedRates,
       Types.DateRange,
       Types.DefinitionOfPopulation,
-      Types.StatusOfData,
+      Type.StatusOfData,
       Types.DidReport,
       Types.WhyAreYouNotReporting,
       Types.DataSource,

diff --git a/services/ui-src/src/measures/2022/MSCAD/types.ts b/services/ui-src/src/measures/2022/MSCAD/types.ts
@@ -3,7 +3,7 @@ import * as Type from "shared/types";
 
 export interface FormData
   extends Types.DefinitionOfPopulation,
-    Types.StatusOfData,
+    Type.StatusOfData,
     Types.DateRange,
     Types.DidReport,
     Type.AdditionalNotes,

diff --git a/services/ui-src/src/measures/2022/shared/CommonQuestions/StatusOfData/index.test.tsx b/services/ui-src/src/measures/2022/shared/CommonQuestions/StatusOfData/index.test.tsx
diff --git a/services/ui-src/src/measures/2022/shared/CommonQuestions/StatusOfData/index.tsx b/services/ui-src/src/measures/2022/shared/CommonQuestions/StatusOfData/index.tsx
diff --git a/services/ui-src/src/measures/2022/shared/CommonQuestions/index.tsx b/services/ui-src/src/measures/2022/shared/CommonQuestions/index.tsx
@@ -6,7 +6,7 @@ export * from "shared/commonQuestions/DataSourceCahps";
 export * from "shared/commonQuestions/AdditionalNotes";
 export * from "./OtherPerformanceMeasure";
 export * from "./Reporting";
-export * from "./StatusOfData";
+export * from "shared/commonQuestions/StatusOfData";
 export * from "./WhyAreYouNotReporting";
 export * from "./OptionalMeasureStrat";
 export * from "shared/commonQuestions/DeviationFromMeasureSpecificationCheckboxes";

diff --git a/services/ui-src/src/measures/2022/shared/CommonQuestions/types.ts b/services/ui-src/src/measures/2022/shared/CommonQuestions/types.ts
@@ -135,13 +135,6 @@ export interface DidCollect {
   [DC.DID_COLLECT]: YesNo;
 }
 
-export interface StatusOfData {
-  [DC.DATA_STATUS]:
-    | typeof DC.REPORTING_FINAL_DATA
-    | typeof DC.REPORTING_PROVISIONAL_DATA;
-  [DC.DATA_STATUS_PROVISIONAL_EXPLAINATION]: string;
-}
-
 export interface DataSource {
   [DC.DATA_SOURCE]: string[];
   [DC.DATA_SOURCE_SELECTIONS]: {
@@ -284,7 +277,7 @@ export type DeviationKeys =
 
 export type DefaultFormData = Types.AdditionalNotes &
   DidCollect &
-  StatusOfData &
+  Types.StatusOfData &
   WhyAreYouNotReporting &
   DidReport &
   Types.CombinedRates &

diff --git a/services/ui-src/src/measures/2023/AMRAD/types.ts b/services/ui-src/src/measures/2023/AMRAD/types.ts
@@ -28,7 +28,7 @@ export namespace Measure {
       Type.CombinedRates,
       Types.DateRange,
       Types.DefinitionOfPopulation,
-      Types.StatusOfData,
+      Type.StatusOfData,
       Types.DidReport,
       Types.WhyAreYouNotReporting,
       Types.DataSource,

diff --git a/services/ui-src/src/measures/2023/MSCAD/types.ts b/services/ui-src/src/measures/2023/MSCAD/types.ts
@@ -3,7 +3,7 @@ import * as Type from "shared/types";
 
 export interface FormData
   extends Types.DefinitionOfPopulation,
-    Types.StatusOfData,
+    Type.StatusOfData,
     Types.DateRange,
     Types.DidReport,
     Type.AdditionalNotes,

diff --git a/services/ui-src/src/measures/2023/shared/CommonQuestions/StatusOfData/index.test.tsx b/services/ui-src/src/measures/2023/shared/CommonQuestions/StatusOfData/index.test.tsx
diff --git a/services/ui-src/src/measures/2023/shared/CommonQuestions/index.ts b/services/ui-src/src/measures/2023/shared/CommonQuestions/index.ts
@@ -6,7 +6,7 @@ export * from "shared/commonQuestions/DataSourceCahps";
 export * from "shared/commonQuestions/AdditionalNotes";
 export * from "./OtherPerformanceMeasure";
 export * from "./Reporting";
-export * from "./StatusOfData";
+export * from "shared/commonQuestions/StatusOfData";
 export * from "./WhyAreYouNotReporting";
 export * from "shared/commonQuestions/NotCollectingOMS";
 export * from "./OptionalMeasureStrat";

diff --git a/services/ui-src/src/measures/2023/shared/CommonQuestions/types.ts b/services/ui-src/src/measures/2023/shared/CommonQuestions/types.ts
@@ -138,13 +138,6 @@ export interface DidCollect {
   [DC.DID_COLLECT]: YesNo;
 }
 
-export interface StatusOfData {
-  [DC.DATA_STATUS]:
-    | typeof DC.REPORTING_FINAL_DATA
-    | typeof DC.REPORTING_PROVISIONAL_DATA;
-  [DC.DATA_STATUS_PROVISIONAL_EXPLAINATION]: string;
-}
-
 export interface DataSource {
   [DC.DATA_SOURCE]: string[];
   [DC.DATA_SOURCE_SELECTIONS]: {
@@ -289,7 +282,7 @@ export type DeviationKeys =
 
 export type DefaultFormData = Types.AdditionalNotes &
   DidCollect &
-  StatusOfData &
+  Types.StatusOfData &
   WhyAreYouNotReporting &
   DidReport &
   Types.CombinedRates &

diff --git a/services/ui-src/src/measures/2024/AMRAD/types.ts b/services/ui-src/src/measures/2024/AMRAD/types.ts
@@ -28,7 +28,7 @@ export namespace Measure {
       Type.CombinedRates,
       Types.DateRange,
       Types.DefinitionOfPopulation,
-      Types.StatusOfData,
+      Type.StatusOfData,
       Types.DidReport,
       Types.WhyAreYouNotReporting,
       Types.DataSource,

diff --git a/services/ui-src/src/measures/2024/shared/CommonQuestions/StatusOfData/index.test.tsx b/services/ui-src/src/measures/2024/shared/CommonQuestions/StatusOfData/index.test.tsx