From 0fafecfcf4581657ced1ce80f96d0da1e6bd5338 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Fri, 18 Mar 2022 14:47:12 +0000
Subject: [PATCH] Changed calculator warnings

---
 cara/apps/calculator/static/js/form.js           | 7 ++++---
 cara/apps/templates/base/calculator.form.html.j2 | 5 ++---
 2 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 675cad6e..5cc27cee 100644
--- a/cara/apps/calculator/static/js/form.js
+++ b/cara/apps/calculator/static/js/form.js
@@ -408,9 +408,10 @@ function validate_form(form) {
   var short_range_interactions = [];
   $(".form_field_outer_row").each(function (index, element){
       let obj = {};
-      obj.activity = $(element).find("[name='short_range_activity']").val();
-      obj.start_time = $(element).find("[name='short_range_start_time']").val();
-      obj.duration = $(element).find("[name='short_range_duration']").val();
+      const $element = $(element);
+      obj.activity = $element.find("[name='short_range_activity']").val();
+      obj.start_time = $element.find("[name='short_range_start_time']").val();
+      obj.duration = $element.find("[name='short_range_duration']").val();
       short_range_interactions.push(JSON.stringify(obj));
   });
 
diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2
index 689c7260..0d79ab70 100644
--- a/cara/apps/templates/base/calculator.form.html.j2
+++ b/cara/apps/templates/base/calculator.form.html.j2
@@ -268,7 +268,7 @@
       <label for="mask_on">Yes</label>
     <input class="ml-2" type="radio" id="mask_off"  name="mask_wearing_option" value="mask_off" checked="checked">
       <label for="mask_off">No</label><br>
-    <p id="face_mask_warning" class="red_text">Face mask selection is disabled due to short range interaction modeling.</p>    
+    <p id="face_mask_warning" class="red_text">The analytical model with short range interactions does not take mask wearing into account.</p>    
       
     <div id="DIVmasks_used" style="display:none">
       <div class='sub_title'>Type of masks used:</div>
@@ -367,7 +367,7 @@
     <hr width="80%">
 
     <div class="split">
-      <div>Short range interactions:</div>
+      <div style="min-width: 20em">Short range interactions (no masks):</div>
       <div>
         <input class="ml-2" type="radio" id="short_range_no" name="short_range_option" value="short_range_no" checked="checked">
           <label for="short_range_no">No</label>
@@ -377,7 +377,6 @@
     </div>
 
     <div id="DIVsr_interactions" class="none">
-    <p class="red_text">Short range interactions are modeled without masks. If you are using this option, masks will not be taken into account.</p>
       <div class="d-flex">
         <button type="button" id="set_interactions_button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#short_range_dialog" data-keyboard="false" data-backdrop="static">Set interactions</button>
         <p class="align-self-center pl-4"><b id="sr_interactions">0</b> short range interactions.</p>