pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'changes/UI_HEPA' into 'master'

Browse source 
Added Eq. ventilation to HEPA question

See merge request caimira/caimira!513
This commit is contained in:
Andre Henriques 2024-10-15 17:44:50 +02:00
commit 66c6faac79
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2
View file

@ -381,7 +381,9 @@
</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>
@ -389,8 +391,13 @@
<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>

4
cern_caimira/src/cern_caimira/apps/templates/base/calculator.report.html.j2
View file

@ -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: