From 72fb834055d15b5e3c57285af1f4e40c22a381d4 Mon Sep 17 00:00:00 2001
From: Le <vietdung.le@cgi.com>
Date: Mon, 28 Oct 2024 19:10:39 -0700
Subject: [PATCH 1/5] ccfri-3678 - add Facility ID column to Licence Upload
 page

---
 .../ccofApplication/group/LicenseUpload.vue       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/ccofApplication/group/LicenseUpload.vue b/frontend/src/components/ccofApplication/group/LicenseUpload.vue
index 0ddc42d53..4f1ea54d3 100644
--- a/frontend/src/components/ccofApplication/group/LicenseUpload.vue
+++ b/frontend/src/components/ccofApplication/group/LicenseUpload.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container align="center">
+  <v-container class="px-xl-12">
     <v-form ref="form" v-model="isValidForm">
       <div align="center">
         <v-card v-if="isSomeChangeRequestActive() && isLocked && !isChangeRequest" class="my-10">
@@ -12,7 +12,7 @@
           </v-card-text>
         </v-card>
       </div>
-      <v-card width="1200" class="cc-top-level-card">
+      <v-card class="cc-top-level-card">
         <v-card-title class="text-center text-wrap pb-0">
           <h3>
             Licence Upload
@@ -30,6 +30,8 @@
           :items="licenseUploadData"
           hide-default-footer
           :items-per-page="-1"
+          :mobile="null"
+          mobile-breakpoint="md"
           class="pa-4"
         >
           <template #item.document="{ item }">
