From 931a3320b954b2d19a559066fbd662ee262e677e Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Mon, 10 Jan 2022 16:00:00 +0100
Subject: [PATCH] Changed not recurrent event to specific event

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

diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js
index cd8be072..a68e3453 100644
--- a/cara/apps/calculator/static/js/form.js
+++ b/cara/apps/calculator/static/js/form.js
@@ -61,7 +61,7 @@ function require_fields(obj) {
     case "hepa_no":
       require_hepa(false);
       break;
-    case "p_not_recurrent_event":
+    case "p_specific_event":
       require_population(true);
       break;
     case "p_recurrent_event":
diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2
index 812c8562..023ecb33 100644
--- a/cara/apps/templates/base/calculator.form.html.j2
+++ b/cara/apps/templates/base/calculator.form.html.j2
@@ -311,13 +311,13 @@
 
     <input type="radio" id="p_recurrent_event" name="p_recurrent_option" value="p_recurrent_event" checked="checked">
       <label for="p_recurrent_event">Recurrent exposure</label>
-    <input class="ml-2" type="radio" id="p_not_recurrent_event"  name="p_recurrent_option" value="p_not_recurrent_event" data-enables="#DIVp_not_recurrent_event">
-      <label for="p_not_recurrent_event">Specific event</label>
+    <input class="ml-2" type="radio" id="p_specific_event"  name="p_recurrent_option" value="p_specific_event" data-enables="#DIVp_specific_event">
+      <label for="p_specific_event">Specific event</label>
     <div data-tooltip="Specific event occurring at a given time (e.g. meeting or conference). Indicate the 7-day average of new reported cases and the population of a given location.">
         <span class="tooltip_text">?</span>
     </div>
     
-    <div id="DIVp_not_recurrent_event" style="display: none">
+    <div id="DIVp_specific_event" style="display: none">
       <div class="form-group row">
         <div class="col-sm-4"><label class="col-form-label">Population:</label></div>
         <div class="col-sm-6 align-self-center"><input type="number" step="any" id="geographic_population" class="non_zero form-control" name="geographic_population" placeholder="Inhabitants (#)" min="0"></div>
diff --git a/cara/apps/templates/base/calculator.report.html.j2 b/cara/apps/templates/base/calculator.report.html.j2
index 2740bc7b..3dc13c61 100644
--- a/cara/apps/templates/base/calculator.report.html.j2
+++ b/cara/apps/templates/base/calculator.report.html.j2
@@ -82,7 +82,7 @@
 													Taking into account the uncertainties tied to the model variables, in this scenario, the <b>probability of one exposed occupant getting infected is {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
 												</div>
 												{% block specific_event_probability %}
-													{% if form.p_recurrent_option == "p_not_recurrent_event" %}
+													{% if form.p_recurrent_option == "p_specific_event" %}
 														<br>
 														<div class="align-self-center alert alert-dark mb-0" role="alert">
 														The above result assumes that <b>{{ form.infected_people }} 
@@ -303,7 +303,7 @@
 							<li><p class="data_text">Number of attendees and infected people: {{ form.total_people }} in attendance, of whom {{ form.infected_people }}
 							{{ "is" if form.infected_people == 1 else "are" }}
 							infected.</p></li>
-							{% if form.p_recurrent_option == "p_not_recurrent_event" %}
+							{% if form.p_recurrent_option == "p_specific_event" %}
 							<li><p class="data_text">Geographic population: {{ form.geographic_population }}</p></li>
 							<li><p class="data_text">Geographic cumulative reported cases: {{ form.geographic_cases }}</p></li>
 							{% endif %}