Merge pull request #562 from bcgov/ccfri-3816-ece-we-update-family

Ccfri 3816 ece we update family

Author: jenbeckett

backend/src/components/application.js

@@ -58,7 +58,7 @@
 
             <div v-else-if="ccofStatus === CCOF_STATUS_CONTINUE">
               <p class="text-h5 blueText">Status: Incomplete</p>
-              <v-btn theme="dark" class="blueButton" @click="continueApplication()"> Continue Application </v-btn>
+              <v-btn theme="dark" class="blueButton" @click="goToCCOFOrganizationInfo()"> Continue Application </v-btn>
               <p class="mt-4">Fiscal year runs April 1 to March 31</p>
               <v-btn v-if="isCancelPcfButtonEnabled" theme="dark" class="redButton" @click="openDialog()">
                 Cancel Application
@@ -348,7 +348,13 @@ import { useMessageStore } from '@/store/message.js';
 import SmallCard from '@/components/guiComponents/SmallCard.vue';
 import MessagesToolbar from '@/components/guiComponents/MessagesToolbar.vue';
 import FiscalYearSlider from '@/components/guiComponents/FiscalYearSlider.vue';
-import { PATHS, pcfUrl, pcfUrlGuid, CHANGE_REQUEST_EXTERNAL_STATUS } from '@/utils/constants.js';
+import {
+  PATHS,
+  pcfUrl,
+  pcfUrlGuid,
+  CHANGE_REQUEST_EXTERNAL_STATUS,
+  ORGANIZATION_PROVIDER_TYPES,
+} from '@/utils/constants.js';
 import alertMixin from '@/mixins/alertMixin.js';
 import { checkApplicationUnlocked } from '@/utils/common.js';
 
@@ -660,19 +666,13 @@ export default {
       this.setIsRenewal(false);
       this.$router.push(pcfUrl(PATHS.SELECT_APPLICATION_TYPE, this.programYearList.newApp.programYearId));
     },
