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

Default sliding window and fix disable input logic

Browse source
This commit is contained in:
gaazzopa 2020-12-02 19:12:47 +01:00
parent db25fa9768
commit 258446369c
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cara/apps/calculator/static/js/form.js
View file

@ -90,14 +90,14 @@ function unrequire_fields(obj) {
function require_room_volume(option) {
require_input_field("#room_volume", option);
disable_input_field("#room_volume", option);
disable_input_field("#room_volume", !option);
}
function require_room_dimensions(option) {
require_input_field("#floor_area", option);
require_input_field("#ceiling_height", option);
disable_input_field("#floor_area", option);
disable_input_field("#ceiling_height", option);
disable_input_field("#floor_area", !option);
disable_input_field("#ceiling_height", !option);
}
function require_mechanical_ventilation(option) {
@ -117,31 +117,34 @@ function require_natural_ventilation(option) {
$("#window_hinged").prop('required', option);
$("#always").prop('required', option);
$("#interval").prop('required', option);
$("#window_sliding").prop('checked', option);
require_window_width(false);
}
function require_window_width(option) {
require_input_field("#window_width", option);
disable_input_field("#window_width", option);
disable_input_field("#window_width", !option);
}
function require_air_changes(option) {
require_input_field("#air_changes", option);
disable_input_field("#air_changes", option);
disable_input_field("#air_changes", !option);
}
function require_air_supply(option) {
require_input_field("#air_supply", option);
disable_input_field("#air_supply", option);
disable_input_field("#air_supply", !option);
}
function require_single_event(option) {
require_input_field("#single_event_date", option);
disable_input_field("#single_event_date", option);
disable_input_field("#single_event_date", !option);
}
function require_recurrent_event(option) {
$("#recurrent_event_month").prop('required', option);
disable_input_field("#recurrent_event_month", option);
disable_input_field("#recurrent_event_month", !option);
}
function require_lunch(option) {
@ -170,7 +173,7 @@ function require_mask(option) {
function require_hepa(option) {
require_input_field("#hepa_amount", option);
disable_input_field("#hepa_amount", option);
disable_input_field("#hepa_amount", !option);
}
function require_input_field(id, option) {
@ -182,9 +185,9 @@ function require_input_field(id, option) {
function disable_input_field(id, option) {
if (option)
$(id).removeClass("disabled");
else
$(id).addClass("disabled");
else
$(id).removeClass("disabled");
}
function setMaxInfectedPeople() {
@ -270,6 +273,9 @@ function click_radio(id) {
case "air_changes":
$("#air_type_changes").click();
break;
case "window_width":
$("#window_hinged").click();
break;
case "hepa_amount":
$("#hepa_yes").click();
break;

4
cara/apps/calculator/templates/calculator.form.html.j2
View file

@ -80,11 +80,11 @@
Number of windows: <input type="number" id="windows_number" class="non_zero" name="windows_number" min="1"><br>
Height of window: <input type="number" step="any" id="window_height" class="non_zero" name="window_height" placeholder="meters" min="0"><br>
Window type:
<input type="radio" id="window_sliding" name="window_type" value="sliding" onclick="require_fields(this)">
<input type="radio" id="window_sliding" name="window_type" value="sliding" onclick="require_fields(this)" checked="checked">
<label for="window_sliding">Sliding</label>&nbsp;&nbsp;
<input type="radio" id="window_hinged" name="window_type" value="hinged" onclick="require_fields(this)">
<label for="window_hinged">Hinged</label>&nbsp;&nbsp;<br>
Width of window: <input type="number" step="any" id="window_width" class="non_zero" name="window_width" placeholder="meters" min="0"><br>
Width of window: <input type="number" step="any" id="window_width" class="non_zero has_radio disabled" name="window_width" placeholder="meters" min="0"><br>
Opening distance: <input type="number" step="any" id="opening_distance" class="non_zero" name="opening_distance" placeholder="meters" min="0"><br>
Windows open: <input type="radio" id="always" name="windows_open" value="always">
<label for="always">Always</label> &nbsp;&nbsp;