Merge pull request #471 from bcgov/release-196-jb3

all the fancy new work :)

backend/src/components/application.js

@@ -321,7 +321,7 @@ async function postClosureDates(dates, ccfriApplicationGuid, res) {
 
 async function getECEWEApplication(req, res) {
   try {
-    let operation = 'ccof_applications(' + req.params.applicationId + ')?$select=ccof_ecewe_optin,ccof_ecewe_employeeunion,ccof_ecewe_selecttheapplicablefundingmodel,ccof_ecewe_selecttheapplicablesector,ccof_ecewe_confirmation&$expand=ccof_ccof_application_ccof_applicationecewe_application($select=ccof_name,_ccof_facility_value,ccof_optintoecewe,statuscode)';
+    let operation = 'ccof_applications(' + req.params.applicationId + ')?$select=ccof_ecewe_optin,ccof_ecewe_employeeunion,ccof_ecewe_selecttheapplicablefundingmodel,ccof_ecewe_selecttheapplicablesector,ccof_public_sector_employer,ccof_ecewe_confirmation&$expand=ccof_ccof_application_ccof_applicationecewe_application($select=ccof_name,_ccof_facility_value,ccof_optintoecewe,statuscode)';
     let eceweApp = await getOperation(operation);
     eceweApp = new MappableObjectForFront(eceweApp, ECEWEApplicationMappings);
     let forFrontFacilities = [];

backend/src/components/user.js

@@ -183,6 +183,7 @@ function updateFacilityWithChangeRequestDetails(changeRequestList, returnValue,
 
 function parseFacilityData(application, facilities) {
 
+  //all the facilites
   let facilityMap  = new Map(facilities?.map((m) => [m['accountid'], new MappableObjectForFront(m, UserProfileFacilityMappings).data]));
 
   if (application) {
@@ -206,7 +207,10 @@ function parseFacilityData(application, facilities) {
   }
   let facilityList = [];
   facilityMap.forEach((facility) => {
-    if (!_.isEmpty(facility)) {
+    // //only add a facility to the application Facility List if they have an application id shown below.
+    // //otherwise that facility does not exist in this application year.
+    //if application status is incomplete, show all available facilties so CR fac's will also appear for the draft application
+    if (facility.ccofBaseFundingId || facility.ccfriApplicationId || facility.eceweApplicationId || application.statuscode_formatted == 'Incomplete') {
       facility.ccofBaseFundingStatus = getLabelFromValue(facility.ccofBaseFundingStatus, CCOF_STATUS_CODES);
       facility.ccfriStatus = getLabelFromValue(facility.ccfriStatus, CCFRI_STATUS_CODES, 'NOT STARTED');
       facility.eceweStatus = getLabelFromValue(facility.eceweStatus, ECEWE_STATUS_CODES, 'NOT STARTED');

backend/src/util/mapping/Mappings.js

@@ -242,6 +242,7 @@ const ECEWEApplicationMappings = [
   { back: 'ccof_licensecomplete', front: 'isLicenseUploadComplete' },
   { back: 'ccof_ecewe_eligibility_complete', front: 'isEceweComplete' },
   { back: 'ccof_ecewe_selecttheapplicablesector', front: 'applicableSector' },
+  { back: 'ccof_public_sector_employer', front: 'publicSector' }, //null,
 ];
 
 const ECEWEFacilityMappings = [
@@ -342,6 +343,7 @@ const ProgramYearMappings = [
   { back: 'ccof_intakeperiodstart', front: 'intakeStart' },
   { back: 'ccof_intakeperiodend', front: 'intakeEnd' },
   { back: 'ccof_declarationbstart', front: 'declarationbStart' },
+  { back: 'ccof_ccfri_funding_guidelines', front: 'fundingGuidelinesUrl' },
 ];
 
 const MessageMappings = [
@@ -399,6 +401,7 @@ const ApplicationSummaryMappings = [
   { back: 'ccof_ecewe_confirmation', front: 'confirmation' }, //null,
   { back: 'ccof_ecewe_employeeunion', front: 'belongsToUnion' }, //0,
   { back: 'ccof_ecewe_selecttheapplicablefundingmodel', front: 'fundingModel' }, //null,
+  { back: 'ccof_public_sector_employer', front: 'publicSector' }, //null,
   // Unlock Details
   { back: 'ccof_unlock_ccof', front: 'unlockBaseFunding' }, //null,
   { back: 'ccof_unlock_ecewe', front: 'unlockEcewe' }, //null,

frontend/src/components/LandingPage.vue

@@ -99,8 +99,8 @@
             </v-row>
             <v-row>
               <v-col cols="12" style="text-align: center;">
-                <p>By clicking continue, all of your application data will be deleted. You will have to re-enter all information. Please be sure about this!</p>
-                <p class="pt-4">Are you very very sure??</p>
+                <p>If you cancel your application, any information you entered will be deleted. If you create a new application, you will need to re-enter this information.</p>
+                <p class="pt-4">Are you sure you want to cancel your application and delete your information?</p>
                 <v-btn :loading="!isLoadingComplete" dark color="secondary" class="mr-10" @click="closeDialog()">Back</v-btn>
                 <v-btn :loading="!isLoadingComplete" dark color="primary" @click="deletePcf()">Continue</v-btn>
               </v-col>

frontend/src/components/RFI/NMF.vue

@@ -11,7 +11,7 @@
 
       <div class="px-2 my-10">
         <p>
-          As outlined in the <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E" target="_blank">Funding Guidelines</a>
+          As outlined in the <a :href="fundingUrl"  target="_blank">Funding Guidelines</a>
           , applications by New, New-to-CCFRI, and Modified Facilities
           will be assessed based on whether the facility’s parent fees are comparable to others in their region.
           To determine if this policy applies to your facility, please provide more information.
@@ -141,7 +141,7 @@
           <div class="px-md-12 px-7 pb-10">
             <p class="text-h6 text--primary my-0">
               4. Please tell us anything else you’d like us to know about how your facility’s business case
-              supports setting fees higher than the Affordability Benchmarks outlined in the 2023/24 <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E" target="_blank">Funding Guidelines</a>.
+              supports setting fees higher than the Affordability Benchmarks outlined in the 2023/24 <a :href="fundingUrl"  target="_blank">Funding Guidelines</a>
             </p>
             <div class="pt-6">
               <v-textarea
@@ -193,12 +193,16 @@ export default {
     ...mapState('application', ['formattedProgramYear']),
     ...mapState('nmfApp', ['nmfModel']),
     ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId']),
+    ...mapGetters('app', [ 'getFundingUrl']),
     currentFacility(){
       return this.getNavByCCFRIId(this.$route.params.urlGuid);
     },
     isReadOnly(){
       return (!this.currentFacility.unlockNmf);
     },
+    fundingUrl(){
+      return this.getFundingUrl(this.programYearId);
+    },
   },
   watch: {
     '$route.params.urlGuid': {

frontend/src/components/RFI/RFILanding.vue

@@ -26,8 +26,7 @@
         <p>
           You have entered a parent fee above the 2023/24 fee increase limit.
           Fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy.
-          See the <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E" target="_blank">CCFRI
-          Funding Guidelines</a> for more information.
+          See the <a :href="fundingUrl"  target="_blank">Funding Guidelines</a> for more information.
         </p>
         <p>
           Complete this section to provide more information about your fee increase, or click “Back” to return to the
@@ -49,8 +48,7 @@
           </div>
           <br>
           <p class="text-h6 text--primary px-md-10 px-7 py-0 my-0">
-            As outlined in the <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E"
-                                  target="_blank">Funding Guidelines</a>, this exception applies to sudden and
+            As outlined in the <a :href="fundingUrl"  target="_blank">Funding Guidelines</a>, this exception applies to sudden and
             unexpected expenses that:
           </p>
           <div class="px-md-14 px-7 text--primary">
@@ -127,8 +125,7 @@
                 class="mr-5"
               > mdi-information
               </v-icon>
-              <strong>Note: See the <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E"
-                                       target="_blank">Funding Guidelines</a> for the list of eligible expenses</strong>
+              <strong>Note: See the <a :href="fundingUrl"  target="_blank">Funding Guidelines</a> for the list of eligible expenses</strong>
             </v-banner>
             <div class="px-md-12 px-7">
 
@@ -474,27 +471,27 @@
             </v-radio-group>
 
             <div v-if="model.feeIncreaseDueToWage == 1">
-              <br>
-
-              <v-radio-group
-                class="radio-label"
-                :disabled="isReadOnly"
-                :rules="rules.required"
-                required
-                row
-                v-model="model.increaseInWriting"
-                label="Was the wage increase committed to (in writing) before the January 2022 release of the Funding Guidelines?"
-              >
-                <v-radio
-                  label="Yes"
-                  :value="1"
-                ></v-radio>
-                <v-radio
-                  label="No"
-                  :value="0"
-                ></v-radio>
-              </v-radio-group>
-
+              <div v-if="languageYearLabel == programYearTypes.HISTORICAL">
+                <br>
+                <v-radio-group
+                  class="radio-label"
+                  :disabled="isReadOnly"
+                  :rules="rules.required"
+                  required
+                  row
+                  v-model="model.increaseInWriting"
+                  label="Was the wage increase committed to (in writing) before the January 2022 release of the Funding Guidelines?"
+                >
+                  <v-radio
+                    label="Yes"
+                    :value="1"
+                  ></v-radio>
+                  <v-radio
+                    label="No"
+                    :value="0"
+                  ></v-radio>
+                </v-radio-group>
+              </div>
               <br>
 
               <v-radio-group
@@ -1503,6 +1500,7 @@ import {isEqual} from 'lodash';
 import rules from '@/utils/rules';
 import RFIDocumentUpload from '@/components/RFI/RFIDocumentUpload';
 import NavButton from '@/components/util/NavButton';
+import {PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 
 let model = {
   expansionList: [],
@@ -1598,14 +1596,24 @@ export default {
   computed: {
     ...mapState('rfiApp', ['rfiModel', 'loadedModel']),
     ...mapState('app', ['programYearList']),
-    ...mapState('application', ['formattedProgramYear', 'applicationStatus', 'applicationId']),
+    ...mapState('application', ['formattedProgramYear', 'applicationStatus', 'applicationId', 'programYearId']),
     ...mapState('navBar',['changeRequestId']),
     ...mapGetters('supportingDocumentUpload', ['getUploadedDocuments']),
     ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId','isChangeRequest']),
     ...mapGetters('reportChanges',['changeRequestStatus']),
+    ...mapGetters('app', [ 'getFundingUrl', 'getLanguageYearLabel']),
     currentFacility() {
       return this.getNavByCCFRIId(this.$route.params.urlGuid);
     },
+    fundingUrl(){
+      return this.getFundingUrl(this.programYearId);
+    },
+    languageYearLabel(){
+      return this.getLanguageYearLabel;
+    },
+    programYearTypes(){
+      return PROGRAM_YEAR_LANGUAGE_TYPES;
+    },
     isReadOnly() {
       //if submitted, lock er up. If unlock CCFRI - unlock
       if (this.currentFacility?.unlockRfi) {

frontend/src/components/ccfriApplication/group/AddNewFees.vue

@@ -206,7 +206,8 @@
           <div class="px-md-12 px-7">
             <br>
             <div>
-              <p> Do you charge parent fees at this facility for any closures on business days (other than designated holidays)? Only indicate the date of closures where parent fees are charged. </p>
+              <p v-if="languageYearLabel == programYearTypes.HISTORICAL"> Do you charge parent fees at this facility for any closures on business days (other than designated holidays)? Only indicate the date of closures where parent fees are charged. </p>
+              <p v-else> Do you charge parent fees at this facility for any closures on business days (other than provincial statutory holidays)? Only indicate the date of closures where parent fees are charged. </p>
             </div>
             <v-radio-group
               required
@@ -429,7 +430,7 @@
                 <p class="pt-4">You have entered a parent fee above the {{formattedProgramYear}} parent fee increase limit for the following care categories:<br><br>
                   <span v-for="item in rfi3percentCategories" :key="item">{{item}}<br></span>
                 </p>
-                <p>Parent fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy in the {{formattedProgramYear}} <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E" target="_blank">Funding Guidelines</a>. You can continue to the Request for Information section or press back to update your fees.</p>
+                <p>Parent fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy in the {{formattedProgramYear}} <a :href="fundingUrl"  target="_blank">Funding Guidelines</a>. You can continue to the Request for Information section or press back to update your fees.</p>
                 <p class="pt-4">Please confirm you have provided your highest full-time (i.e. over 4 hours, 5 days a week) parent fee for each care category before CCFRI is applied. Submit your daily parent fee if you only offer care for 4 days or fewer per week.</p>
                 <v-btn dark color="secondary" class="mr-10" @click="closeDialog()">Back</v-btn>
                 <v-btn dark color="primary" @click="toRfi()">Continue</v-btn>
@@ -442,7 +443,7 @@
   </v-form>
 </template>
 <script>
-import { PATHS, pcfUrlGuid, pcfUrl, changeUrl, changeUrlGuid, CHANGE_TYPES } from '@/utils/constants';
+import { PATHS, pcfUrlGuid, pcfUrl, changeUrl, changeUrlGuid, CHANGE_TYPES, PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 import { mapGetters, mapState, mapActions, mapMutations} from 'vuex';
 import alertMixin from '@/mixins/alertMixin';
 import globalMixin from '@/mixins/globalMixin';
@@ -513,18 +514,26 @@ export default {
     next();
   },
   computed: {
-    ...mapGetters('app', ['lookupInfo']),
+    ...mapGetters('app', [ 'getFundingUrl', 'getLanguageYearLabel']),
     ...mapState('application', ['applicationStatus', 'formattedProgramYear', 'programYearId', 'applicationId', 'isRenewal']),
     ...mapState('navBar', ['navBarList','changeRequestId', 'changeType']),
     ...mapState('ccfriApp', ['CCFRIFacilityModel', 'ccfriChildCareTypes', 'loadedModel', 'ccfriId']),
     ...mapGetters('ccfriApp', ['getClosureDateLength']),
     ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId','isChangeRequest', 'getChangeActionNewFacByFacilityId']),
     ...mapState('reportChanges',['userProfileChangeRequests']),
     ...mapGetters('reportChanges',['changeRequestStatus']),
-
+    languageYearLabel(){
+      return this.getLanguageYearLabel;
+    },
+    programYearTypes(){
+      return PROGRAM_YEAR_LANGUAGE_TYPES;
+    },
     currentFacility(){
       return this.getNavByCCFRIId(this.$route.params.urlGuid);
     },
+    fundingUrl(){
+      return this.getFundingUrl(this.programYearId);
+    },
     isReadOnly(){
       //if submitted, lock er up. If unlock CCFRI - unlock
       if (this.currentFacility.unlockCcfri){