Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: ccbc summary funding figures #3516

Merged
merged 7 commits into from
Sep 4, 2024
Merged

fix: ccbc summary funding figures #3516

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ebd880
fix: ccbc summary funding figures
RRanath Aug 30, 2024
7491012
Merge branch 'main' into NDT-502-CCBC-Summary-Page-Improvements
RRanath Aug 30, 2024
942b573
Merge branch 'main' into NDT-502-CCBC-Summary-Page-Improvements
RRanath Aug 30, 2024
223a149
Merge branch 'main' into NDT-502-CCBC-Summary-Page-Improvements
RRanath Sep 3, 2024
02b4c13
Merge branch 'main' into NDT-502-CCBC-Summary-Page-Improvements
rafasdc Sep 4, 2024
b86df0c
Merge branch 'main' into NDT-502-CCBC-Summary-Page-Improvements
rafasdc Sep 4, 2024
d97585b
chore: release v1.190.1
ccbc-service-account Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/backend/lib/reporting/column_options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
4 changes: 2 additions & 2 deletions app/backend/lib/reporting/gcpe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ const generateExcelData = async (
format: '$#,##0.00',
type: Number,
},
// FHNA funding
// FNHA funding
{ value: null },
// applicant amount
{
Expand Down Expand Up @@ -380,7 +380,7 @@ const generateExcelData = async (
format: '$#,##0.00',
type: Number,
},
// FHNA funding
// FNHA funding
{ value: null },
// applicant amount
{
Expand Down
2 changes: 1 addition & 1 deletion app/backend/lib/reporting/header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const HEADER_ROW: Row = [
wrap: true,
},
{
value: 'FHNA Funding',
value: 'FNHA Funding',
fontWeight: 'bold',
type: String,
height: 95,
Expand Down
2 changes: 1 addition & 1 deletion app/formSchema/analyst/summary/funding.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const funding: RJSFSchema = {
},
fhnaFunding: {
type: 'number',
title: 'FHNA Funding',
title: 'FNHA Funding',
},
otherFunding: {
type: 'number',
Expand Down
2 changes: 1 addition & 1 deletion app/formSchema/uiSchema/summary/fundingUiSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const fundingUiSchema = {
},
fhnaFunding: {
'ui:widget': 'MoneyWidget',
'ui:label': 'FHNA Funding',
'ui:label': 'FNHA Funding',
},
otherFunding: {
'ui:widget': 'MoneyWidget',
Expand Down
7 changes: 5 additions & 2 deletions app/lib/helpers/ccbcSummaryGenerateFormData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/tests/backend/lib/reporting/testData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const regenerateGcpeReportQueryResult = {
},
{
wrap: true,
value: 'FHNA Funding',
value: 'FNHA Funding',
height: 95,
fontWeight: 'bold',
},
Expand Down
Loading