banners to notify provider when viewing PCF while CR in progress

bcgov · Nov 16, 2023 · 0a2afab · 0a2afab
1 parent 9f420ac
commit 0a2afab
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 3 deletions.
diff --git a/frontend/src/components/ccofApplication/RenewOrganization.vue b/frontend/src/components/ccofApplication/RenewOrganization.vue
@@ -6,7 +6,7 @@
           class="pa-10 text-h5"
           v-text="`Child Care Operating Funding Program - ${renewalYearLabel} Program Confirmation Form`" />
       </v-row >
-    <v-row>
+        <v-row>
           <v-card width="100%" class="mx-3 my-10" v-if="isSomeChangeRequestActive()">
             <v-row>
               <v-col class="py-0">

diff --git a/frontend/src/components/ccofApplication/group/LicenseUpload.vue b/frontend/src/components/ccofApplication/group/LicenseUpload.vue
@@ -2,6 +2,28 @@
   <v-form ref="form" v-model="isValidForm">
     <v-container>
       <span>
+        <v-row>
+              <v-card width="100%" class="mx-3 my-10" v-if="isSomeChangeRequestActive()">
+                <v-row>
+                  <v-col class="py-0">
+                    <v-card-title class="py-1 noticeAlert">
+                      <span style="float:left">
+                    <v-icon
+                      x-large
+                      class="py-1 px-3 noticeAlertIcon">
+                      mdi-alert-octagon
+                    </v-icon>
+                    </span>
+                    You have a change request for the funding term still in progress.
+                    </v-card-title>
+                  </v-col>
+                </v-row>
+                <v-card-text>
+                  You have a change request in progress. We will complete the assessment of your Program Confirmation Form once your change has been processed.<br><br>
+                  <br>
+                </v-card-text>
+              </v-card>
+            </v-row>
         <v-row justify="space-around">
           <v-card class="cc-top-level-card" width="1200">
             <v-card-title class="justify-center pb-0"><h3>Licence Upload<span v-if="isRenewal"> - {{ this.formattedProgramYear }} Program Confirmation Form</span></h3></v-card-title>
@@ -67,7 +89,7 @@ import rules from '@/utils/rules';
 import {mapActions, mapGetters, mapMutations, mapState,} from 'vuex';
 import alertMixin from '@/mixins/alertMixin';
 import {getFileNameWithMaxNameLength, humanFileSize} from '@/utils/file';
-import {deepCloneObject, getFileExtension} from '@/utils/common';
+import {deepCloneObject, getFileExtension, isAnyChangeRequestActive} from '@/utils/common';
 import NavButton from '@/components/util/NavButton';
 
 export default {
@@ -76,6 +98,7 @@ export default {
   props: {},
   computed: {
     ...mapState('facility', ['facilityModel', 'facilityId']),
+    ...mapState('reportChanges', ['changeRequestStore',]),
     ...mapState('navBar', ['navBarList', 'changeRequestId']),
     ...mapState('application', ['isRenewal', 'formattedProgramYear', 'applicationStatus', 'unlockLicenseUpload', 'applicationId', 'isLicenseUploadComplete']),
     ...mapGetters('licenseUpload', ['getUploadedLicenses']),
@@ -191,6 +214,10 @@ export default {
     ...mapMutations('application', ['setIsLicenseUploadCompleteInMap' , 'setIsLicenseUploadComplete']),
     ...mapMutations('navBar', ['forceNavBarRefresh']),
     ...mapMutations('reportChanges', ['setCRIsLicenseComplete']),
+    isSomeChangeRequestActive(){
+      //Status of : "Submitted" "Action Required";
+      return isAnyChangeRequestActive(this.changeRequestStore);
+    },
     previous() {
       this.$router.push(this.previousPath);
     },

diff --git a/frontend/src/components/ccofApplication/group/OrganizationInformation.vue b/frontend/src/components/ccofApplication/group/OrganizationInformation.vue
@@ -7,6 +7,28 @@
             <v-card-title class="justify-center pb-0">
               <h3>Organization Information</h3>
             </v-card-title>
+            <v-row>
+              <v-card width="100%" class="mx-3 my-10" v-if="isSomeChangeRequestActive()">
+                <v-row>
+                  <v-col class="py-0">
+                    <v-card-title class="py-1 noticeAlert">
+                      <span style="float:left">
+                    <v-icon
+                      x-large
+                      class="py-1 px-3 noticeAlertIcon">
+                      mdi-alert-octagon
+                    </v-icon>
+                    </span>
+                    You have a change request in progress.
+                    </v-card-title>
+                  </v-col>
+                </v-row>
+                <v-card-text>
+                  We will complete the assessment of your Program Confirmation Form once your change has been processed.<br><br>
+                  <br>
+                </v-card-text>
+              </v-card>
+            </v-row>
             <v-container>
               <v-row>
                 <v-col>
@@ -126,14 +148,27 @@
 <script>
 
 import organizationMixin from '@/mixins/organizationMixin';
+import { mapGetters, mapState } from 'vuex';
 import { ORGANIZATION_PROVIDER_TYPES } from '@/utils/constants';
+import {isAnyChangeRequestActive } from '@/utils/common';
+
 
 export default {
   mixins: [organizationMixin],
   data() {
     return {
       providerType: ORGANIZATION_PROVIDER_TYPES.GROUP
     };
+  },
+  computed: {
+    ...mapGetters('app', ['renewalYearLabel', 'currentYearLabel']),
+    ...mapState('reportChanges', ['changeRequestStore',]),
+  },
+  methods: {
+    isSomeChangeRequestActive(){
+      //Status of : "Submitted" "Action Required";
+      return isAnyChangeRequestActive(this.changeRequestStore);
+    },
   }
 };
 

diff --git a/frontend/src/utils/common.js b/frontend/src/utils/common.js
@@ -100,5 +100,5 @@ export function isAnyApplicationUnlocked (applicationList){
 
 export function  isAnyChangeRequestActive(changeRequestList) {
   //Status of :  "Submitted" "Action Required";
-  return changeRequestList?.some((el) => el.status == 2 || el.status == 3);
+  return changeRequestList?.some((el) => (el.status == 2 || el.status == 3) && el.changeActions[0].changeType != 'PARENT_FEE_CHANGE');
 }