Merge pull request #164 from Ritika-Patel08/#158

Improved: added 'groups' label and its translation in group type mapping
hotwax · Jan 9, 2024 · 0f8b3d9 · 0f8b3d9
2 parents 14f4fa5 + e459795
commit 0f8b3d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -169,6 +169,7 @@
   "Group": "Group",
   "Group associated to system group types.": "Group associated to system group types.",
   "Group unlinked from facility": "Group unlinked from facility",
+  "groups": "{count} groups",
   "Groups": "Groups",
   "group description": "group description",
   "Group description updated.": "Group description updated.",

diff --git a/src/views/FindGroups.vue b/src/views/FindGroups.vue
@@ -19,7 +19,7 @@
               <ion-label>
                 {{ groupType.description ? groupType.description : groupType.facilityGroupTypeId }}
               </ion-label>
-              <ion-select v-if="groups.length" :placeholder="translate('Select')" :selectedText="getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId).length > 1 ? getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId).length : getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId)[0]" :value="getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId)" @ionChange="updateFacilityGroupAssociation($event, getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId), groupType.facilityGroupTypeId)" :multiple="true">
+              <ion-select v-if="groups.length" :placeholder="translate('Select')" :selectedText="getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId).length > 1 ? translate('groups', { count: getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId).length }) : getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId)[0]" :value="getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId)" @ionChange="updateFacilityGroupAssociation($event, getAssociatedFacilityGroupIds(groupType.facilityGroupTypeId), groupType.facilityGroupTypeId)" :multiple="true">
                 <ion-select-option :value="group.facilityGroupId" :disabled="group.facilityGroupTypeId && group.facilityGroupTypeId !== groupType.facilityGroupTypeId" :key="group.facilityGroupId" v-for="group in groups">
                   {{ group.facilityGroupName ? group.facilityGroupName : group.facilityGroupId }}
                 </ion-select-option>