Merge branch 'changes/UI_HEPA' into 'master'

Added Eq. ventilation to HEPA question See merge request caimira/caimira!513
CERN · Oct 15, 2024 · 66c6faa · 66c6faa
2 parents c4aa3cb + d00df39
commit 66c6faa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -381,16 +381,23 @@
           </div>
         </div>
       </div></br>
-      <div class='sub_title'>HEPA filtration:</div>
+      <div class='sub_title'>
+        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">
           <label for="hepa_yes" class="col-form-label ml-2">Yes</label>
         <input class="ml-2" type="radio" id="hepa_no" name="hepa_option" value=0 onclick="require_fields(this)" checked="checked">
           <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-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%">
     </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
@@ -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 / Eq. ventilation: {{ '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: