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

deal with modal button labels and pre-selected ventilation options

Browse source
This commit is contained in:
Luis Aleixo 2023-07-10 15:45:22 +01:00
parent a80c804832
commit e861f6ac4e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,9 @@ const CO2_data_form = [
// Method to upload a valid excel file
function upload_file() {
clear_fitting_algorithm();
$("#generate_fitting_data").show();
$("#save_and_dismiss_dialog").hide();
var files = document.getElementById("file_upload").files;
if (files.length == 0) {
alert("Please choose any file...");
@ -145,6 +148,7 @@ function display_fitting_data(json_response) {
});
$("#ventilation_rate_fit").html(ventilation_table);
$("#generate_fitting_data").html('Fit data');
$("#generate_fitting_data").hide();
$("#save_and_dismiss_dialog").show();
}
@ -181,6 +185,5 @@ function clear_fitting_algorithm() {
$('span.' + "error_text").remove();
$('#DIV_CO2_fitting_result').hide();
$('#CO2_input_data_div').hide();
$('#CO2_data_no').click();
ventilation_from_fitting(false);
}

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

@ -702,9 +702,6 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="CO2_values_title">CO₂ Fitting Algorithm</h5>
<button type="button" class="close close_btn_frm_field" data-dismiss="modal" onclick="clear_fitting_algorithm()">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="d-flex d-row justify-content-between">
@ -735,9 +732,9 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary dismiss_btn_frm_field" data-dismiss="modal" onclick="clear_fitting_algorithm()">Clear all/Discard</button>
<button type="button" class="btn btn-secondary dismiss_btn_frm_field" data-dismiss="modal" onclick="clear_fitting_algorithm(); $('#CO2_data_no').click();">Discard</button>
<button type="button" id="generate_fitting_data" class="btn btn-primary close_btn_frm_field" onclick="submit_fitting_algorithm('{{ get_calculator_url() }}/co2-fit')" disabled>Fit data</button>
<button type="button" style="display: none" id="save_and_dismiss_dialog" class="btn btn-primary close_btn_frm_field" data-dismiss="modal">Save and close</button>
<button type="button" style="display: none" id="save_and_dismiss_dialog" class="btn btn-primary close_btn_frm_field" data-dismiss="modal">Use fit data</button>
</div>
</div>
</div>