Merge pull request #3516 from bcgov/NDT-502-CCBC-Summary-Page-Improve…

…ments fix: ccbc summary funding figures
bcgov · Sep 4, 2024 · df16452 · df16452
2 parents 03d024c + d97585b
commit df16452
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [1.190.1](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.190.0...v1.190.1) (2024-09-04)
+
+### Bug Fixes
+
+- ccbc summary funding figures ([4ebd880](https://github.com/bcgov/CONN-CCBC-portal/commit/4ebd880288cddd11a9b695a7ea76dc28c457d682))
+
 # [1.190.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.189.1...v1.190.0) (2024-09-04)
 
 ### Features

diff --git a/app/backend/lib/reporting/column_options.ts b/app/backend/lib/reporting/column_options.ts
@@ -41,7 +41,7 @@ const columnOptions: Columns = [
   { width: 20 },
   // column 20 (federal funding source)
   { width: 20 },
-  // column 21 (FHNA funding)
+  // column 21 (FNHA funding)
   { width: 20 },
   // column 22 (Applicant amount)
   { width: 20 },

diff --git a/app/backend/lib/reporting/gcpe.ts b/app/backend/lib/reporting/gcpe.ts
@@ -249,7 +249,7 @@ const generateExcelData = async (
         format: '$#,##0.00',
         type: Number,
       },
-      // FHNA funding
+      // FNHA funding
       { value: null },
       // applicant amount
       {
@@ -380,7 +380,7 @@ const generateExcelData = async (
         format: '$#,##0.00',
         type: Number,
       },
-      // FHNA funding
+      // FNHA funding
       { value: null },
       // applicant amount
       {

diff --git a/app/backend/lib/reporting/header.ts b/app/backend/lib/reporting/header.ts
@@ -143,7 +143,7 @@ const HEADER_ROW: Row = [
     wrap: true,
   },
   {
-    value: 'FHNA Funding',
+    value: 'FNHA Funding',
     fontWeight: 'bold',
     type: String,
     height: 95,

diff --git a/app/formSchema/analyst/summary/funding.ts b/app/formSchema/analyst/summary/funding.ts
@@ -36,7 +36,7 @@ const funding: RJSFSchema = {
     },
     fhnaFunding: {
       type: 'number',
-      title: 'FHNA Funding',
+      title: 'FNHA Funding',
     },
     otherFunding: {
       type: 'number',

diff --git a/app/formSchema/uiSchema/summary/fundingUiSchema.ts b/app/formSchema/uiSchema/summary/fundingUiSchema.ts
@@ -26,7 +26,7 @@ const fundingUiSchema = {
   },
   fhnaFunding: {
     'ui:widget': 'MoneyWidget',
-    'ui:label': 'FHNA Funding',
+    'ui:label': 'FNHA Funding',
   },
   otherFunding: {
     'ui:widget': 'MoneyWidget',

diff --git a/app/lib/helpers/ccbcSummaryGenerateFormData.tsx b/app/lib/helpers/ccbcSummaryGenerateFormData.tsx
@@ -287,7 +287,8 @@ const getFormDataFromApplication = (applicationData, allIntakes) => {
           applicationData?.formData?.jsonData?.projectFunding
             ?.totalApplicantContribution,
         cibFunding:
-          applicationData?.formData?.jsonData?.projectFunding?.cibFunding,
+          applicationData?.formData?.jsonData?.otherFundingSources
+            ?.totalInfrastructureBankFunding,
         fhnaFunding: null,
         otherFunding: handleOtherFundingSourcesApplication(
           applicationData?.formData?.jsonData?.otherFundingSources
@@ -340,7 +341,9 @@ const generateFormData = (applicationData, sowData, allIntakes) => {
     applicationData.status === 'recommendation' ||
     applicationData.status === 'closed' ||
     applicationData.status === 'analyst_withdrawn' ||
-    applicationData.status === 'withdrawn'
+    applicationData.status === 'withdrawn' ||
+    applicationData.status === 'applicant_received' ||
+    applicationData.status === 'applicant_closed'
   ) {
     const applicationFormData = getFormDataFromApplication(
       applicationData,

diff --git a/app/tests/backend/lib/reporting/testData.ts b/app/tests/backend/lib/reporting/testData.ts
@@ -148,7 +148,7 @@ export const regenerateGcpeReportQueryResult = {
           },
           {
             wrap: true,
-            value: 'FHNA Funding',
+            value: 'FNHA Funding',
             height: 95,
             fontWeight: 'bold',
           },

diff --git a/db/sqitch.plan b/db/sqitch.plan
@@ -658,3 +658,4 @@ tables/communities_source_data_001_service_account 2024-08-28T16:32:48Z Rafael S
 @1.189.0 2024-08-30T18:07:26Z CCBC Service Account <[email protected]> # release v1.189.0
 @1.189.1 2024-09-03T15:49:04Z CCBC Service Account <[email protected]> # release v1.189.1
 @1.190.0 2024-09-04T19:57:18Z CCBC Service Account <[email protected]> # release v1.190.0
+@1.190.1 2024-09-04T20:58:06Z CCBC Service Account <[email protected]> # release v1.190.1
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CONN-CCBC-portal",
-  "version": "1.190.0",
+  "version": "1.190.1",
   "main": "index.js",
   "repository": "https://github.com/bcgov/CONN-CCBC-portal.git",
   "author": "Romer, Meherzad CITZ:EX <[email protected]>",