From 824ad5886bd37d20ea24298e5af9355b66bcf8fc Mon Sep 17 00:00:00 2001
From: gaazzopa <gabriella.azzopardi@cern.ch>
Date: Tue, 10 Nov 2020 17:08:07 +0100
Subject: [PATCH] Added HEPA amount to model and report

---
 cara/apps/calculator/model_generator.py       |  5 ++++-
 cara/apps/calculator/templates/report.html.j2 | 11 ++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py
index 3dc25625..032748ad 100644
--- a/cara/apps/calculator/model_generator.py
+++ b/cara/apps/calculator/model_generator.py
@@ -24,6 +24,7 @@ class FormData:
     coffee_duration: int
     event_type: str
     floor_area: float
+    hepa_amount: float
     hepa_option: bool
     infected_people: int
     lunch_option: bool
@@ -91,6 +92,7 @@ class FormData:
             coffee_duration=int(form_data['coffee_duration']),
             event_type=form_data['event_type'],
             floor_area=float(form_data['floor_area']),
+            hepa_amount=float(form_data['hepa_amount']),
             hepa_option=(form_data['hepa_option'] == '1'),
             infected_people=int(form_data['infected_people']),
             lunch_finish=time_string_to_minutes(form_data['lunch_finish']),
@@ -154,7 +156,7 @@ class FormData:
                     active=always_on, q_air_mech=self.air_supply)
 
         if self.hepa_option:
-            hepa = models.HEPAFilter(active=always_on, q_air_mech=250.)
+            hepa = models.HEPAFilter(active=always_on, q_air_mech=self.hepa_amount)
             return models.MultipleVentilation((ventilation,hepa))
         else:
             return ventilation
@@ -282,6 +284,7 @@ def baseline_raw_form_data():
         'coffee_duration': '10',
         'event_type': 'recurrent_event',
         'floor_area': '',
+        'hepa_amount': '250',
         'hepa_option': '0',
         'infected_finish': '18:00',
         'infected_people': '1',
diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2
index f5f714cc..88a91c52 100644
--- a/cara/apps/calculator/templates/report.html.j2
+++ b/cara/apps/calculator/templates/report.html.j2
@@ -55,7 +55,11 @@
 		No </p></li>
 		{% endif %}
 		<li><p class="data_text">HEPA Filtration: {{ 'Yes' if form.hepa_option else 'No' }}</li>
-		<!--TODO: X type of filter with y flow rate (default model assumption) ? This was in the output doc..? -->
+		{% if form.hepa_option %}
+		<ul>
+			<li><p class="data_text">HEPA amount: {{ form.hepa_amount }}</p></li>
+		</ul>
+		{% endif %}
 	</ul>
 
 	<p class="data_title">Event data:</p>
@@ -112,12 +116,9 @@
 
 	<p class="data_title">Mask wearing:</p>
 	<ul>
-		<li><p class="data_text">Masks worn at workstations?
+		<li><p class="data_text">Masks worn at workstations? {{ 'Yes' if form.mask_wearing == "continuous" else 'No' }} </p></li>
 		{% if form.mask_wearing == "continuous" %}
-		Yes </p></li>
 		<li><p class="data_text">Mask type: {{ form.mask_type }}</p></li>
-		{% else %}
-		No </p></li>
 		{% endif %}
 	</ul>