From 2fc7b1cfa73768b651038728503beb124241864b Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Fri, 24 Jun 2022 14:14:30 +0100
Subject: [PATCH] Handled reproduction number error, and added close X button

---
 cara/apps/templates/base/calculator.form.html.j2 | 3 +++
 cara/models.py                                   | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2
index e1b66074..dd43228d 100644
--- a/cara/apps/templates/base/calculator.form.html.j2
+++ b/cara/apps/templates/base/calculator.form.html.j2
@@ -391,6 +391,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h5 class="modal-title" id="short_range_dialogTitle">Short-range interactions</h5>
+            <button type="button" class="close close_btn_frm_field">
+              <span aria-hidden="true">&times;</span>
+            </button>
           </div>
           <div class="modal-body">
 
diff --git a/cara/models.py b/cara/models.py
index 49f94efc..b61e009f 100644
--- a/cara/models.py
+++ b/cara/models.py
@@ -1422,7 +1422,13 @@ class ExposureModel:
                 self.concentration_model.virus.transmissibility_factor)))) * 100
 
     def expected_new_cases(self) -> _VectorisedFloat:
-        prob = self.infection_probability()
+        # Create an equivalent exposure model without short-range interactions, if any.
+        if (len(self.short_range) == 0): 
+            exposure_model = nested_replace(self, {'short_range': ()})
+            prob = exposure_model.infection_probability()
+        else:
+            prob = self.infection_probability()
+            
         exposed_occupants = self.exposed.number
         return prob * exposed_occupants / 100