Merge pull request #495 from bcgov/release-196-jb6

Hide Funding agreement number for 2024 25 applications
bcgov · Dec 13, 2023 · 54fada6 · 54fada6
2 parents b889786 + 2c62d04
commit 54fada6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/frontend/src/components/SummaryDeclaration.vue b/frontend/src/components/SummaryDeclaration.vue
@@ -214,7 +214,7 @@
 
       </div>
       <!---Declaration Start--->
-      <v-row v-if="fundingAgreementNumber" justify="center" class="pt-4 text-h5" style="color:#003466;">
+      <v-row v-if="fundingAgreementNumber  && languageYearLabel == programYearTypes.HISTORICAL" justify="center" class="pt-4 text-h5" style="color:#003466;">
         Funding Agreement Number: {{ fundingAgreementNumber }}
       </v-row>
       <v-row justify="center">
@@ -392,7 +392,7 @@
 </template>
 <script>
 
-import { PATHS, CHANGE_REQUEST_TYPES } from '@/utils/constants';
+import { PATHS, CHANGE_REQUEST_TYPES, PROGRAM_YEAR_LANGUAGE_TYPES  } from '@/utils/constants';
 import {mapGetters, mapActions, mapState, mapMutations} from 'vuex';
 import alertMixin from '@/mixins/alertMixin';
 import NavButton from '@/components/util/NavButton';
@@ -432,6 +432,7 @@ export default {
     ...mapGetters('auth', ['userInfo', 'isMinistryUser']),
     ...mapGetters('navBar', ['getNavByFacilityId', 'getNavByFundingId','getNavByCCFRIId']),
     ...mapState('app', ['programYearList' ]),
+    ...mapGetters('app', ['getFundingUrl', 'getLanguageYearLabel']),
     ...mapGetters('navBar', ['previousPath', 'isChangeRequest']),
     ...mapState('navBar', ['canSubmit', 'navBarList', 'changeRequestId']),
     ...mapState('organization', ['fundingAgreementNumber', 'organizationAccountNumber', 'isOrganizationComplete']),
@@ -440,6 +441,12 @@ export default {
       'unlockDeclaration', 'unlockEcewe', 'unlockLicenseUpload', 'unlockSupportingDocuments', 'applicationStatus','isEceweComplete', 'applicationMap']),
     ...mapGetters('reportChanges', ['isCREceweComplete', 'isCRLicenseComplete', ]),
     ...mapState('reportChanges', ['changeRequestStore',]),
+    languageYearLabel(){
+      return this.getLanguageYearLabel;
+    },
+    programYearTypes(){
+      return PROGRAM_YEAR_LANGUAGE_TYPES;
+    },
     getChangeRequestYear(){
       const currProgramYear = this.programYearList?.list?.find(el => el.programYearId == this.programYearId);
       const prevProgramYear = this.programYearList?.list?.find(el => el.programYearId == currProgramYear.previousYearId);

diff --git a/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue b/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue
@@ -143,7 +143,7 @@
       <!---Declaration Start--->
       <v-row justify="center">
 
-        <v-row v-if="fundingAgreementNumber" justify="center" class="pt-4 text-h5" style="color:#003466;">
+        <v-row v-if="fundingAgreementNumber  && languageYearLabel == programYearTypes.HISTORICAL" justify="center" class="pt-4 text-h5" style="color:#003466;">
           Funding Agreement Number: {{ fundingAgreementNumber }}
         </v-row>
 
@@ -321,7 +321,7 @@
 </template>
 <script>
 
-import { PATHS, CHANGE_REQUEST_TYPES, CHANGE_TYPES, changeUrlGuid } from '@/utils/constants';
+import { PATHS, CHANGE_REQUEST_TYPES, CHANGE_TYPES, changeUrlGuid, PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 import { mapGetters, mapActions, mapState } from 'vuex';
 import alertMixin from '@/mixins/alertMixin';
 import NavButton from '@/components/util/NavButton';
@@ -375,6 +375,13 @@ export default {
     ...mapState('summaryDeclaration', ['isSummaryLoading', 'isMainLoading', 'isLoadingComplete']),
     ...mapState('summaryDeclaration', ['summaryModel', 'model']),
     ...mapState('application', ['isRenewal', 'applicationMap']),
+    ...mapGetters('app', ['getFundingUrl', 'getLanguageYearLabel']),
+    languageYearLabel(){
+      return this.getLanguageYearLabel;
+    },
+    programYearTypes(){
+      return PROGRAM_YEAR_LANGUAGE_TYPES;
+    },
     isReadOnly() {
       if (this.isMinistryUser || !this.isLoadingComplete) {
         return true;