Merge pull request #1863 from bcgov/UTOPIA-1584

UTOPIA-1584: Print preview intake column adjustment
bcgov · Nov 29, 2023 · 70c24b1 · 70c24b1
2 parents ec16779 + a2e251f
commit 70c24b1
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 32 deletions.
diff --git a/src/frontend/src/components/public/PIAFormTabs/intake/printPreview/index.tsx b/src/frontend/src/components/public/PIAFormTabs/intake/printPreview/index.tsx
@@ -5,28 +5,20 @@ const IntakePrintPreview = (pia: IPiaForm) => {
   return (
     <>
       <h2>PIA Intake</h2>
-      <div className="container">
-        <div>
-          <div className="row">
-            <div className="col-4">
-              <ul className="PIAInfoList-container">
-                <li className="PIAinfoList">
-                  <h4>Filled By</h4>
-                  <p className="PIAInfoName">{pia?.drafterName}</p>
-                  <p className="PIAInfoEmail">{pia?.drafterEmail}</p>
-                </li>
-                <li className="PIAinfoList">
-                  <h4>Initiative Lead</h4>
-                  <p className="PIAInfoName">{pia?.leadName}</p>
-                  <p className="PIAInfoEmail">{pia?.leadEmail}</p>
-                </li>
-              </ul>
-            </div>
-            <div className="col-8">
-              <IntakeDetails {...pia} />
-            </div>
-          </div>
-        </div>
+      <div>
+        <ul className="PIAInfoList-container">
+          <li className="PIAinfoList">
+            <h4>Filled By</h4>
+            <p className="PIAInfoName">{pia?.drafterName}</p>
+            <p className="PIAInfoEmail">{pia?.drafterEmail}</p>
+          </li>
+          <li className="PIAinfoList">
+            <h4>Initiative Lead</h4>
+            <p className="PIAInfoName">{pia?.leadName}</p>
+            <p className="PIAInfoEmail">{pia?.leadEmail}</p>
+          </li>
+        </ul>
+        <IntakeDetails {...pia} />
       </div>
     </>
   );

diff --git a/src/frontend/src/components/public/PIAFormTabs/intake/printPreview/intakedetails.tsx b/src/frontend/src/components/public/PIAFormTabs/intake/printPreview/intakedetails.tsx
@@ -17,34 +17,43 @@ const IntakeDetails = (pia: IPiaForm) => {
         <p>{pia?.branch}</p>
       </div>
       <div>
-        <h4>What is the initiative</h4>
-        <p>
+        <h4>What is the initiative?</h4>
+        {pia?.initiativeDescription?.content !== '' ? (
           <RichTextEditor
             content={pia?.initiativeDescription?.content ?? ''}
             readOnly={true}
             textOnlyReadOnly={true}
           />
-        </p>
+        ) : (
+          <p>Not answered</p>
+        )}
+        <br />
       </div>
       <div>
         <h4>PIA Scope</h4>
-        <p>
+        {pia?.initiativeScope?.content !== '' ? (
           <RichTextEditor
             content={pia?.initiativeScope?.content ?? ''}
             readOnly={true}
             textOnlyReadOnly={true}
           />
-        </p>
+        ) : (
+          <p>Not answered</p>
+        )}
+        <br />
       </div>
       <div>
         <h4>Data or information elements invovled in the initiative</h4>
-        <p>
+        {pia?.dataElementsInvolved?.content !== '' ? (
           <RichTextEditor
             content={pia?.dataElementsInvolved?.content ?? ''}
             readOnly={true}
             textOnlyReadOnly={true}
           />
-        </p>
+        ) : (
+          <p>Not answered</p>
+        )}
+        <br />
       </div>
       <div>
         <h4>Contains personal information?</h4>
@@ -57,15 +66,18 @@ const IntakeDetails = (pia: IPiaForm) => {
       <div>
         <h4>
           How will the risk of unintentionally collecting personal information
-          be reduced
+          be reduced?
         </h4>
-        <p>
+        {pia?.riskMitigation?.content !== '' ? (
           <RichTextEditor
             content={pia?.riskMitigation?.content ?? ''}
             readOnly={true}
             textOnlyReadOnly={true}
           />
-        </p>
+        ) : (
+          <p>Not answered</p>
+        )}
+        <br />
       </div>
     </>
   );