From e7d9ba96c80914e2e5978293afa0ce16a21930cc Mon Sep 17 00:00:00 2001
From: gaazzopa <gabriella.azzopardi@cern.ch>
Date: Mon, 9 Nov 2020 20:02:04 +0100
Subject: [PATCH] Office option interchangeable with meeting

---
 cara/apps/calculator/templates/calculator.form.html.j2 | 4 ++--
 cara/apps/calculator/templates/report.html.j2          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2
index 2438b5af..d255f814 100644
--- a/cara/apps/calculator/templates/calculator.form.html.j2
+++ b/cara/apps/calculator/templates/calculator.form.html.j2
@@ -80,7 +80,7 @@ Beta v1.0.0 <span style="float:right; font-weight:bold">Please send feedback to
     Number of infected people: <input type="number" id="infected_people" name="infected_people" min=1 required><br>
     <hr width="80%">
     Activity type: <select id="activity_type" name="activity_type">
-                    <option value="office">Office</option>
+                    <option value="office">Office/Meeting</option>
                     <option value="workshop">Workshop</option>
                     <option value="training">Training</option>
                    </select><br>
@@ -166,7 +166,7 @@ Beta v1.0.0 <span style="float:right; font-weight:bold">Please send feedback to
   Enter the data on the available means for venting of indoor spaces. For mechanical ventilation, you should check with a specialist for the air flow or air change rate.<br>
   <b>Event data</b><br>
   Enter the total number of occupants in the room and how many of them you assume are infected. We have provided common activity types:<br>
-  Office = typical scenario all persons seated, talking.<br>
+  Office/Meeting = typical scenario all persons seated, talking.<br>
   Workshop = assembly workshop environment, all persons doing light exercise, talking.<br>
   Training = one person (the trainer) standing, talking, all others seated, talking quietly (whispering). It is assumed the trainer is the infected person, for the worst case scenario.<br>
 You should specify if the event is a one off (give date) or recurrent use of the same space for the same activity, in which case select the month when the activity takes place.<br>
diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2
index 4cd09f7e..aab7f3dc 100644
--- a/cara/apps/calculator/templates/report.html.j2
+++ b/cara/apps/calculator/templates/report.html.j2
@@ -65,7 +65,7 @@
 		infected.</p></li>
 		<li><p class="data_text">Activity type: 
 		{% if form.activity_type == "office" %}
-		Office work – typical scenario with all persons seated, talking.
+		Office/Meeting – typical scenario with all persons seated, talking.
 		{% elif form.activity_type == "workshop" %}
 		Workshop = assembly workshop environment, all persons doing light exercise, talking.
 		{% elif form.activity_type == "training" %}