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

Stop passing window data through the dictionary, and start using the form.

Browse source
This commit is contained in:
Phil Elson 2020-11-06 18:05:48 +01:00
parent 12d09b438d
commit 10b9a5e24d
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -92,15 +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,
'mechanical_ventilation_type': form.mechanical_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,

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

@ -24,13 +24,13 @@
<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">
{% if mechanical_ventilation_type == "air_supply"%}
{% if form.mechanical_ventilation_type == "air_supply"%}
Air supply flow rate: {{ air_supply }}
{% elif mechanical_ventilation_type == "air_changes"%}
{% elif form.mechanical_ventilation_type == "air_changes"%}
Air changes per hour: {{ air_changes }}
{% endif %}
</p></li>
@ -39,14 +39,14 @@
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 %}