Merge pull request #61 from EyeSeeTea/feature/changes-nursing-midwifery

only check totals dataElements
EyeSeeTea · Jun 5, 2024 · fb36ca1 · fb36ca1
2 parents 301500a + f45fde2
commit fb36ca1
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 19 deletions.
diff --git a/src/data/common/D2DataElement.ts b/src/data/common/D2DataElement.ts
@@ -13,6 +13,8 @@ export class D2DataElement {
                 .get({
                     fields: {
                         id: true,
+                        formName: true,
+                        code: true,
                         displayFormName: true,
                         displayName: true,
                         displayShortName: true,
@@ -29,6 +31,8 @@ export class D2DataElement {
                     return d2Response.data.objects.map((d2DataElement): DataElement => {
                         return {
                             id: d2DataElement.id,
+                            code: d2DataElement.code,
+                            originalName: d2DataElement.formName,
                             name:
                                 d2DataElement.displayFormName ||
                                 d2DataElement.displayShortName ||

diff --git a/src/data/repositories/ModuleD2Repository.ts b/src/data/repositories/ModuleD2Repository.ts
@@ -28,11 +28,14 @@ export class ModuleD2Repository implements ModuleRepository {
                     dataSetElements: {
                         dataElement: {
                             id: true,
+                            code: true,
+                            formName: true,
                             displayFormName: true,
                             valueType: true,
                             categoryCombo: {
                                 id: true,
                                 code: true,
+                                name: true,
                                 displayName: true,
                                 categories: {
                                     id: true,
@@ -79,6 +82,8 @@ export class ModuleD2Repository implements ModuleRepository {
                                 d2DataSetElement.dataElement.categoryCombo;
                             return {
                                 id: d2DataSetElement.dataElement.id,
+                                code: d2DataSetElement.dataElement.code,
+                                originalName: d2DataSetElement.dataElement.formName,
                                 name: d2DataSetElement.dataElement.displayFormName,
                                 isNumber:
                                     d2DataSetElement.dataElement.valueType === "NUMBER" ||

diff --git a/src/domain/entities/DataElement.ts b/src/domain/entities/DataElement.ts
@@ -1,7 +1,8 @@
 import { Maybe } from "$/utils/ts-utils";
-import { NamedRef } from "./Ref";
+import { NamedCodeRef, NamedRef } from "./Ref";
 
-export type DataElement = NamedRef & {
+export type DataElement = NamedCodeRef & {
+    originalName: string;
     isNumber: boolean;
     disaggregation: Maybe<NamedRef & { options: NamedRef[] }>;
 };
diff --git a/src/domain/usecases/GetMissingDisaggregatesUseCase.ts b/src/domain/usecases/GetMissingDisaggregatesUseCase.ts
@@ -360,15 +360,15 @@ export class GetMissingDisaggregatesUseCase {
         dataElements: DataElement[]
     ) {
         if (disaggregationSetting.type === "combos") {
-            return dataElements.filter(de => {
+            return dataElements.filter(dataElement => {
                 return (
-                    de.name.split(separator)[0] === disaggregationSetting.id &&
-                    de.disaggregation?.id === disaggregationSetting.disaggregationId
+                    dataElement.name.split(separator)[0] === disaggregationSetting.id &&
+                    dataElement.disaggregation?.id === disaggregationSetting.disaggregationId
                 );
             });
         } else {
-            return dataElements.filter(de => {
-                return de.disaggregation?.id === disaggregationSetting.id;
+            return dataElements.filter(dataElement => {
+                return dataElement.disaggregation?.id === disaggregationSetting.id;
             });
         }
     }

diff --git a/src/domain/usecases/ValidateMidwiferyAndPersonnelUseCase.ts b/src/domain/usecases/ValidateMidwiferyAndPersonnelUseCase.ts
@@ -201,8 +201,8 @@ export class ValidateMidwiferyAndPersonnelUseCase {
             .flatMap(dataElementToCheck => {
                 const [nursing, midwifery] = dataElementToCheck;
                 if (!nursing || !midwifery) return [];
-                const personnelDe = dataElements.find(de => de.name.includes(nursing));
-                const midwiferyDe = dataElements.find(de => de.name.includes(midwifery));
+                const personnelDe = dataElements.find(de => de.originalName.includes(nursing));
+                const midwiferyDe = dataElements.find(de => de.originalName.includes(midwifery));
 
                 if (!personnelDe || !midwiferyDe) return [];
 
@@ -296,15 +296,7 @@ export class ValidateMidwiferyAndPersonnelUseCase {
         } else if (sectionDisaggregation.type === "key_occupations") {
             return [["2. Nursing Personnel", "3. Midwifery Personnel"]];
         } else {
-            return [
-                ["2 - Nursing Personnel", "3 - Midwifery personnel"],
-                ["2.1 - Nursing Professionals", "3.1 - Midwifery Professionals"],
-                [
-                    "2.2 - Nursing Associate Professionals",
-                    "3.2 - Midwifery Associate Professionals",
-                ],
-                ["2.3 - Nurses not further defined", "3.3 - Midwives not further defined"],
-            ];
+            return [["2 - Nursing Personnel", "3 - Midwifery personnel"]];
         }
     }
 

diff --git a/src/webapp/pages/analysis/steps/4-nursingMidwifery/useNursingMidwiferyStep.tsx b/src/webapp/pages/analysis/steps/4-nursingMidwifery/useNursingMidwiferyStep.tsx
@@ -5,6 +5,7 @@ import { QualityAnalysis } from "$/domain/entities/QualityAnalysis";
 import { QualityAnalysisSection } from "$/domain/entities/QualityAnalysisSection";
 import { UpdateAnalysisState } from "$/webapp/pages/analysis/AnalysisPage";
 import { Maybe } from "$/utils/ts-utils";
+import _ from "$/domain/entities/generic/Collection";
 
 export function useNursingMidwiferyStep(props: UseNursingMidwiferyStepProps) {
     const { analysis, section, updateAnalysis } = props;
@@ -23,7 +24,12 @@ export function useNursingMidwiferyStep(props: UseNursingMidwiferyStepProps) {
                     text: item.name,
                 }));
                 setDisaggregations(selectedDisaggregations);
-                setSelectedDissagregations(selectedDisaggregations.map(item => item.value));
+                setSelectedDissagregations(
+                    _(selectedDisaggregations)
+                        .map(item => (item.text === "Total" ? item.value : undefined))
+                        .compact()
+                        .value()
+                );
             },
             error => {
                 setError(error.message);