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

Merge branch 'develop/report-fixes' into 'master'

Browse source 
Report fixes

See merge request cara/cara!54
This commit is contained in:
Philip James Elson 2020-11-06 17:09:26 +00:00
commit 9bc9914122
2 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cara/apps/calculator/report_generator.py
View file

@ -92,14 +92,8 @@ def build_report(model: models.Model, form: FormData):
'simulation_name': form.simulation_name,
'room_number': form.room_number,
'room_volume': form.room_volume,
'ventilation_type': form.ventilation_type,
'air_supply': form.air_supply,
'air_changes': form.air_changes,
'windows_number': form.windows_number,
'window_height': form.window_height,
'window_width': form.window_width,
'opening_distance': form.opening_distance,
'windows_open': form.windows_open,
'total_people': form.total_people,
'infected_people': form.infected_people,
'activity_type': form.activity_type,

40
cara/apps/calculator/templates/report.html.j2
View file

@ -24,24 +24,29 @@
<p class="data_title">Ventilation data:</p>
<ul>
<li><p class="data_text">Mechanical ventilation:
{% if ventilation_type == "mechanical"%}
{% if form.ventilation_type == "mechanical"%}
Yes </p></li>
<ul>
<li><p class="data_subtext">Air supply flow rate: {{ air_supply }}</p></li>
<li><p class="data_subtext">Air changes per hour: {{ air_changes }}</p></li>
<li><p class="data_subtext">
{% if form.mechanical_ventilation_type == "air_supply"%}
Air supply flow rate: {{ air_supply }}
{% elif form.mechanical_ventilation_type == "air_changes"%}
Air changes per hour: {{ air_changes }}
{% endif %}
</p></li>
</ul>
{% else %}
No </li>
{% endif %}
<li><p class="data_text">Natural ventilation:
{% if ventilation_type == "natural"%}
{% if form.ventilation_type == "natural"%}
Yes </p></li>
<ul>
<li><p class="data_subtext">Number of windows: {{ windows_number }}</p></li>
<li><p class="data_subtext">Height of window: {{ window_height }}</p></li>
<li><p class="data_subtext">Width of window: {{ window_width }}</p></li>
<li><p class="data_subtext">Opening distance: {{ opening_distance }}</p></li>
<li><p class="data_subtext">Windows open: {{ windows_open }}</p></li>
<li><p class="data_subtext">Number of windows: {{ form.windows_number }}</p></li>
<li><p class="data_subtext">Height of window: {{ form.window_height }}</p></li>
<li><p class="data_subtext">Width of window: {{ form.window_width }}</p></li>
<li><p class="data_subtext">Opening distance: {{ form.opening_distance }}</p></li>
<li><p class="data_subtext">Windows open: {{ form.windows_open }}</p></li>
</ul>
<p class="data_subtext data_italic">When using the natural ventilation option, air flows are calculated using averaged hourly temperatures for the Geneva region, based on historical data for the month selected.</p>
{% else %}
@ -54,11 +59,7 @@
<p class="data_title">Event data:</p>
<ul>
<li><p class="data_text">Number of attendees and infected people: {{ total_people }} in attendance, of whom {{ infected_people }}
{% if infected_people == 1 %}
is
{% else %}
are
{% endif %}
{{ "is" if infected_people == 1 else "are" }}
infected.</p></li>
<li><p class="data_text">Activity type:
{% if activity_type == "office" %}
@ -82,7 +83,6 @@
{% if event_type == "recurrent_event"%}
<li><p class="data_text">Recurrent event for the month of {{ recurrent_event_month }}</p></li>
{% endif %}
</ul>
<p class="data_title">Break data:</p>
@ -110,19 +110,15 @@
<p class="data_title">Mask wearing:</p>
<ul>
<li><p class="data_text">Masks worn at workstations?
{% if mask_wearing == "removed" %}
No
{% else %}
Yes
{% endif %}
<li><p class="data_text">Masks worn at workstations?
{{ "No" if mask_wearing == "removed" else "Yes" }}
</p></li>
<li><p class="data_text">Mask type: Type 1</p></li>
</ul>
<p class="result_title">Results:</p>
<p class="data_text">
In this scenario, the estimated probability of one exposed occupant getting infected P(i) is {{ "{:#.2g}".format(prob_inf) }}% and the estimated basic reproduction rate (R0) is {{ "{:#.2g}".format(R0) }}.
In this scenario, the estimated probability of one exposed occupant getting infected P(i) is {{ "{0:.2f}".format(prob_inf) }}% and the estimated basic reproduction rate (R0) is {{ "{0:.2f}".format(R0) }}.
<p>
<p class="data_title">Exposure graph:</p>
<img id="scenario_concentration_plot" src="{{ scenario_plot_src }}">