Merge pull request #288 from bcgov/ofmcc-5001-update-supplemetary-lan…

…guage

ofmcc-5001 - update supplementary wording

frontend/src/components/applications/CancelApplicationDialog.vue

@@ -1,15 +1,15 @@
 <template>
   <AppDialog v-model="isDisplayed" title="Confirm" :isLoading="isLoading" persistent max-width="50%" @close="closeDialog">
     <template #content>
-      <div class="confirm-dialog-text d-flex flex-column align-center">Are you sure you want to cancel this {{ sourceApplicationType }}?</div>
+      <div class="confirm-dialog-text d-flex flex-column align-center">Are you sure you want to cancel this application?</div>
     </template>
     <template #button>
       <v-row justify="space-around">
         <v-col cols="12" md="6" class="d-flex justify-center">
-          <AppButton id="dialog-go-back" :primary="false" size="large" width="250px" :loading="isLoading" @click="closeDialog">Go back</AppButton>
+          <AppButton id="dialog-go-back" :primary="false" size="large" width="250px" :loading="isLoading" @click="closeDialog">Go Back</AppButton>
         </v-col>
         <v-col cols="12" md="6" class="d-flex justify-center">
-          <AppButton id="dialog-cancel-application" size="large" min-width="250px" max-width="450px" :loading="isLoading" @click="cancel">Cancel {{ sourceApplicationType }}</AppButton>
+          <AppButton id="dialog-cancel-application" size="large" min-width="250px" max-width="450px" :loading="isLoading" @click="cancel">Cancel Application</AppButton>
         </v-col>
       </v-row>
     </template>
@@ -23,11 +23,6 @@ import alertMixin from '@/mixins/alertMixin'
 import { APPLICATION_STATUS_CODES, SUPPLEMENTARY_APPLICATION_STATUS_CODES, CRM_STATE_CODES, APPLICATION_TYPES } from '@/utils/constants'
 import ApplicationService from '@/services/applicationService'
 
-const APPLICATION_LABELS = {
-  APPLICATION: 'Application',
-  SUPP_APPLICATION: 'Supplementary Application',
-}
-
 export default {
   name: 'CancelApplicationDialog',
   components: { AppButton, AppDialog },
@@ -43,7 +38,7 @@ export default {
     },
     applicationType: {
       type: String,
-      default: 'OFM', // Default to OFM application type (as opposed to supplementary application types)
+      default: APPLICATION_TYPES.OFM, // Default to OFM application type (as opposed to Supplementary/Allowances application types)
     },
   },
   emits: ['close', 'cancel'],
