Merge pull request #229 from pnnl/template-updates

Template updates to rearrange the Manual J display in report
pnnl · Oct 3, 2024 · 270e84e · 270e84e
2 parents 4277d40 + e9a5547
commit 270e84e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 29 deletions.
diff --git a/src/templates/doe_workflow_heat_pump_ducted.mdx b/src/templates/doe_workflow_heat_pump_ducted.mdx
@@ -71,12 +71,10 @@
             </PhotoInput>        
         </ShowOrHide>
 
-## Combustion Appliance Safety Testing
-     <p>If the home upgrades will result in a barometric draft controlled or Category I appliance equipped with a draft 
-hood or connected to a natural draft venting system remaining in the conditioned envelope of the home, combustion 
-safety checks are required to be performed at the completion of the project. </p>
-
-
+        ## Combustion Appliance Safety Testing
+            <p>If the home upgrades will result in a barometric draft controlled or Category I appliance equipped with a draft 
+        hood or connected to a natural draft venting system remaining in the conditioned envelope of the home, combustion 
+        safety checks are required to be performed at the completion of the project. </p>
 
     </Tab>
      <Tab eventKey="planning" title="Planning">
@@ -251,10 +249,7 @@ safety checks are required to be performed at the completion of the project. </p
 
     </Tab>
     <Tab eventKey="report" title="Report">
-
-
-
-         <PrintSection label="Print Report">
+        <PrintSection label="Print Report">
             ---
             # Central Ducted Split Heat Pump Upgrade
             ## Photo Report
@@ -406,8 +401,6 @@ safety checks are required to be performed at the completion of the project. </p
                     Photo of the document showing the readings from all the supply registers
                 </Photo>        
             </ShowOrHide>
-
-            <CombustionSafetyChecksReport path="combustion_safety_tests" />
 
             ## Planning
             <Photo id="proposed_odu_install_location_photo" label="Proposed ODU Install Location – Photo" required>
@@ -431,19 +424,19 @@ safety checks are required to be performed at the completion of the project. </p
 
 
             {
-                props.metadata.attachments?.manual_j_file || props.data.comment_manual_j ?
+                props.metadata.attachments?.manual_j_file && (
                 <>
                 <h2> Manual J </h2>
-                {
-                 props.metadata.attachments?.manual_j_file  ? <p>Please see the attached PDF containing the Manual J report.</p> : null
-                }
-
+                 {props.metadata.attachments?.manual_j_file  ? <p>Please see the attached Manual J report.</p> : null}
+                </>)
+            }
+            <PDFRenderer id="manual_j_file" label="" />
+
 
-                { props.data.comment_manual_j
-                ? <p><strong>Manual J Notes or Comments: </strong> {props.data.comment_manual_j}</p> 
-                : null }
 
-                </> : null
+            { props.data.comment_manual_j
+                && (<p><strong>Manual J Notes or Comments: </strong> {props.data.comment_manual_j}</p> 
+                )
             }
             ## Equipment Selection
             The selected heat pump's extended heating and cooling performance tables are shown below. These tables were used in concert with the ASHRAE heating 
@@ -581,7 +574,9 @@ safety checks are required to be performed at the completion of the project. </p
                 Photo of the project invoice
                 </Photo> </>
             )}
-            <PDFRenderer id="manual_j_file" label="PDF of Manual J - File" />
+
+            <CombustionSafetyChecksReport path="combustion_safety_tests" />
+
 
         </PrintSection>
     </Tab>

diff --git a/src/templates/doe_workflow_heat_pump_ductless.mdx b/src/templates/doe_workflow_heat_pump_ductless.mdx
@@ -199,7 +199,7 @@
     </Tab>
     <Tab eventKey="report" title="Report">
 
-        <PrintSection label="Print Report">
+       <PrintSection label="Print Report">
             ---
             # Ductless Heat Pump Upgrade
             ## Photo Report
@@ -297,11 +297,11 @@
                 props.metadata.attachments?.manual_j_file  ?
                 <>
                 <h2> Manual J </h2>
-                <p>Please see the attached PDF containing the Manual J report.</p>
+                <p>Please see the attached Manual J report.</p>
                 </> : null
 
             }
-
+            <PDFRenderer id="manual_j_file" label="" />
 
             ## Equipment Selection
             <Photo id="heating_performance_table_photo" label="Heating Performance Table – Photo" required>
@@ -417,14 +417,12 @@
 
             <CombustionSafetyChecksReport path="combustion_safety_tests" />
 
-
             {props.metadata?.attachments?.project_invoice_photo && (
             <><h2> Project Invoice</h2>
             <Photo id="project_invoice_photo" label="Project Invoice – Photo">
                 Photo of the project invoice
             </Photo> </>
             )}
-            <PDFRenderer id="manual_j_file" label="PDF of Manual J - File" />
 
         </PrintSection>
 

diff --git a/src/templates/ira_doe_workflow_high_efficiency_gas_furnace.mdx b/src/templates/ira_doe_workflow_high_efficiency_gas_furnace.mdx
@@ -73,7 +73,7 @@
     </PhotoInput>
   </Tab>
   <Tab eventKey="report" title="Report">
-    <PrintSection label="Print Report">
+   <PrintSection label="Print Report">
     ---
     # High Efficiency Gas Furnace Upgrade
     ## Photo Report
@@ -147,7 +147,7 @@
           <>
           <h2> Manual J Load Calculation</h2>
           {
-            props.metadata.attachments?.manual_j_file  ? <p>Please see the attached PDF containing the Manual J report.</p> : null
+            props.metadata.attachments?.manual_j_file  ? <p>Please see the attached Manual J report.</p> : null
           }
           </>: null
     }