Merge pull request #56 from EyeSeeTea/fix/facility-code-col

facility code column
EyeSeeTea · May 24, 2024 · 6dc75dd · 6dc75dd
2 parents d634b0f + 80bafde
commit 6dc75dd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/data/entities/D2Survey.ts b/src/data/entities/D2Survey.ts
@@ -62,6 +62,8 @@ export const AMR_SURVEYS_PREVALENCE_TEA_PATIENT_ID = "mUaaSzbeMmj";
 export const AMR_SURVEYS_PREVALENCE_TEA_AMRPATIENT_IDPREVALENCE = "M1D2XXokPWl";
 export const AMR_SURVEYS_PREVALENCE_TEA_PATIENT_IDA19 = "yq8en6ZkENB";
 
+export const AMR_SURVEYS_PREVALENCE_TEA_HOSPITAL_ID = "hpNIfydqgkD";
+
 //Prevalence Tracked Entity Attribute types
 export const PREVALENCE_FACILITY_LEVEL_TET = "eY4BDBKXegX";
 export const PREVALENCE_CASE_REPORT_TET = "hyR1eTHLX8B";

diff --git a/src/data/utils/surveyListMappers.ts b/src/data/utils/surveyListMappers.ts
@@ -20,6 +20,7 @@ import {
     AMR_SURVEYS_MORTALITY_TEA_SURVEY_ID_FUP,
     AMR_SURVEYS_MORTALITY_TEA_SURVEY_ID_DF,
     AMR_SURVEYS_MORTALITY_TEA_SURVEY_ID_COH,
+    AMR_SURVEYS_PREVALENCE_TEA_HOSPITAL_ID,
 } from "../entities/D2Survey";
 import { D2TrackerEvent } from "@eyeseetea/d2-api/api/trackerEvents";
 import { getSurveyNameBySurveyFormType } from "./surveyProgramHelper";
@@ -56,6 +57,11 @@ export const mapTrackedEntityToSurvey = (
                     attribute.attribute === AMR_SURVEYS_MORTALITY_TEA_PAT_ID_COH2
             )?.value ?? "";
 
+        const facilityCode =
+            trackedEntity.attributes?.find(
+                attribute => attribute.attribute === AMR_SURVEYS_PREVALENCE_TEA_HOSPITAL_ID
+            )?.value ?? "";
+
         const survey: Survey = {
             id: trackedEntity.trackedEntity ?? "",
             name: trackedEntity.trackedEntity ?? "",
@@ -75,6 +81,7 @@ export const mapTrackedEntityToSurvey = (
             surveyFormType: surveyFormType,
             childCount: undefined,
             uniquePatient: { id: patientId, code: "" },
+            facilityCode: facilityCode,
         };
         return survey;
     });

diff --git a/src/domain/entities/Survey.ts b/src/domain/entities/Survey.ts
@@ -54,4 +54,5 @@ export interface Survey extends SurveyBase {
     parentWardRegisterId?: Id;
     uniquePatient?: { id: string; code: string };
     childCount?: number | ProgramOptionCountMap;
+    facilityCode?: string;
 }
diff --git a/src/webapp/components/survey-list/table/SurveyListTable.tsx b/src/webapp/components/survey-list/table/SurveyListTable.tsx
@@ -277,7 +277,7 @@ export const SurveyListTable: React.FC<SurveyListTableProps> = ({
                                                 <TableCell>{survey.assignedOrgUnit.name}</TableCell>
                                             )}
                                             {surveyFormType === "PrevalenceFacilityLevelForm" && (
-                                                <TableCell>{survey.id}</TableCell>
+                                                <TableCell>{survey.facilityCode}</TableCell>
                                             )}
 
                                             {(surveyFormType === "PPSSurveyForm" ||