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

renamed clear fitting algorithm method

Browse source
This commit is contained in:
Luis Aleixo 2023-07-11 14:09:17 +01:00
parent 36d7cc0c3f
commit caeaa8c39e
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ const CO2_data_form = [
// Method to upload a valid excel file
function upload_file() {
clear_fitting_algorithm();
clear_fitting_result_component();
$("#generate_fitting_data").show();
$("#save_and_dismiss_dialog").hide();
var files = document.getElementById("file_upload").files;
@ -177,7 +177,7 @@ function submit_fitting_algorithm(url) {
}
}
function clear_fitting_algorithm() {
function clear_fitting_result_component() {
$('#generate_fitting_data').prop("disabled", true);
$("#display_excel_data tbody").remove();
$('#CO2_fitting_result').val('');
@ -185,5 +185,10 @@ function clear_fitting_algorithm() {
$('span.' + "error_text").remove();
$('#DIV_CO2_fitting_result').hide();
$('#CO2_input_data_div').hide();
}
function clear_fitting_algorithm() {
clear_fitting_result_component();
$('#CO2_data_no').click();
ventilation_from_fitting(false);
}

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

@ -732,7 +732,7 @@
</div>
</div>
<div class="modal-footer">
<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" class="btn btn-secondary dismiss_btn_frm_field" data-dismiss="modal" onclick="clear_fitting_algorithm()">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">Use fit data</button>
</div>