Merge pull request #28 from EyeSeeTea/fix/show-orgunit-name-edit-bug

Fix OrgUnit name not showing up & fix edit bug
EyeSeeTea · Apr 3, 2024 · e038db7 · e038db7
2 parents 9151cdc + b063212
commit e038db7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/data/utils/surveyListMappers.ts b/src/data/utils/surveyListMappers.ts
@@ -43,7 +43,7 @@ export const mapTrackedEntityToSurvey = (
             status: "ACTIVE",
             assignedOrgUnit: {
                 id: trackedEntity.orgUnit ?? "",
-                name: "",
+                name: trackedEntity.enrollments?.[0]?.orgUnitName ?? "",
             },
             surveyType: "",
             parentWardRegisterId: undefined,

diff --git a/src/domain/usecases/ApplyInitialRulesToSurveyUseCase.ts b/src/domain/usecases/ApplyInitialRulesToSurveyUseCase.ts
@@ -19,7 +19,7 @@ export class ApplyInitialRulesToSurveyUseCase {
         const currentParentId =
             module?.name === "PPS" ? currentPPSSurveyForm : currentPrevalenceSurveyForm;
 
-        const currentSurveyRules = module?.rulesBySurvey.find(
+        const currentSurveyRules = module?.rulesBySurvey?.find(
             rule => rule.surveyId === currentParentId
         )?.surveyRules;