avniproject/avni-models#48 | Minor Code refactoring to create and use…

… getAffiliatedGroups()
avniproject · Aug 11, 2023 · b586abe · b586abe
1 parent 3089d58
commit b586abe
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 21 deletions.
diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json
diff --git a/packages/openchs-android/src/state/IndividualRegistrationState.js b/packages/openchs-android/src/state/IndividualRegistrationState.js
@@ -33,11 +33,15 @@ class IndividualRegistrationState extends AbstractDataEntryState {
     getEntityContext() {
         return {
             group: this.group,
-            affiliatedGroups: this.groupAffiliation ?
-              _.map(this.groupAffiliation.groupSubjectObservations, ({groupSubject}) => groupSubject) : []
+            affiliatedGroups: this.getAffiliatedGroups()
         }
     }
 
+    getAffiliatedGroups() {
+        return this.groupAffiliation ?
+          _.map(this.groupAffiliation.groupSubjectObservations, ({groupSubject}) => groupSubject) : [];
+    }
+
     static createLoadState(form, genders, individual, workLists, minLevelTypeUUIDs, saveDrafts, groupAffiliationState, isNewEntity, group) {
         const wizard = new Wizard(_.isNil(form) ? 1 : form.numberOfPages + 1, 2);
         const individualRegistrationState = new IndividualRegistrationState([],

diff --git a/packages/openchs-android/src/state/ProgramEnrolmentState.js b/packages/openchs-android/src/state/ProgramEnrolmentState.js
@@ -54,9 +54,13 @@ class ProgramEnrolmentState extends AbstractDataEntryState {
 
     getEntityContext() {
         return {
-            affiliatedGroups: this.groupAffiliation ?
-              _.map(this.groupAffiliation.groupSubjectObservations, ({groupSubject}) => groupSubject) : []
-        };
+            affiliatedGroups: this.getAffiliatedGroups()
+        }
+    }
+
+    getAffiliatedGroups() {
+        return this.groupAffiliation ?
+          _.map(this.groupAffiliation.groupSubjectObservations, ({groupSubject}) => groupSubject) : [];
     }
 
     get staticFormElementIds() {

diff --git a/packages/openchs-android/src/state/SubjectRegistrationState.js b/packages/openchs-android/src/state/SubjectRegistrationState.js
@@ -30,11 +30,15 @@ class SubjectRegistrationState extends AbstractDataEntryState {
     getEntityContext() {
         return {
             group: this.group,
-            affiliatedGroups: this.groupAffiliation ?
-              _.map(this.groupAffiliation.groupSubjectObservations, ({groupSubject}) => groupSubject) : []
+            affiliatedGroups: this.getAffiliatedGroups()
         }
     }
 
+    getAffiliatedGroups() {
+        return this.groupAffiliation ?
+          _.map(this.groupAffiliation.groupSubjectObservations, ({groupSubject}) => groupSubject) : [];
+    }
+
     static createOnLoad(subject, form, isNewEntity, formElementGroup, filteredFormElements, formElementStatuses, workLists, minLevelTypeUUIDs, isSaveDraftOn, groupAffiliationState, context, group) {
         let indexOfGroup = _.findIndex(form.getFormElementGroups(), (feg) => feg.uuid === formElementGroup.uuid) + 1;
         const timerState = formElementGroup.timed && isNewEntity ? new TimerState(formElementGroup.startTime, formElementGroup.stayTime) : null;

diff --git a/packages/openchs-android/src/views/individual/PersonRegisterViewsMixin.js b/packages/openchs-android/src/views/individual/PersonRegisterViewsMixin.js
@@ -22,9 +22,11 @@ class Mixin {
                 });
                 const registrationTitle = view.I18n.t(view.registrationType) + view.I18n.t('registration');
                 const headerMessage = `${registrationTitle} - ${view.I18n.t('summaryAndRecommendations')}`;
-                const affiliatedGroups = state.groupAffiliation ?
-                  _.map(state.groupAffiliation.groupSubjectObservations, ({groupSubject}) => groupSubject) : [];
-                CHSNavigator.navigateToSystemsRecommendationView(view, decisions, ruleValidationErrors, state.individual, state.individual.observations, Actions.SAVE, onSaveCallback, headerMessage, null, nextScheduledVisits, state.form, state.workListState,null, state.saveDrafts, popVerificationVew, state.individual.isRejectedEntity(), state.individual.latestEntityApprovalStatus, undefined, affiliatedGroups);
+                CHSNavigator.navigateToSystemsRecommendationView(view, decisions, ruleValidationErrors, state.individual,
+                  state.individual.observations, Actions.SAVE, onSaveCallback, headerMessage, null,
+                  nextScheduledVisits, state.form, state.workListState,null, state.saveDrafts,
+                  popVerificationVew, state.individual.isRejectedEntity(), state.individual.latestEntityApprovalStatus,
+                  undefined, state.getAffiliatedGroups());
             },
                 movedNext: (state) => {
             if (state.wizard.isFirstFormPage())

diff --git a/packages/openchs-android/src/views/subject/SubjectRegisterView.js b/packages/openchs-android/src/views/subject/SubjectRegisterView.js
@@ -122,10 +122,11 @@ class SubjectRegisterView extends AbstractComponent {
                 };
                 const registrationTitle = this.I18n.t(this.registrationType) + this.I18n.t('registration');
                 const headerMessage = `${registrationTitle} - ${this.I18n.t('summaryAndRecommendations')}`;
-                const affiliatedGroups = state.groupAffiliation ?
-                  _.map(state.groupAffiliation.groupSubjectObservations, ({groupSubject}) => groupSubject) : [];
-                CHSNavigator.navigateToSystemsRecommendationView(this, decisions, ruleValidationErrors, state.subject, observations, Actions.SAVE, onSaveCallback, headerMessage,
-                    null, nextScheduledVisits, state.form, state.workListState, null, this.state.saveDrafts, popVerificationVew, state.subject.isRejectedEntity(), this.state.subject.latestEntityApprovalStatus, undefined, affiliatedGroups);
+                CHSNavigator.navigateToSystemsRecommendationView(this, decisions, ruleValidationErrors, state.subject,
+                  observations, Actions.SAVE, onSaveCallback, headerMessage,
+                    null, nextScheduledVisits, state.form, state.workListState, null,
+                  this.state.saveDrafts, popVerificationVew, state.subject.isRejectedEntity(),
+                  this.state.subject.latestEntityApprovalStatus, undefined, state.getAffiliatedGroups());
             },
             popVerificationVewFunc: () => TypedTransition.from(this).popToBookmark(),
             phoneNumberObservation,