diff --git a/app/client/src/components/change2024New.tsx b/app/client/src/components/change2024New.tsx index d6001b9e..9b58afc4 100644 --- a/app/client/src/components/change2024New.tsx +++ b/app/client/src/components/change2024New.tsx @@ -28,6 +28,9 @@ type ChangeRequestData = { email: string; title: string; name: string; + applicantName: string; + districtName: string; + districtState: string; }; type Response = { url: string; json: object }; @@ -205,8 +208,19 @@ function ChangeRequest2024Form(props: { closeDialog: () => void; }) { const { data, closeDialog } = props; - const { formType, comboKey, rebateId, mongoId, state, email, title, name } = - data; + const { + formType, + comboKey, + rebateId, + mongoId, + state, + email, + title, + name, + applicantName, + districtName, + districtState, + } = data; const content = useContentData(); const { @@ -290,6 +304,9 @@ function ChangeRequest2024Form(props: { _user_email: email, _user_title: title, _user_name: name, + _bap_applicant_name: applicantName, + _bap_district_name: districtName, + _bap_district_state: districtState, ...pendingSubmissionData.current, }, }} diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx index b2017c3e..2f191762 100644 --- a/app/client/src/routes/submissions.tsx +++ b/app/client/src/routes/submissions.tsx @@ -1707,10 +1707,13 @@ function FRF2024Submission(props: { rebate: Rebate2024 }) { const { _user_email, _bap_entity_combo_key, + _bap_applicant_name, + _formio_schoolDistrictName, appInfo_uei, appInfo_efti, appInfo_organization_name, - _formio_schoolDistrictName, + org_district_name, + org_district_state, } = frf.formio.data; const date = new Date(frf.formio.modified).toLocaleDateString(); @@ -1874,6 +1877,9 @@ function FRF2024Submission(props: { rebate: Rebate2024 }) { email, title, name, + applicantName: _bap_applicant_name, + districtName: org_district_name, + districtState: org_district_state, }} /> @@ -1995,8 +2001,14 @@ function PRF2024Submission(props: { rebate: Rebate2024 }) { // return if a Payment Request submission has not been created for this rebate if (!prf.formio) return null; - const { _user_email, _bap_entity_combo_key, _bap_rebate_id } = - prf.formio.data; + const { + _user_email, + _bap_entity_combo_key, + _bap_rebate_id, + _bap_applicant_name, + _bap_district_name, + _bap_district_state, + } = prf.formio.data; const date = new Date(prf.formio.modified).toLocaleDateString(); const time = new Date(prf.formio.modified).toLocaleTimeString(); @@ -2098,6 +2110,9 @@ function PRF2024Submission(props: { rebate: Rebate2024 }) { email, title, name, + applicantName: _bap_applicant_name, + districtName: _bap_district_name, + districtState: _bap_district_state, }} /> diff --git a/app/client/src/types.ts b/app/client/src/types.ts index c14baff6..cd23bf80 100644 --- a/app/client/src/types.ts +++ b/app/client/src/types.ts @@ -484,6 +484,8 @@ type FormioFRF2024Data = { appInfo_efti: string; appInfo_organization_name: string; _formio_schoolDistrictName: string; + org_district_name: string; + org_district_state: string; }; type FormioPRF2024Data = {