From cd9214a7278915a59f95105027237e107c7f5c0d Mon Sep 17 00:00:00 2001
From: lrdossan <luis.aleixo@cern.ch>
Date: Fri, 11 Oct 2024 16:17:14 +0200
Subject: [PATCH 1/2] added eACH to HEPA question

---
 .../apps/templates/base/calculator.form.html.j2       | 11 ++++++++---
 .../apps/templates/base/calculator.report.html.j2     |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2
index ed1e24ba..fed328c6 100644
--- a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2
+++ b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2
@@ -381,7 +381,12 @@
           </div>
         </div>
       </div></br>
-      <div class='sub_title'>HEPA filtration:</div>
+      <div class='sub_title'>
+        HEPA Filtration / eACH:
+        <div data-tooltip="CADR - Clean Air Delivery Rate">
+          <span class="tooltip_text">?</span>
+        </div>
+      </div>
       <div>
         <input type="radio" id="hepa_yes" name="hepa_option" value=1 onclick="require_fields(this)" data-enables="#DIVhepa_amount">
           <label for="hepa_yes" class="col-form-label ml-2">Yes</label>
@@ -389,8 +394,8 @@
           <label for="hepa_no" class="col-form-label ml-2">No</label>
       </div>
       <div class="form-group row tabbed" id="DIVhepa_amount">
-        <div class="col-md-5"><label for="hepa_amount" class="col-form-label">Flow rate (m³ / hour):</label></div>
-        <div class="col-md-5"><input type="number" step="any" id="hepa_amount" class="non_zero form-control" name="hepa_amount" placeholder="Flow rate" min="0" data-has-radio="#hepa_yes"></div>
+        <div class="col-md-6"><label for="hepa_amount" class="col-form-label">Flow rate / CADR (m³ / hour):</label></div>
+        <div class="col-md-4"><input type="number" step="any" id="hepa_amount" class="non_zero form-control" name="hepa_amount" placeholder="Flow rate" min="0" data-has-radio="#hepa_yes"></div>
       </div>
       <hr width="80%">
     </div>
diff --git a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.report.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.report.html.j2
index fadd5e79..db2e91ea 100644
--- a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.report.html.j2
+++ b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.report.html.j2
@@ -545,10 +545,10 @@
 							{% else %}
 							No </p></li>
 							{% endif %}
-							<li><p class="data_text">HEPA Filtration: {{ 'Yes' if form.hepa_option else 'No' }}</li>
+							<li><p class="data_text">HEPA Filtration / eACH: {{ 'Yes' if form.hepa_option else 'No' }}</li>
 							{% if form.hepa_option %}
 							<ul>
-								<li><p class="data_text">HEPA amount: {{ form.hepa_amount }} m³ / hour</p></li>
+								<li><p class="data_text">HEPA amount / CADR: {{ form.hepa_amount }} m³ / hour</p></li>
 							</ul>
 							{% endif %}
 							<li><p class="data_text">From fitting:

From d00df39d1bbbecea596804fabd10678f3e78c915 Mon Sep 17 00:00:00 2001
From: lrdossan <luis.aleixo@cern.ch>
Date: Tue, 15 Oct 2024 16:47:55 +0200
Subject: [PATCH 2/2] update on labels

---
 .../apps/templates/base/calculator.form.html.j2      | 12 +++++++-----
 .../apps/templates/base/calculator.report.html.j2    |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2
index fed328c6..dc5fb4d5 100644
--- a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2
+++ b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2
@@ -382,10 +382,7 @@
         </div>
       </div></br>
       <div class='sub_title'>
-        HEPA Filtration / eACH:
-        <div data-tooltip="CADR - Clean Air Delivery Rate">
-          <span class="tooltip_text">?</span>
-        </div>
+        HEPA Filtration / Eq. ventilation:
       </div>
       <div>
         <input type="radio" id="hepa_yes" name="hepa_option" value=1 onclick="require_fields(this)" data-enables="#DIVhepa_amount">
@@ -394,7 +391,12 @@
           <label for="hepa_no" class="col-form-label ml-2">No</label>
       </div>
       <div class="form-group row tabbed" id="DIVhepa_amount">
-        <div class="col-md-6"><label for="hepa_amount" class="col-form-label">Flow rate / CADR (m³ / hour):</label></div>
+        <div class="col-md-7">
+          <label for="hepa_amount" class="col-form-label">Flow rate / CADR (m³ / hour):</label>
+          <div data-tooltip="CADR - Clean Air Delivery Rate">
+            <span class="tooltip_text">?</span>
+          </div>
+        </div>
         <div class="col-md-4"><input type="number" step="any" id="hepa_amount" class="non_zero form-control" name="hepa_amount" placeholder="Flow rate" min="0" data-has-radio="#hepa_yes"></div>
       </div>
       <hr width="80%">
diff --git a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.report.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.report.html.j2
index db2e91ea..e81cc53f 100644
--- a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.report.html.j2
+++ b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.report.html.j2
@@ -545,7 +545,7 @@
 							{% else %}
 							No </p></li>
 							{% endif %}
-							<li><p class="data_text">HEPA Filtration / eACH: {{ 'Yes' if form.hepa_option else 'No' }}</li>
+							<li><p class="data_text">HEPA Filtration / Eq. ventilation: {{ 'Yes' if form.hepa_option else 'No' }}</li>
 							{% if form.hepa_option %}
 							<ul>
 								<li><p class="data_text">HEPA amount / CADR: {{ form.hepa_amount }} m³ / hour</p></li>