Merge pull request #238 from bcgov/stories/ss-764-bulk-unassign-in-ma…

…nage-duties-screen SS-764: Show lookup code as fallback for assignment name
bcgov · Jun 24, 2024 · a477cc7 · a477cc7
2 parents b09185d + 8f9d1c5
commit a477cc7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/web/src/components/common/BulkUnassignModal.vue b/web/src/components/common/BulkUnassignModal.vue
@@ -126,13 +126,16 @@
     
         mounted() {
             this.$root.$on('bv::modal::show', (bvEvent, modalId) => {
-                
                 const constructDutyBlocks: Array<dutyBlockWeekInfoType & { assignmentName: string }> = [];
                 this.selectedDuties.forEach((sd) => {
                     sd.dutyBlock?.forEach((db) => {
                         const assignmentId = this.dutyRostersJson.find((dr) => dr.id === db.dutyId)?.assignmentId;
                         const findAssignment = this.dutyRosterAssignmentsWeek.find((aw) => aw.assignmentDetail.id === assignmentId);
-                        const assignmentName = findAssignment?.assignmentDetail?.name ? findAssignment.assignmentDetail.name : '';
+                        
+                        let assignmentName = '';
+
+                        if (findAssignment?.assignmentDetail?.name) assignmentName = findAssignment.assignmentDetail.name; 
+                        else if (findAssignment?.assignmentDetail?.lookupCode?.code) assignmentName = findAssignment.assignmentDetail.lookupCode.code;
 
                         constructDutyBlocks.push({...db, assignmentName: assignmentName});
                     });