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

Handled coffee breaks duration #273

Browse source
This commit is contained in:
Luis Aleixo 2022-07-28 11:41:18 +02:00
parent 451ca8c7cc
commit 75ccf857ec
2 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -287,6 +287,22 @@ function on_short_range_option_change() {
})
}
function on_coffee_break_option_change() {
all_coffee_breaks = [$('input[type=radio][name=exposed_coffee_break_option]'), $('input[type=radio][name=infected_coffee_break_option]')];
for (coffee_breaks of all_coffee_breaks) {
coffee_breaks.each(function() {
children = getChildElement($(this));
if (this.checked && children.length) {
children.show();
return false;
}
else {
children.hide();
}
})
}
}
/* -------UI------- */
function show_disclaimer() {
@ -743,6 +759,13 @@ $(document).ready(function () {
// Call the function now to handle forward/back button presses in the browser.
on_short_range_option_change();
// When the coffee_break_option changes we want to make its respective
// children show/hide
$("input[type=radio][name=exposed_coffee_break_option]").change(on_coffee_break_option_change);
$("input[type=radio][name=infected_coffee_break_option]").change(on_coffee_break_option_change);
// Call the function now to handle forward/back button presses in the browser.
on_coffee_break_option_change();
// Setup the maximum number of people at page load (to handle back/forward),
// and update it when total people is changed.
setMaxInfectedPeople();

34
cara/apps/templates/base/calculator.form.html.j2
View file

@ -476,25 +476,27 @@
</div>
<div>
<input type="radio" id="exposed_coffee_break_0" name="exposed_coffee_break_option" value="coffee_break_0" checked="checked">
<label for="exposed_coffee_break_0" >No breaks</label>
<input class="ml-2" type="radio" id="exposed_coffee_break_2" name="exposed_coffee_break_option" value="coffee_break_2">
<label for="exposed_coffee_break_0">No breaks</label>
<input class="ml-2" type="radio" id="exposed_coffee_break_2" name="exposed_coffee_break_option" value="coffee_break_2" data-enables="#DIVexposed_breaks_duration">
<label for="exposed_coffee_break_2">2</label>
<input class="ml-2" type="radio" id="exposed_coffee_break_4" name="exposed_coffee_break_option" value="coffee_break_4">
<input class="ml-2" type="radio" id="exposed_coffee_break_4" name="exposed_coffee_break_option" value="coffee_break_4" data-enables="#DIVexposed_breaks_duration">
<label for="exposed_coffee_break_4">4</label><br>
</div>
</div>
<br>
Duration (minutes):
<select id="exposed_coffee_duration" name="exposed_coffee_duration">
<option value="5">5</option>
<option value="10">10</option>
<option value="15">15</option>
<option value="20">20</option>
<option value="25">25</option>
<option value="30">30</option>
</select><br>
<div id="DIVexposed_breaks_duration" style="display:none">
Duration (minutes):
<select id="exposed_coffee_duration" name="exposed_coffee_duration">
<option value="5">5</option>
<option value="10">10</option>
<option value="15">15</option>
<option value="20">20</option>
<option value="25">25</option>
<option value="30">30</option>
</select><br>
</div>
</div>
<br>
</div>
@ -525,17 +527,18 @@
<div>
<input type="radio" id="infected_coffee_break_0" name="infected_coffee_break_option" value="coffee_break_0" checked="checked">
<label for="infected_coffee_break_0" >No breaks</label>
<input style="ml-2" type="radio" id="infected_coffee_break_2" name="infected_coffee_break_option" value="coffee_break_2">
<input style="ml-2" type="radio" id="infected_coffee_break_2" name="infected_coffee_break_option" value="coffee_break_2" data-enables="#DIVinfected_breaks_duration">
<label for="infected_coffee_break_2">2</label>
<input style="ml-2" type="radio" id="infected_coffee_break_4" name="infected_coffee_break_option" value="coffee_break_4">
<input style="ml-2" type="radio" id="infected_coffee_break_4" name="infected_coffee_break_option" value="coffee_break_4" data-enables="#DIVinfected_breaks_duration">
<label for="infected_coffee_break_4">4</label><br>
</div>
</div>
<br>
<div id="DIVinfected_breaks_duration" style="display:none">
Duration (minutes):
<select id="infected_coffee_duration" name="infected_coffee_duration">
<select id="DIVinfected_coffee_duration" name="infected_coffee_duration">
<option value="5">5</option>
<option value="10">10</option>
<option value="15">15</option>
@ -543,6 +546,7 @@
<option value="25">25</option>
<option value="30">30</option>
</select><br>
</div>
</div>
<br>
</div>