-    continueApplication() {
-      this.setIsRenewal(false);
-      this.$router.push(
-        pcfUrl(
-          this.organizationProviderType === 'GROUP' ? PATHS.CCOF_GROUP_ORG : PATHS.CCOF_FAMILY_ORG,
-          this.programYearId,
-        ),
-      );
-    },
     goToCCOFOrganizationInfo() {
+      this.setIsRenewal(false);
       this.$router.push(
         pcfUrl(
-          this.organizationProviderType === 'GROUP' ? PATHS.CCOF_GROUP_ORG : PATHS.CCOF_FAMILY_ORG,
+          this.organizationProviderType === ORGANIZATION_PROVIDER_TYPES.GROUP
+            ? PATHS.CCOF_GROUP_ORG
+            : PATHS.CCOF_FAMILY_ORG,
           this.programYearId,
         ),
       );
@@ -683,7 +683,9 @@ export default {
         if (ccofBaseFundingId && programYearId) {
           this.$router.push(
             pcfUrlGuid(
-              this.organizationProviderType === 'GROUP' ? PATHS.CCOF_GROUP_FUNDING : PATHS.CCOF_FAMILY_FUNDING,
+              this.organizationProviderType === ORGANIZATION_PROVIDER_TYPES.GROUP
+                ? PATHS.CCOF_GROUP_FUNDING
+                : PATHS.CCOF_FAMILY_FUNDING,
               programYearId,
               ccofBaseFundingId,
             ),

frontend/src/components/LandingPage.vue

@@ -125,7 +125,9 @@
                     <div v-if="!facility.funding || isRenewal" />
                     <div v-else>
                       <CCOFSummaryFamily
-                        v-if="summaryModel?.application?.organizationProviderType == 'FAMILY'"
+                        v-if="
+                          summaryModel?.application?.organizationProviderType === ORGANIZATION_PROVIDER_TYPES.FAMILY
+                        "
                         :funding="facility.funding"
                         :facility-id="facility.facilityId"
                         :program-year-id="summaryModel?.application?.programYearId"
@@ -433,7 +435,12 @@ import { useSummaryDeclarationStore } from '@/store/summaryDeclaration.js';
 import { useApplicationStore } from '@/store/application.js';
 import { useReportChangesStore } from '@/store/reportChanges.js';
 
-import { PATHS, CHANGE_REQUEST_TYPES, PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants.js';
+import {
+  PATHS,
+  CHANGE_REQUEST_TYPES,
+  PROGRAM_YEAR_LANGUAGE_TYPES,
+  ORGANIZATION_PROVIDER_TYPES,
+} from '@/utils/constants.js';
 import alertMixin from '@/mixins/alertMixin.js';
 import NavButton from '@/components/util/NavButton.vue';
 import FacilityInformationSummary from '@/components/summary/group/FacilityInformationSummary.vue';
@@ -663,6 +670,9 @@ export default {
       this.expandAllPanels();
     }
   },
+  created() {
+    this.ORGANIZATION_PROVIDER_TYPES = ORGANIZATION_PROVIDER_TYPES;
+  },
   methods: {
     ...mapActions(useSummaryDeclarationStore, [
       'loadDeclaration',

frontend/src/components/SummaryDeclaration.vue

@@ -48,7 +48,7 @@ import { useAppStore } from '../../store/app.js';
 import { useOrganizationStore } from '../../store/ccof/organization.js';
 
 import LargeCard from '../../components/guiComponents/LargeCard.vue';
-import { PATHS, pcfUrl } from '../../utils/constants.js';
+import { PATHS, pcfUrl, ORGANIZATION_PROVIDER_TYPES } from '@/utils/constants.js';
 import NavButton from '../../components/util/NavButton.vue';
 
 export default {
@@ -63,11 +63,11 @@ export default {
       this.$router.push(PATHS.ROOT.HOME);
     },
     toGroup() {
-      this.setOrganizationProviderType('GROUP');
+      this.setOrganizationProviderType(ORGANIZATION_PROVIDER_TYPES.GROUP);
       this.$router.push(pcfUrl(PATHS.CCOF_GROUP_ORG, this.programYearList.newApp.programYearId));
     },
     toFamily() {
-      this.setOrganizationProviderType('FAMILY');
+      this.setOrganizationProviderType(ORGANIZATION_PROVIDER_TYPES.FAMILY);
       this.$router.push(pcfUrl(PATHS.CCOF_FAMILY_ORG, this.programYearList.newApp.programYearId));
     },
   },

frontend/src/components/ccofApplication/CcofApplicationTypeSelector.vue

@@ -94,16 +94,10 @@
 <script>
 import AppDateInput from '@/components/guiComponents/AppDateInput.vue';
 import facilityMixin from '@/mixins/facilityMixin.js';
-import { ORGANIZATION_PROVIDER_TYPES } from '@/utils/constants.js';
 
 export default {
   name: 'EligibilityComponent',
   components: { AppDateInput },
   mixins: [facilityMixin],
-  data() {
-    return {
-      providerType: ORGANIZATION_PROVIDER_TYPES.FAMILY,
-    };
-  },
 };
 </script>

frontend/src/components/ccofApplication/family/Eligibility.vue

@@ -413,7 +413,6 @@ import AppTimeInput from '@/components/guiComponents/AppTimeInput.vue';
 
 import fundMixing from '@/mixins/fundMixing.js';
 import globalMixin from '@/mixins/globalMixin.js';
-import { ORGANIZATION_PROVIDER_TYPES } from '@/utils/constants.js';
 
 export default {
   components: { AppTimeInput },
@@ -422,11 +421,6 @@ export default {
     await this.save(false);
     next();
   },
-  data() {
-    return {
-      providerType: ORGANIZATION_PROVIDER_TYPES.FAMILY,
-    };
-  },
 };
 </script>
 <style scoped>

frontend/src/components/ccofApplication/family/FamilyFunding.vue

@@ -239,19 +239,15 @@
 <script>
 import organizationMixin from '@/mixins/organizationMixin.js';
 import globalMixin from '@/mixins/globalMixin.js';
-import { ORGANIZATION_PROVIDER_TYPES, PROVINCES } from '@/utils/constants.js';
+import { PROVINCES } from '@/utils/constants.js';
 
 export default {
   mixins: [organizationMixin, globalMixin],
   async beforeRouteLeave(_to, _from, next) {
     await this.save(false);
     next();
   },
-  data() {
-    return {
-      providerType: ORGANIZATION_PROVIDER_TYPES.FAMILY,
-    };
-  },
+
   computed: {
     filteredOrganizationList() {
       return this.organizationTypeList.filter((fac) => fac.id == 100000002 || fac.id == 100000005);

frontend/src/components/ccofApplication/family/FamilyOrganization.vue

@@ -187,7 +187,6 @@
 import AppDateInput from '@/components/guiComponents/AppDateInput.vue';
 
 import facilityMixin from '@/mixins/facilityMixin.js';
-import { ORGANIZATION_PROVIDER_TYPES } from '@/utils/constants.js';
 
 export default {
   components: { AppDateInput },
@@ -198,10 +197,5 @@ export default {
     }
     next();
   },
-  data() {
-    return {
-      providerType: ORGANIZATION_PROVIDER_TYPES.GROUP,
-    };
-  },
 };
 </script>

frontend/src/components/ccofApplication/group/FacilityInformation.vue

@@ -567,7 +567,6 @@ import AppTimeInput from '@/components/guiComponents/AppTimeInput.vue';
 
 import fundMixing from '@/mixins/fundMixing.js';
 import globalMixin from '@/mixins/globalMixin.js';
-import { ORGANIZATION_PROVIDER_TYPES } from '@/utils/constants.js';
 
 export default {
   components: { AppTimeInput },
@@ -576,11 +575,6 @@ export default {
     await this.save(false);
     next();
   },
-  data() {
-    return {
-      providerType: ORGANIZATION_PROVIDER_TYPES.GROUP,
-    };
-  },
 };
 </script>
 

frontend/src/components/ccofApplication/group/FundAmount.vue

@@ -256,7 +256,7 @@ import { useAppStore } from '@/store/app.js';
 import { useReportChangesStore } from '@/store/reportChanges.js';
 
 import organizationMixin from '@/mixins/organizationMixin.js';
-import { ORGANIZATION_PROVIDER_TYPES, PROVINCES } from '@/utils/constants.js';
+import { PROVINCES } from '@/utils/constants.js';
 import { isAnyChangeRequestActive } from '@/utils/common.js';
 
 export default {
@@ -265,11 +265,7 @@ export default {
     await this.save(false);
     next();
   },
-  data() {
-    return {
-      providerType: ORGANIZATION_PROVIDER_TYPES.GROUP,
-    };
-  },
+
   computed: {
     ...mapState(useAppStore, ['renewalYearLabel', 'currentYearLabel']),
     ...mapState(useReportChangesStore, ['changeRequestStore']),