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

use more css classes

Browse source
This commit is contained in:
Luis Aleixo 2023-07-20 17:06:17 +02:00
parent 16eac4101a
commit 6aa485c3d8
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caimira/apps/calculator/static/js/co2_form.js
View file

@ -88,7 +88,7 @@ const CO2_data_form = [
} }
function insertErrorFor(referenceNode, text) { function insertErrorFor(referenceNode, text) {
const element = $('<span></span>').addClass('error_text red_text').html('&nbsp;&nbsp;' + text); const element = $('<span></span>').addClass('error_text text-danger').html('&nbsp;&nbsp;' + text);
$(referenceNode).before(element); $(referenceNode).before(element);
} }

8
caimira/apps/templates/base/calculator.form.html.j2
View file

@ -310,7 +310,7 @@
</ul> </ul>
</div> </div>
<div class="align-self-center text-center"> <div class="align-self-center text-center">
<button id="button_fit_data" type="button" class="btn btn-primary" style="width: 60%" data-target="#DIVCO2_data_dialog" data-keyboard="false" data-backdrop="static" onclick="validateFormInputs(this)">Fitting Algorithm</button> <button id="button_fit_data" type="button" class="btn btn-primary w-50" data-target="#DIVCO2_data_dialog" data-keyboard="false" data-backdrop="static" onclick="validateFormInputs(this)">Fitting Algorithm</button>
</div> </div>
</div> </div>
@ -323,7 +323,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="d-flex d-row justify-content-between"> <div class="d-flex d-row justify-content-between">
<h5 style="margin-top: auto; margin-bottom: auto">Upload an Excel file to preview in HTML Table</h5> <h5 class="mt-auto mb-auto">Upload an Excel file to preview in HTML Table</h5>
<button type="button" class="btn btn-primary btn-sm" onclick="downloadTemplate()">Download template</button> <button type="button" class="btn btn-primary btn-sm" onclick="downloadTemplate()">Download template</button>
</div> </div>
<br> <br>
@ -355,11 +355,11 @@
</div> </div>
<div id="DIVCO2_fitting_result" style="display: none"> <div id="DIVCO2_fitting_result" style="display: none">
<h5 style="margin-top: auto; margin-bottom: auto">Fitting result</h5><br> <h5 class="mt-auto mb-auto">Fitting result</h5><br>
<p id="exhalation_rate_fit"></p> <p id="exhalation_rate_fit"></p>
<p>Ventilation values (ACH):</p><br> <p>Ventilation values (ACH):</p><br>
<!-- table to display the ventilation result data --> <!-- table to display the ventilation result data -->
<table id="ventilation_rate_fit" border="1" style="width: 70%; margin-left: auto; margin-right: auto"></table> <table id="ventilation_rate_fit" class="w-75 mr-auto ml-auto" border="1"></table>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

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

@ -531,7 +531,7 @@
<li><p class="data_text">From Fitting: <li><p class="data_text">From Fitting:
{% if form.ventilation_type == "from_fitting" %} {% if form.ventilation_type == "from_fitting" %}
Yes Yes
<table border="1" style="width: 20%; margin-left: 30px; margin-top: 20px"> <table class="w-25 mt-3 ml-4" border="1">
<tr><th> Time (HH:MM)</th><th>ACH value (h⁻¹)</th></tr> <tr><th> Time (HH:MM)</th><th>ACH value (h⁻¹)</th></tr>
{% for ventilation in form.CO2_fitting_result['ventilation_values'] %} {% for ventilation in form.CO2_fitting_result['ventilation_values'] %}
{% set transition_time = form.CO2_fitting_result['transition_times'] %} {% set transition_time = form.CO2_fitting_result['transition_times'] %}
@ -596,7 +596,7 @@
Gym - For comparison only, all persons doing heavy physical exercise, breathing and not speaking. Gym - For comparison only, all persons doing heavy physical exercise, breathing and not speaking.
{% endif %} {% endif %}
{% if form.ventilation_type == "from_fitting" %} {% if form.ventilation_type == "from_fitting" %}
<p style="margin-left: 30px">Exhalation rate from fitting algorithm - {{form.CO2_fitting_result['exhalation_rate'] | round(2, 'floor')}} m³/h</p> <p class="ml-5">Exhalation rate from fitting algorithm - {{form.CO2_fitting_result['exhalation_rate'] | round(2, 'floor')}} m³/h</p>
{% endif %} {% endif %}
</p></li> </p></li>
{% if form.short_range_option == "short_range_yes" %} {% if form.short_range_option == "short_range_yes" %}