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

Changed calculator warnings

Browse source
This commit is contained in:
Luis Aleixo 2022-03-18 14:47:12 +00:00
parent c19ccbafe7
commit 0fafecfcf4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -408,9 +408,10 @@ function validate_form(form) {
var short_range_interactions = [];
$(".form_field_outer_row").each(function (index, element){
let obj = {};
obj.activity = $(element).find("[name='short_range_activity']").val();
obj.start_time = $(element).find("[name='short_range_start_time']").val();
obj.duration = $(element).find("[name='short_range_duration']").val();
const $element = $(element);
obj.activity = $element.find("[name='short_range_activity']").val();
obj.start_time = $element.find("[name='short_range_start_time']").val();
obj.duration = $element.find("[name='short_range_duration']").val();
short_range_interactions.push(JSON.stringify(obj));
});

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

@ -268,7 +268,7 @@
<label for="mask_on">Yes</label>
<input class="ml-2" type="radio" id="mask_off" name="mask_wearing_option" value="mask_off" checked="checked">
<label for="mask_off">No</label><br>
<p id="face_mask_warning" class="red_text">Face mask selection is disabled due to short range interaction modeling.</p>
<p id="face_mask_warning" class="red_text">The analytical model with short range interactions does not take mask wearing into account.</p>
<div id="DIVmasks_used" style="display:none">
<div class='sub_title'>Type of masks used:</div>
@ -367,7 +367,7 @@
<hr width="80%">
<div class="split">
<div>Short range interactions:</div>
<div style="min-width: 20em">Short range interactions (no masks):</div>
<div>
<input class="ml-2" type="radio" id="short_range_no" name="short_range_option" value="short_range_no" checked="checked">
<label for="short_range_no">No</label>
@ -377,7 +377,6 @@
</div>
<div id="DIVsr_interactions" class="none">
<p class="red_text">Short range interactions are modeled without masks. If you are using this option, masks will not be taken into account.</p>
<div class="d-flex">
<button type="button" id="set_interactions_button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#short_range_dialog" data-keyboard="false" data-backdrop="static">Set interactions</button>
<p class="align-self-center pl-4"><b id="sr_interactions">0</b> short range interactions.</p>