From dc6fcfd56f05144009dd28ab8d28c1a718bbe1b3 Mon Sep 17 00:00:00 2001
From: gaazzopa <gabriella.azzopardi@cern.ch>
Date: Fri, 6 Nov 2020 17:46:04 +0100
Subject: [PATCH 1/3] Result format was not user friendly

---
 cara/apps/calculator/report_generator.py      |  3 ++-
 cara/apps/calculator/templates/report.html.j2 | 26 ++++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py
index 573f8bb0..dd487fb3 100644
--- a/cara/apps/calculator/report_generator.py
+++ b/cara/apps/calculator/report_generator.py
@@ -92,7 +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, 
+        '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, 
diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2
index 607781c8..9a68f263 100644
--- a/cara/apps/calculator/templates/report.html.j2
+++ b/cara/apps/calculator/templates/report.html.j2
@@ -27,8 +27,13 @@
 		{% if 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 mechanical_ventilation_type == "air_supply"%}
+			Air supply flow rate: {{ air_supply }}
+			{% elif mechanical_ventilation_type == "air_changes"%}
+			Air changes per hour: {{ air_changes }}
+			{% endif %}
+			</p></li>
 		</ul>
 		{% else %}
 		No </li>
@@ -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 }}">

From 12d09b438db6c34abc8393fdd25016fc947a8a44 Mon Sep 17 00:00:00 2001
From: gaazzopa <gabriella.azzopardi@cern.ch>
Date: Fri, 6 Nov 2020 17:55:10 +0100
Subject: [PATCH 2/3] HEPA option was hard-coded for report generation

---
 cara/apps/calculator/templates/report.html.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2
index 9a68f263..56dfb723 100644
--- a/cara/apps/calculator/templates/report.html.j2
+++ b/cara/apps/calculator/templates/report.html.j2
@@ -59,7 +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 }} 
-		{{ 'is' if infected_people == 1 else 'are' }}
+		{{ "is" if infected_people == 1 else "are" }}
 		infected.</p></li>
 		<li><p class="data_text">Activity type: 
 		{% if activity_type == "office" %}

From 10b9a5e24d403bebb1f26f1c8d16aea85955c4dd Mon Sep 17 00:00:00 2001
From: Phil Elson <philip.elson@cern.ch>
Date: Fri, 6 Nov 2020 18:05:48 +0100
Subject: [PATCH 3/3] Stop passing window data through the dictionary, and
 start using the form.

---
 cara/apps/calculator/report_generator.py      |  7 -------
 cara/apps/calculator/templates/report.html.j2 | 18 +++++++++---------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py
index dd487fb3..56129a91 100644
--- a/cara/apps/calculator/report_generator.py
+++ b/cara/apps/calculator/report_generator.py
@@ -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,
diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2
index 56dfb723..9628a92d 100644
--- a/cara/apps/calculator/templates/report.html.j2
+++ b/cara/apps/calculator/templates/report.html.j2
@@ -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 %}