@@ -54,8 +49,8 @@ export default {
     }
   },
   computed: {
-    sourceApplicationType() {
-      return this.applicationType === APPLICATION_TYPES.OFM ? APPLICATION_LABELS.APPLICATION : APPLICATION_LABELS.SUPP_APPLICATION
+    isBaseFundingApplication() {
+      return this.applicationType === APPLICATION_TYPES.OFM
     },
   },
   watch: {
@@ -73,18 +68,18 @@ export default {
       try {
         this.isLoading = true
         const payload = {
-          statusCode: this.sourceApplicationType === APPLICATION_LABELS.APPLICATION ? APPLICATION_STATUS_CODES.CANCELLED_BY_SP : SUPPLEMENTARY_APPLICATION_STATUS_CODES.CANCELLED,
+          statusCode: this.isBaseFundingApplication ? APPLICATION_STATUS_CODES.CANCELLED_BY_SP : SUPPLEMENTARY_APPLICATION_STATUS_CODES.CANCELLED,
           stateCode: CRM_STATE_CODES.INACTIVE,
         }
-        if (this.sourceApplicationType === APPLICATION_LABELS.APPLICATION) {
+        if (this.isBaseFundingApplication) {
           await ApplicationService.updateApplication(this.applicationId, payload)
         } else {
           await ApplicationService.updateSupplementaryApplication(this.applicationId, payload)
         }
         this.$emit('cancel')
-        this.setSuccessAlert(`${this.sourceApplicationType} cancelled successfully`)
+        this.setSuccessAlert(`Application cancelled successfully`)
       } catch (error) {
-        this.setFailureAlert(`Failed to cancel your ${this.sourceApplicationType}`, error)
+        this.setFailureAlert(`Failed to cancel your application`, error)
       } finally {
         this.isLoading = false
         this.closeDialog()

frontend/src/components/funding/FundingAgreementsTab.vue

@@ -36,12 +36,7 @@ import FundingAgreementService from '@/services/fundingAgreementService'
 import { FUNDING_AGREEMENT_STATUS_CODES, SUPPLEMENTARY_APPLICATION_STATUS_CODES, BLANK_FIELD, APPLICATION_TYPES } from '@/utils/constants'
 import format from '@/utils/format'
 
-const IN_PROGRESS_STATUSES = [
-  FUNDING_AGREEMENT_STATUS_CODES.DRAFT,
-  FUNDING_AGREEMENT_STATUS_CODES.FA_REVIEW,
-  FUNDING_AGREEMENT_STATUS_CODES.SUBMITTED,
-  FUNDING_AGREEMENT_STATUS_CODES.IN_REVIEW_WITH_MINISTRY_EA,
-]
+const IN_PROGRESS_STATUSES = [FUNDING_AGREEMENT_STATUS_CODES.DRAFT, FUNDING_AGREEMENT_STATUS_CODES.FA_REVIEW, FUNDING_AGREEMENT_STATUS_CODES.IN_REVIEW_WITH_MINISTRY_EA]
 
 export default {
   name: 'FundingAgreementsTab',
@@ -168,6 +163,7 @@ export default {
       return {
         'status-gray': IN_PROGRESS_STATUSES.includes(statusCode),
         'status-yellow': statusCode === FUNDING_AGREEMENT_STATUS_CODES.SIGNATURE_PENDING,
+        'status-blue': statusCode === FUNDING_AGREEMENT_STATUS_CODES.SUBMITTED,
         'status-green': [FUNDING_AGREEMENT_STATUS_CODES.ACTIVE].includes(statusCode),
         'status-purple': statusCode === FUNDING_AGREEMENT_STATUS_CODES.EXPIRED,
         'status-red': statusCode === FUNDING_AGREEMENT_STATUS_CODES.TERMINATED,

frontend/src/components/organizations/OrganizationInfo.vue

@@ -180,7 +180,7 @@
                     </v-col>
                     <v-col v-else class="pt-0">
                       <v-icon size="30" color="amber">mdi-alert</v-icon>
-                      This is a requirement to apply for Support Needs Supplementary Funding
+                      This is a requirement to apply for Support Needs Allowance.
                     </v-col>
                   </template>
                   <v-col v-if="editMode" class="d-flex justify-end pt-0">

frontend/src/components/supp-allowances/IndigenousProgrammingSummary.vue

@@ -1,6 +1,6 @@
 <template>
   <v-card v-for="model in indigenousProgrammingModels" :key="model.indigenousProgrammingModels ? model.indigenousProgrammingModels : model.id" fluid class="pb-0 my-5">
-    <AppAlertBanner v-if="model.isNextTerm" type="info">This Supplementary Application is for Next Year</AppAlertBanner>
+    <AppAlertBanner v-if="model.isNextTerm" type="info">This Allowance application is for next year</AppAlertBanner>
     <div class="px-5">
       <div class="mt-2">
         <h4 class="text-decoration-underline">Funding Selected</h4>

frontend/src/components/supp-allowances/SupportNeedsProgrammingAllowance.vue

@@ -19,8 +19,8 @@
   <br />
   <v-row no-gutters class="mr-2 my-2">
     <v-col cols="12">
-      An Inclusion Policy is a requirement to apply for Support Needs Supplementary Funding. Providers participating in the OFM Test must have an Inclusion Policy to receive this funding. You can
-      upload your policy in
+      An Inclusion Policy is a requirement to apply for Support Needs Allowance. Providers participating in the OFM Test must have an Inclusion Policy to receive this funding. You can upload your
+      policy in
       <router-link to="/account-mgmt/manage-organization">Account Management.</router-link>
     </v-col>
   </v-row>
@@ -74,20 +74,18 @@
       <v-col cols="12">Please describe how you intend to use this funding:</v-col>
     </v-row>
     <v-row v-for="item in SUPPORT_CHECKBOX_LABELS" :key="item.value" no-gutters>
-      <v-col cols="11" lg="6">
-        <v-checkbox v-model="model.supportFundingModel" :disabled="readOnly" density="compact" class="pl-lg-8 mr-0" prepend-icon :value="item.value">
-          <template v-slot:label>
-            <p>
-              {{ item.label }}
-              <v-tooltip v-if="item.tooltip" content-class="tooltip" :text="item.tooltip">
-                <template #activator="{ props }">
-                  <v-icon size="large" v-bind="props">mdi-information-slab-circle-outline</v-icon>
-                </template>
-              </v-tooltip>
-            </p>
-          </template>
-        </v-checkbox>
-      </v-col>
+      <v-checkbox v-model="model.supportFundingModel" :disabled="readOnly" density="compact" class="pl-lg-8 mr-0" prepend-icon :value="item.value">
+        <template v-slot:label>
+          <p>
+            {{ item.label }}
+            <v-tooltip v-if="item.tooltip" content-class="tooltip" :text="item.tooltip">
+              <template #activator="{ props }">
+                <v-icon size="large" v-bind="props">mdi-information-slab-circle-outline</v-icon>
+              </template>
+            </v-tooltip>
+          </p>
+        </template>
+      </v-checkbox>
     </v-row>
     <v-row v-if="isOtherBoxDisplayed" no-gutters class="ml-10 mr-2 my-0">
       <v-textarea

frontend/src/components/supp-allowances/SupportNeedsSummary.vue

@@ -1,6 +1,6 @@
 <template>
   <v-card v-for="model in supportModels" :key="model.supplementaryApplicationId ? model.supplementaryApplicationId : model.id" fluid class="pb-0 my-5">
-    <AppAlertBanner v-if="model.isNextTerm" type="info">This Supplementary Application is for Next Year</AppAlertBanner>
+    <AppAlertBanner v-if="model.isNextTerm" type="info">This Allowance application is for next year</AppAlertBanner>
     <div class="px-5">
       <div class="mt-2">
         <h4 class="text-decoration-underline">Funding Selected</h4>

frontend/src/components/supp-allowances/TransportationSummary.vue

@@ -14,7 +14,7 @@
       </v-row>
       <v-divider class="mt-3"></v-divider>
 
-      <AppAlertBanner v-if="model.isNextTerm" type="info">This Supplementary Application is for Next Year</AppAlertBanner>
+      <AppAlertBanner v-if="model.isNextTerm" type="info">This Allowance application is for next year</AppAlertBanner>
 
       <v-row v-if="isModelComplete(model)" no-gutters class="mt-2 py-2">
         <v-col cols="12" lg="7" class="px-4">

frontend/src/views/applications/ApplicationConfirmationView.vue

@@ -15,7 +15,7 @@
         <v-card-text class="px-8" py-6>
           <v-row no-gutters class="align-center">
             <v-col cols="12" md="8">
-              <p>You may be eligible for supplementary funding. Would you like to apply?</p>
+              <p>You may be eligible for additional Allowances. Would you like to apply?</p>
               <p class="mt-4">Available allowances:</p>
               <ul class="pl-6">
                 <li>Indigenous programming</li>

frontend/src/views/applications/ApplicationsHistoryView.vue

@@ -27,17 +27,17 @@
             <AppAlertBanner v-if="!hasGoodStanding" type="warning">
               {{ NOT_IN_GOOD_STANDING_WARNING_MESSAGE }}
             </AppAlertBanner>
-            <AppAlertBanner v-else type="info">If there is no active OFM application, you won't be able to submit a Supplementary Allowance Application.</AppAlertBanner>
+            <AppAlertBanner v-else type="info">If there is no active OFM application, you will not be able to submit Allowances applications.</AppAlertBanner>
           </div>
           <v-card class="basic-card justify-center">
             <v-card-title class="text-center text-wrap">
               <v-icon class="mr-2">mdi-file-document-edit-outline</v-icon>
-              Allowances (Core and Discretionary Services) Request
+              Allowances (Core and Discretionary Services) Application
             </v-card-title>
-            <v-card-text class="text-center d-flex flex-column align-center pt-4 pb-0">To apply for funding Allowances, you must have an active OFM application for the facility.</v-card-text>
+            <v-card-text class="text-center d-flex flex-column align-center pt-4 pb-0">You must have an active OFM application for the facility to apply for Allowances.</v-card-text>
             <v-card-actions class="d-flex flex-column align-center">
               <AppButton id="supp-allowances-button" :loading="loading" :disabled="!hasAValidApplicationAndGoodStanding" :to="{ name: 'supp-allowances' }" class="ma-2 mt-8">
-                Add Allowances Request
+                Add Allowances Application
               </AppButton>
             </v-card-actions>
           </v-card>

frontend/src/views/supp-allowances/SupplementaryAllowanceView.vue

@@ -1,6 +1,6 @@
 <template>
   <v-container fluid>
-    <h1 class="my-2">Supplementary Allowance</h1>
+    <h1 class="my-2">Allowances (Core and Discretionary Services)</h1>
     <div v-if="loading" align="center">
       <v-progress-circular indeterminate size="100" :width="6" color="#003366" class="min-height-screen"></v-progress-circular>
     </div>

frontend/src/views/supp-allowances/SupplementaryConfirmation.vue

@@ -1,7 +1,7 @@
 <template>
   <v-container class="mt-16">
     <div class="mt-16">
-      <h2 class="mb-8 text-center">Supplementary Allowance Submitted</h2>
+      <h2 class="mb-8 text-center">Allowances Application Submitted</h2>
       <h4 class="mb-8 text-center">Check your dashboard for updates on the progress of your application. We may reach out if we need more information</h4>
 
       <v-row justify="space-around" no-gutters class="mt-10">

frontend/src/views/supp-allowances/SupplementaryFormView.vue

@@ -292,7 +292,7 @@ export default {
         }
         this.setUpDefaultNewRequestModel(await ApplicationService.getSupplementaryApplicationsForForm(this.applicationId))
       } catch (error) {
-        this.setFailureAlert('Failed to load supplementary applications')
+        this.setFailureAlert('Failed to load Allowances applications')
       }
     },
     async saveApplication(showAlert = false) {
@@ -345,10 +345,10 @@ export default {
         await this.loadData()
         this.clonedModels = cloneDeep(this.models)
         if (showAlert) {
-          this.setSuccessAlert(`Application Saved`)
+          this.setSuccessAlert('Application saved successfully')
         }
       } catch (error) {
-        this.setFailureAlert('Failed to save supplementary applications')
+        this.setFailureAlert('Failed to save Allowances application')
         this.loading = false
         this.$emit('process', false)
       }

frontend/src/views/supp-allowances/SupplementarySubmitView.vue

@@ -1,6 +1,6 @@
 <template>
   <v-form ref="form" class="mt-10">
-    <h2>Supplementary Application Submit</h2>
+    <h2>Allowances (Core and Discretionary Services)</h2>
     <v-row v-if="!loading" no-gutters class="mb-2">
       <v-col cols="12" align="right">
         <AppButton v-if="isEmpty(panel)" id="expand-button" :primary="false" size="large" width="200px" @click="togglePanel">