StatusOfData refactor

Enterprise-CMCS · Mar 25, 2024 · 521f2ae · 521f2ae
1 parent 0a42b37
commit 521f2ae
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 287 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/index.tsx b/services/ui-src/src/measures/2021/CommonQuestions/index.tsx
@@ -6,7 +6,7 @@ export * from "./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/MeasurementSpecification";

diff --git a/services/ui-src/src/measures/2021/CommonQuestions/types.ts b/services/ui-src/src/measures/2021/CommonQuestions/types.ts
@@ -2,6 +2,7 @@ import { OmsNode } from "./OptionalMeasureStrat/data";
 import { PerformanceMeasureData } from "./PerformanceMeasure/data";
 import * as DC from "dataConstants";
 import * as Types from "shared/types";
+import { StatusOfData } from "shared/types";
 
 type YesNo = typeof DC.YES | typeof DC.NO;
 
@@ -135,13 +136,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]: {

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 "./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/MeasurementSpecification";

diff --git a/services/ui-src/src/measures/2022/shared/CommonQuestions/types.ts b/services/ui-src/src/measures/2022/shared/CommonQuestions/types.ts
@@ -2,6 +2,7 @@ import { OmsNode } from "./OptionalMeasureStrat/data";
 import { PerformanceMeasureData } from "./PerformanceMeasure/data";
 import * as DC from "dataConstants";
 import * as Types from "shared/types";
+import { StatusOfData } from "shared/types";
 
 type YesNo = typeof DC.YES | typeof DC.NO;
 
@@ -135,13 +136,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]: {

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/StatusOfData/index.tsx b/services/ui-src/src/measures/2023/shared/CommonQuestions/StatusOfData/index.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 "./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
@@ -3,6 +3,7 @@ import { OmsNode } from "./OptionalMeasureStrat/data";
 import { PerformanceMeasureData } from "./PerformanceMeasure/data";
 import * as DC from "dataConstants";
 import * as Types from "shared/types";
+import { StatusOfData } from "shared/types";
 
 type YesNo = typeof DC.YES | typeof DC.NO;
 
@@ -138,13 +139,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]: {

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