Merge pull request #497 from bcgov/release-196-jb7

Release 196 jb7
bcgov · Dec 21, 2023 · 0477ff4 · 0477ff4
2 parents 71278ff + 5faa31b
commit 0477ff4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/frontend/src/components/LandingPage.vue b/frontend/src/components/LandingPage.vue
@@ -110,7 +110,7 @@
         </v-card>
       </v-dialog>
 
-      <SmallCard :class="smallCardLayout('RENEW')" :title="`Renew my funding agreement for ${renewalYearLabel}`" :disable="!isRenewEnabled ">
+      <SmallCard :class="smallCardLayout('RENEW')" :title="`Renew my funding agreement for ${renewalYearLabel}`" :disable="!(ccofRenewStatus === RENEW_STATUS_ACTION_REQUIRED || isRenewEnabled) ">
         <template #content>
           <!-- <p class="text-h6">Renew my Funding Agreement {{ renewalYearLabel }}</p> -->
           <p class="text-h6">Renew my Funding Agreement {{ getRenewYearLabel }}</p>
@@ -136,7 +136,7 @@
             <!-- {{ isRenewEnabled }} -->
             <v-btn :color='buttonColor(!isRenewEnabled)' dark v-if="ccofRenewStatus === RENEW_STATUS_NEW" @click="renewApplication()">Renew my Funding Agreement </v-btn>
             <v-btn :color='buttonColor(!isRenewEnabled)' dark v-else-if="ccofRenewStatus === RENEW_STATUS_CONTINUE" @click="continueRenewal()">Continue Renewal</v-btn>
-            <v-btn :color='buttonColor(!isRenewEnabled)' dark v-else-if="ccofRenewStatus === RENEW_STATUS_ACTION_REQUIRED" @click="actionRequiredOrganizationRoute()">Update your PCF</v-btn>
+            <v-btn :color='buttonColor(false)' dark v-else-if="ccofRenewStatus === RENEW_STATUS_ACTION_REQUIRED" @click="actionRequiredOrganizationRoute()">Update your PCF</v-btn>
             <v-btn :color='buttonColor(true)' :disabled=true v-else>Renew my Funding Agreement</v-btn>
           </div>
         </template>

diff --git a/frontend/src/components/RFI/NMF.vue b/frontend/src/components/RFI/NMF.vue
@@ -192,10 +192,12 @@ export default {
   computed: {
     ...mapState('application', ['formattedProgramYear']),
     ...mapState('nmfApp', ['nmfModel']),
+    ...mapState('navBar', ['navBarList']),
     ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId']),
     ...mapGetters('app', [ 'getFundingUrl']),
     currentFacility(){
-      return this.getNavByCCFRIId(this.$route.params.urlGuid);
+      //return this.getNavByCCFRIId(this.$route.params.urlGuid);
+      return this.navBarList.find(el => el.ccfriApplicationId == this.$route.params.urlGuid );
     },
     isReadOnly(){
       return (!this.currentFacility.unlockNmf);

diff --git a/frontend/src/components/RFI/RFILanding.vue b/frontend/src/components/RFI/RFILanding.vue
@@ -1597,13 +1597,14 @@ export default {
     ...mapState('rfiApp', ['rfiModel', 'loadedModel']),
     ...mapState('app', ['programYearList']),
     ...mapState('application', ['formattedProgramYear', 'applicationStatus', 'applicationId', 'programYearId']),
-    ...mapState('navBar',['changeRequestId']),
+    ...mapState('navBar',['changeRequestId', 'navBarList']),
     ...mapGetters('supportingDocumentUpload', ['getUploadedDocuments']),
     ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId','isChangeRequest']),
     ...mapGetters('reportChanges',['changeRequestStatus']),
     ...mapGetters('app', [ 'getFundingUrl', 'getLanguageYearLabel']),
     currentFacility() {
-      return this.getNavByCCFRIId(this.$route.params.urlGuid);
+      //return this.getNavByCCFRIId(this.$route.params.urlGuid);
+      return this.navBarList.find(el => el.ccfriApplicationId == this.$route.params.urlGuid );
     },
     fundingUrl(){
       return this.getFundingUrl(this.programYearId);

diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -7,9 +7,13 @@
       </div>
       <br>
       <div class="row pt-4 justify-center">
-      <span class="text-h5">Child Care Fee Reduction Initiative (CCFRI)</span>
+        <span class="text-h5">Child Care Fee Reduction Initiative (CCFRI)</span>
+      </div>
+    <br>
+    <div class="row pt-4 justify-center" v-if="currentFacility.facilityAccountNumber">
+        <span class="text-h5">{{currentFacility.facilityAccountNumber}}</span>
     </div>
-    <br><br>
+    <br>
       <p class="text-h5 text-center" style="color: rgb(0, 52, 102)"> Facility Name:  {{currentFacility.facilityName}}  </p> <br><br>
       <p>
         Enter the fees you charged a new parent for full-time care at this facility for the months below. <br><br>
@@ -541,11 +545,12 @@ export default {
       return PROGRAM_YEAR_LANGUAGE_TYPES;
     },
     currentFacility(){
-      if (this.getNavByCCFRIId(this.$route.params.urlGuid)){
-        return this.getNavByCCFRIId(this.$route.params.urlGuid);
-      }
-      //if viewing historical CR - getNavByCCFRID will not work because fac won't be in userProfile. Load from navBarList instead
-      else return this.navBarList.find(el => el.ccfriApplicationId == this.$route.params.urlGuid );
+      // if (this.getNavByCCFRIId(this.$route.params.urlGuid)){
+      //   return this.getNavByCCFRIId(this.$route.params.urlGuid);
+      // }
+      // //if viewing historical CR - getNavByCCFRID will not work because fac won't be in userProfile. Load from navBarList instead
+      // else
+      return this.navBarList.find(el => el.ccfriApplicationId == this.$route.params.urlGuid );
     },
     fundingUrl(){
       return this.getFundingUrl(this.programYearId);

diff --git a/frontend/src/components/ccfriApplication/group/CcfriEceLanding.vue b/frontend/src/components/ccfriApplication/group/CcfriEceLanding.vue
@@ -24,11 +24,12 @@
         <!-- <v-skeleton-loader max-height="475px" v-if="!facilityList" :loading="loading"  type="image, image, image"></v-skeleton-loader> -->
 
         <v-card elevation="4" class="py-2 px-5 mx-2 my-10 rounded-lg col-12 " min-width="500px" rounded tiled exact tile
-          :ripple="false" v-for="({ facilityName, facilityId, licenseNumber, ccfriOptInStatus }, index) in navBarList"
+          :ripple="false" v-for="({ facilityName, facilityId, licenseNumber, ccfriOptInStatus, facilityAccountNumber }, index) in navBarList"
           :key="facilityId">
           <v-card-text>
             <v-row>
               <v-col cols="" class="col-12 col-md-7">
+                <p class="text--primary " v-if="facilityAccountNumber"><strong>  {{ facilityAccountNumber }}</strong></p>
                 <p class="text--primary "><strong> Facility Name: {{ facilityName }}</strong></p>
                 <p class="text--primary"> Licence: {{ licenseNumber }}</p>
                 <strong>

diff --git a/frontend/src/mixins/facilityMixin.js b/frontend/src/mixins/facilityMixin.js
@@ -38,7 +38,7 @@ export default {
     isModelEmpty() {
       return !(Object.values(this.model)?.some(item => item));
     },
-},
+  },
   async beforeRouteLeave(_to, _from, next) {
     if (!this.isModelEmpty) {
       await this.save(false);