Update fields displayed in FRF 2024 submission dashboard

USEPA · Jul 30, 2024 · 911b790 · 911b790
1 parent 8c645e3
commit 911b790
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx
@@ -1704,8 +1704,14 @@ function FRF2024Submission(props: { rebate: Rebate2024 }) {
 
   const frfSubmissionPeriodOpen = configData.submissionPeriodOpen["2024"].frf;
 
-  const { _user_email, _bap_entity_combo_key } = frf.formio.data;
-  const placeholder = true; // TODO: remove once we have UEI, EFTI, org name, and school district fields above
+  const {
+    _user_email,
+    _bap_entity_combo_key,
+    appInfo_uei,
+    appInfo_efti,
+    appInfo_organization_name,
+    _formio_schoolDistrictName,
+  } = frf.formio.data;
 
   const date = new Date(frf.formio.modified).toLocaleDateString();
   const time = new Date(frf.formio.modified).toLocaleTimeString();
@@ -1810,17 +1816,17 @@ function FRF2024Submission(props: { rebate: Rebate2024 }) {
 
       <td className={statusTableCellClassNames}>
         <>
-          {Boolean(placeholder) ? (
-            "TODO"
+          {Boolean(appInfo_uei) ? (
+            appInfo_uei
           ) : (
             <TextWithTooltip
               text=" "
               tooltip="Please edit and save the form and the UEI will be displayed"
             />
           )}
           <br />
-          {Boolean(placeholder) ? (
-            "TODO"
+          {Boolean(appInfo_efti) ? (
+            appInfo_efti
           ) : (
             <TextWithTooltip
               text=" "
@@ -1832,17 +1838,17 @@ function FRF2024Submission(props: { rebate: Rebate2024 }) {
 
       <td className={statusTableCellClassNames}>
         <>
-          {Boolean(placeholder) ? (
-            "TODO"
+          {Boolean(appInfo_organization_name) ? (
+            appInfo_organization_name
           ) : (
             <TextWithTooltip
               text=" "
               tooltip="Please edit and save the form and the Applicant will be displayed"
             />
           )}
           <br />
-          {Boolean(placeholder) ? (
-            "TODO"
+          {Boolean(_formio_schoolDistrictName) ? (
+            _formio_schoolDistrictName
           ) : (
             <TextWithTooltip
               text=" "

diff --git a/app/client/src/types.ts b/app/client/src/types.ts
@@ -274,6 +274,11 @@ type FormioFRF2024Data = {
   _bap_applicant_city: string;
   _bap_applicant_state: string;
   _bap_applicant_zip: string;
+  // fields set by form definition (among others):
+  appInfo_uei: string;
+  appInfo_efti: string;
+  appInfo_organization_name: string;
+  _formio_schoolDistrictName: string;
 };
 
 type FormioPRF2024Data = {