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

Intertwine changes of new features - window type and window venting

Browse source
This commit is contained in:
gaazzopa 2020-12-09 18:46:07 +01:00
parent be557c7665
commit ce3b0f63d7
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,14 +101,14 @@ function unrequire_fields(obj) {
function require_room_volume(option) {
require_input_field("#room_volume", option);
disable_input_field("#room_volume", !option);
set_disabled_status("#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);
set_disabled_status("#floor_area", !option);
set_disabled_status("#ceiling_height", !option);
}
function require_mechanical_ventilation(option) {
@ -135,35 +135,34 @@ function require_natural_ventilation(option) {
function require_window_width(option) {
require_input_field("#window_width", option);
disable_input_field("#window_width", !option);
set_disabled_status("#window_width", !option);
}
function require_air_changes(option) {
require_input_field("#air_changes", option);
disable_input_field("#air_changes", !option);
set_disabled_status("#air_changes", !option);
}
function require_air_supply(option) {
require_input_field("#air_supply", option);
disable_input_field("#air_supply", !option);
set_disabled_status("#air_supply", !option);
}
function require_venting(option) {
require_input_field("#windows_duration", option);
require_input_field("#windows_frequency", option);
//TODO: Update this after merge 109
disable_input_field("#windows_duration", option);
disable_input_field("#windows_frequency", option);
set_disabled_status("#windows_duration", !option);
set_disabled_status("#windows_frequency", !option);
}
function require_single_event(option) {
require_input_field("#single_event_date", option);
disable_input_field("#single_event_date", !option);
set_disabled_status("#single_event_date", !option);
}
function require_recurrent_event(option) {
$("#recurrent_event_month").prop('required', option);
disable_input_field("#recurrent_event_month", !option);
set_disabled_status("#recurrent_event_month", !option);
}
function require_lunch(option) {
@ -196,7 +195,7 @@ function require_mask(option) {
function require_hepa(option) {
require_input_field("#hepa_amount", option);
disable_input_field("#hepa_amount", !option);
set_disabled_status("#hepa_amount", !option);
}
function require_input_field(id, option) {
@ -206,7 +205,7 @@ function require_input_field(id, option) {
}
}
function disable_input_field(id, option) {
function set_disabled_status(id, option) {
if (option)
$(id).addClass("disabled");
else

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

@ -84,7 +84,7 @@
<label for="window_sliding">Sliding / Side-Hung</label>&nbsp;&nbsp;
<input type="radio" id="window_hinged" name="window_type" value="hinged" onclick="require_fields(this)">
<label for="window_hinged">Top- or Bottom-Hung</label>&nbsp;&nbsp;<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>
Width of window: <input type="number" step="any" id="window_width" class="non_zero disabled" name="window_width" placeholder="meters" min="0" data-has-radio="#window_hinged"><br>
Opening distance: <input type="number" step="any" id="opening_distance" class="non_zero" name="opening_distance" placeholder="meters" min="0"><br>
Windows open:</span><br>
<span class="tabbed"><input type="radio" id="always" name="windows_open" value="always" onclick="require_fields(this)" checked="checked"></span>

2
cara/tests/apps/calculator/test_model_generator.py
View file

@ -62,6 +62,8 @@ def test_ventilation_hingedwindow(baseline_form):
window_height=1.6, window_width=1., opening_length=0.6,
)
baseline_form.ventilation_type = 'natural'
baseline_form.windows_duration = 10
baseline_form.windows_frequency = 120
baseline_form.windows_open = 'interval'
baseline_form.window_type = 'hinged'
baseline_form.event_type = 'recurrent_event'