@@ -112,17 +114,26 @@ export default {
         {
           title: 'Facility Name',
           value: 'facilityName',
+          sortable: true,
+          width: '30%',
+        },
+        {
+          title: 'Facility ID',
+          value: 'facilityAccountNumber',
           sortable: false,
+          width: '20%',
         },
         {
           title: 'Facility Licence Number',
           value: 'licenseNumber',
           sortable: false,
+          width: '20%',
         },
         {
           title: 'Upload Licence',
           value: 'document',
           sortable: false,
+          width: '30%',
         },
       ],
       fileAccept: [

From 503e77ceaffc2ae1332b9689ef07cccd572cd372 Mon Sep 17 00:00:00 2001
From: Le <vietdung.le@cgi.com>
Date: Tue, 29 Oct 2024 10:52:03 -0700
Subject: [PATCH 2/5] ccfri-3632 - add facility id to left navBar

---
 frontend/src/components/util/NavBar.vue | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/util/NavBar.vue b/frontend/src/components/util/NavBar.vue
index bea808579..99eaf9e57 100644
--- a/frontend/src/components/util/NavBar.vue
+++ b/frontend/src/components/util/NavBar.vue
@@ -65,6 +65,9 @@
                 <div>
                   {{ subItem.subTitle }}
                 </div>
+                <div v-if="subItem.subTitle2">
+                  {{ subItem.subTitle2 }}
+                </div>
               </v-list-item-title>
             </v-list-item>
           </v-list-group>
@@ -421,6 +424,7 @@ export default {
             items.push({
               title: 'Parent Fees',
               subTitle: item.facilityName,
+              subTitle2: item.facilityAccountNumber,
               id: item.facilityId,
               link: {
                 name: 'change-request-ccfri-add-fees-guid',
@@ -438,6 +442,7 @@ export default {
               items.push({
                 title: 'Parent Fee Increase – RFI',
                 subTitle: item.facilityName,
+                subTitle2: item.facilityAccountNumber,
                 id: item.facilityId,
                 link: {
                   name: 'change-request-ccfri-request-info',
@@ -456,6 +461,7 @@ export default {
               items.push({
                 title: 'Parent Fee - RFI',
                 subTitle: item.facilityName,
+                subTitle2: item.facilityAccountNumber,
                 id: item.facilityId,
                 link: {
                   name: 'change-request-new-facilities',
@@ -503,6 +509,7 @@ export default {
               items.push({
                 title: 'Parent Fees',
                 subTitle: item.facilityName,
+                subTitle2: item.facilityAccountNumber,
                 id: item.facilityId,
                 link: {
                   name:
@@ -523,6 +530,7 @@ export default {
               items.push({
                 title: 'Parent Fees',
                 subTitle: item.facilityName,
+                subTitle2: item.facilityAccountNumber,
                 id: item.facilityId,
                 link: { name: 'ccfri-add-fees-guid', params: { urlGuid: item.ccfriApplicationId } },
                 isAccessible: this.applicationStatus === 'SUBMITTED' ? true : this.isCCFRIOptInComplete(),
@@ -537,6 +545,7 @@ export default {
               items.push({
                 title: 'Parent Fee Increase – RFI',
                 subTitle: item.facilityName,
+                subTitle2: item.facilityAccountNumber,
                 id: item.facilityId,
                 link: { name: 'ccfri-request-info', params: { urlGuid: item.ccfriApplicationId } },
                 isAccessible: true,
@@ -551,6 +560,7 @@ export default {
               items.push({
                 title: 'Parent Fee - RFI',
                 subTitle: item.facilityName,
+                subTitle2: item.facilityAccountNumber,
                 id: item.facilityId,
                 link: { name: 'new-facilities', params: { urlGuid: item.ccfriApplicationId } },
                 isAccessible: true,
@@ -589,7 +599,8 @@ export default {
         items.push(
           {
             title: 'Eligibility',
-            subTitle: this.navBarList[0].facilityName,
+            subTitle: this.navBarList[0]?.facilityName,
+            subTitle2: this.navBarList[0]?.facilityAccountNumber,
             id: this.navBarList[0].facilityId,
             link: { name: 'Eligibility GUID', params: { urlGuid: this.navBarList[0].facilityId } },
             isAccessible: true,
@@ -601,7 +612,8 @@ export default {
           },
           {
             title: 'Funding',
-            subTitle: this.navBarList[0].facilityName,
+            subTitle: this.navBarList[0]?.facilityName,
+            subTitle2: this.navBarList[0]?.facilityAccountNumber,
             link: { name: 'FamilyFunding GUID', params: { urlGuid: this.navBarList[0].ccofBaseFundingId } },
             isAccessible: true,
             icon: this.getCheckbox(this.navBarList[0].isCCOFComplete),
@@ -756,6 +768,7 @@ export default {
           items.push({
             title: 'Parent Fee Verification',
             subTitle: item.facilityName,
+            subTitle2: item.facilityAccountNumber,
             id: item.facilityId,
             link: {
               name: 'CCFRI Fee Verification',
@@ -776,6 +789,7 @@ export default {
             items.push({
               title: 'Parent Fee Increase – RFI',
               subTitle: item.facilityName,
+              subTitle2: item.facilityAccountNumber,
               id: item.facilityId,
               link: {
                 name: 'mtfi-change-request-ccfri-request-info',
@@ -811,6 +825,7 @@ export default {
             {
               title: 'Facility',
               subTitle: item.facilityName,
+              subTitle2: item.facilityAccountNumber,
               id: item.facilityId,
               link: {
                 name: 'change-request-facility-information-guid',
@@ -824,10 +839,10 @@ export default {
               position: positionIndex++,
               navBarId: navBarId++,
             },
-            //funding doesn't work right, wait until Viet is done integration before trying again
             {
               title: 'Funding',
               subTitle: item.facilityName,
+              subTitle2: item.facilityAccountNumber,
               link: {
                 name: 'change-request-funding-guid',
                 params: { changeRecGuid: this.$route.params.changeRecGuid, urlGuid: item.ccofBaseFundingId },
@@ -876,6 +891,7 @@ export default {
             {
               title: 'Facility',
               subTitle: item.facilityName,
+              subTitle2: item.facilityAccountNumber,
               id: item.facilityId,
               link: { name: 'Facility Information Guid', params: { urlGuid: item.facilityId } },
               isAccessible: true,
@@ -888,6 +904,7 @@ export default {
             {
               title: 'Funding',
               subTitle: item.facilityName,
+              subTitle2: item.facilityAccountNumber,
               link: { name: 'Funding Amount Guid', params: { urlGuid: item.ccofBaseFundingId } },
               isAccessible: true,
               icon: this.getCheckbox(item.isCCOFComplete),

From 3e9989f5f262fccee27e940be694b3ab40a924c3 Mon Sep 17 00:00:00 2001
From: Le <vietdung.le@cgi.com>
Date: Tue, 29 Oct 2024 14:45:45 -0700
Subject: [PATCH 3/5] ccfri-3820 - fix bug: next button does not update the
 Licence Upload complete icon

---
 frontend/src/components/ccofApplication/group/LicenseUpload.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ccofApplication/group/LicenseUpload.vue b/frontend/src/components/ccofApplication/group/LicenseUpload.vue
index 4f1ea54d3..e53ff77a7 100644
--- a/frontend/src/components/ccofApplication/group/LicenseUpload.vue
+++ b/frontend/src/components/ccofApplication/group/LicenseUpload.vue
@@ -287,7 +287,6 @@ export default {
         await this.processLicenseFileDelete();
         if (this.fileMap.size > 0) {
           await this.processLicenseFilesSave();
-          this.fileMap.clear(); // clear the map.
         }
         if (this.isChangeRequest) {
           this.setCRIsLicenseComplete({ changeRequestId: this.changeRequestId, isComplete: !this.nextButtonDisabled });
@@ -304,6 +303,7 @@ export default {
         console.error(e);
         this.setFailureAlert('An error occurred while saving. Please try again later.');
       } finally {
+        this.fileMap.clear(); // clear the map.
         this.isProcessing = false;
       }
     },

From ad9b1fb95e138d7db129a3e25d6d3a5eaa428773 Mon Sep 17 00:00:00 2001
From: weskubo-cgi <Wesley.Kubo@gov.bc.ca>
Date: Tue, 29 Oct 2024 15:37:56 -0700
Subject: [PATCH 4/5] Cleaned up landing page icon styling.

---
 frontend/src/components/LandingPage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/LandingPage.vue b/frontend/src/components/LandingPage.vue
index 7ac1dec61..9427bd0b9 100644
--- a/frontend/src/components/LandingPage.vue
+++ b/frontend/src/components/LandingPage.vue
@@ -29,10 +29,10 @@
                 </ul>
                 <v-card v-if="ccofStatus === CCOF_STATUS_NEW" color="#B3E5FF" class="mt-1 pa-1 py-2 mb-4" border="md">
                   <v-row align="center" no-gutters>
-                    <v-col :cols="12" md="3" lg="2" xl="1" align="center">
+                    <v-col cols="2" sm="1" align="center">
                       <v-icon color="#003366" aria-hidden="false" size="40"> mdi-information </v-icon>
                     </v-col>
-                    <v-col :cols="12" md="9" lg="10" xl="11" class="px-2 py-1">
+                    <v-col cols="10" sm="11" class="px-0 px-sm-2 py-1">
                       <div v-html="item.body" />
                     </v-col>
                   </v-row>

From 2b96e499e1e65efa2a07f80a9a3cba75f1fff7d0 Mon Sep 17 00:00:00 2001
From: Le <vietdung.le@cgi.com>
Date: Wed, 30 Oct 2024 10:30:12 -0700
Subject: [PATCH 5/5] ccfri-3632 - NavBar code cleanup

---
 frontend/src/components/util/NavBar.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/components/util/NavBar.vue b/frontend/src/components/util/NavBar.vue
index 99eaf9e57..cf258b6d1 100644
--- a/frontend/src/components/util/NavBar.vue
+++ b/frontend/src/components/util/NavBar.vue
@@ -194,7 +194,6 @@ export default {
   watch: {
     navRefresh: {
       handler() {
-        console.log('BuildNavBar called - trigged by navRefresh - computed value');
         this.buildNavBar();
       },
       immediate: true,
@@ -202,7 +201,6 @@ export default {
     },
     refreshNavBar: {
       handler() {
-        console.log('BuildNavBar called - trigged by navBarRefresh - forced refresh');
         this.buildNavBar();
       },
       immediate: true,
@@ -212,7 +210,6 @@ export default {
   methods: {
     ...mapActions(useNavBarStore, ['setNavBarItems', 'setCanSubmit']),
     setActive(item) {
-      this.items[1].expanded = false;
       let index = this.items.findIndex((obj) => obj.title === item.title);
       if (item.active) {
         this.items[index].active = false;
@@ -818,7 +815,6 @@ export default {
     },
     getAddNewFacilityCCOFNavigation() {
       let items = [];
-      console.log('changeRecGuid::::::::', this.$route.params.changeRecGuid);
       if (this.navBarList?.length > 0) {
         this.navBarList?.forEach((item) => {
           items.push(