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

Changed not recurrent event to specific event

Browse source
This commit is contained in:
Luis Aleixo 2022-01-10 16:00:00 +01:00
parent 95d0afc52f
commit 931a3320b9
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@ function require_fields(obj) {
case "hepa_no":
require_hepa(false);
break;
case "p_not_recurrent_event":
case "p_specific_event":
require_population(true);
break;
case "p_recurrent_event":

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

@ -311,13 +311,13 @@
<input type="radio" id="p_recurrent_event" name="p_recurrent_option" value="p_recurrent_event" checked="checked">
<label for="p_recurrent_event">Recurrent exposure</label>
<input class="ml-2" type="radio" id="p_not_recurrent_event" name="p_recurrent_option" value="p_not_recurrent_event" data-enables="#DIVp_not_recurrent_event">
<label for="p_not_recurrent_event">Specific event</label>
<input class="ml-2" type="radio" id="p_specific_event" name="p_recurrent_option" value="p_specific_event" data-enables="#DIVp_specific_event">
<label for="p_specific_event">Specific event</label>
<div data-tooltip="Specific event occurring at a given time (e.g. meeting or conference). Indicate the 7-day average of new reported cases and the population of a given location.">
<span class="tooltip_text">?</span>
</div>
<div id="DIVp_not_recurrent_event" style="display: none">
<div id="DIVp_specific_event" style="display: none">
<div class="form-group row">
<div class="col-sm-4"><label class="col-form-label">Population:</label></div>
<div class="col-sm-6 align-self-center"><input type="number" step="any" id="geographic_population" class="non_zero form-control" name="geographic_population" placeholder="Inhabitants (#)" min="0"></div>

4
cara/apps/templates/base/calculator.report.html.j2
View file

@ -82,7 +82,7 @@
Taking into account the uncertainties tied to the model variables, in this scenario, the <b>probability of one exposed occupant getting infected is {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
</div>
{% block specific_event_probability %}
{% if form.p_recurrent_option == "p_not_recurrent_event" %}
{% if form.p_recurrent_option == "p_specific_event" %}
<br>
<div class="align-self-center alert alert-dark mb-0" role="alert">
The above result assumes that <b>{{ form.infected_people }}
@ -303,7 +303,7 @@
<li><p class="data_text">Number of attendees and infected people: {{ form.total_people }} in attendance, of whom {{ form.infected_people }}
{{ "is" if form.infected_people == 1 else "are" }}
infected.</p></li>
{% if form.p_recurrent_option == "p_not_recurrent_event" %}
{% if form.p_recurrent_option == "p_specific_event" %}
<li><p class="data_text">Geographic population: {{ form.geographic_population }}</p></li>
<li><p class="data_text">Geographic cumulative reported cases: {{ form.geographic_cases }}</p></li>
{% endif %}