#806 allow multiple enrolments. do not show same program twice in search results view even when active

Author: petmongrels

packages/openchs-android/package.json

@@ -50,7 +50,7 @@
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "native-base": "3.4.9",
-    "openchs-models": "1.27.14",
+    "openchs-models": "1.27.17",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-native": "0.69.7",

packages/openchs-android/src/service/IndividualService.js

@@ -96,7 +96,7 @@ class IndividualService extends BaseService {
     eligiblePrograms(individualUUID) {
         const individual = this.findByUUID(individualUUID);
         const programs = this.getService(FormMappingService).findActiveProgramsForSubjectType(individual.subjectType);
-        const nonEnrolledPrograms = individual.eligiblePrograms(programs);
+        const nonEnrolledPrograms = individual.staticallyEligiblePrograms(programs);
         const ruleEvaluationService = this.getService(RuleEvaluationService);
         const enrolProgramCriteria = `privilege.name = '${Privilege.privilegeName.enrolSubject}' AND privilege.entityType = '${Privilege.privilegeEntityType.enrolment}'`;
         const privilegeService = this.getService(PrivilegeService);

packages/openchs-android/src/views/common/SubjectInfoCard.js

@@ -8,7 +8,7 @@ import SubjectProfilePicture from "./SubjectProfilePicture";
 import OrganisationConfigService from "../../service/OrganisationConfigService";
 import _ from 'lodash';
 import ConceptService from "../../service/ConceptService";
-import {Observation} from 'avni-models';
+import {Observation, ProgramEnrolment} from 'openchs-models';
 import EncounterService from "../../service/EncounterService";
 import IndividualService from "../../service/IndividualService";
 import AddressLevelService from "../../service/AddressLevelService";
@@ -71,6 +71,9 @@ class SubjectInfoCard extends AbstractComponent {
         const i18n = this.I18n;
         const conceptService = this.getService(ConceptService);
         const iconContainerStyle = {minHeight: 72, alignItems: 'center', justifyContent: 'center'};
+        const enrolledPrograms = _.filter(this.props.individual.nonVoidedEnrolments(), (enrolment) => enrolment.isActive)
+            .map((x: ProgramEnrolment) => x.program);
+
         return (
             <View style={{
                 flexDirection: 'row',
@@ -127,7 +130,7 @@ class SubjectInfoCard extends AbstractComponent {
                         justifyContent: 'flex-end',
                         flexWrap: 'wrap',
                     }}>
-                        {_.filter(this.props.individual.nonVoidedEnrolments(), (enrolment) => enrolment.isActive).map((enrolment, index) => this.renderProgram(enrolment.program, index))}
+                        {_.uniqBy(enrolledPrograms, (x) => x.name).map((program, index) => this.renderProgram(program, index))}
                     </View>}
                 </View>
             </View>