From 445f927db0c34105578bae9773868aaa66a0b34d Mon Sep 17 00:00:00 2001
From: gaazzopa <gabriella.azzopardi@cern.ch>
Date: Wed, 18 Nov 2020 20:22:26 +0100
Subject: [PATCH] Added clickable input fields for radio buttons

---
 cara/apps/calculator/static/js/form.js         |  4 ++++
 .../templates/calculator.form.html.j2          | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js
index fdf1348c..835e6fda 100644
--- a/cara/apps/calculator/static/js/form.js
+++ b/cara/apps/calculator/static/js/form.js
@@ -218,6 +218,10 @@ function show_disclaimer() {
   }
 }
 
+function check_radio(id) {
+  $(id).click();
+}
+
 /* -------Form validation------- */
 function validate_form(form) {
   var submit = true;
diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2
index 93e76727..ef73ba12 100644
--- a/cara/apps/calculator/templates/calculator.form.html.j2
+++ b/cara/apps/calculator/templates/calculator.form.html.j2
@@ -43,12 +43,12 @@
     </div><br>
     <input type="radio" id="room_type_volume" name="volume_type" value="room_volume" onclick="require_fields(this)" required>
       <label for="room_type_volume">Room volume:</label> &nbsp;&nbsp; 
-    <input type="number" step="any" id="room_volume" class="non_zero" name="room_volume" placeholder="Room volume (m³)" min="0"><br>
+    <input type="number" step="any" id="room_volume" class="non_zero" name="room_volume" placeholder="Room volume (m³)" min="0" onclick="check_radio('#room_type_volume')" ><br>
     <input type="radio" id="room_type_dimensions" name="volume_type" value="room_dimensions" onclick="require_fields(this)" required>
       <label for="room_type_dimensions">Floor area:</label> &nbsp;&nbsp; 
-    <input type="number" step="any" id="floor_area" class="non_zero" name="floor_area" placeholder="Room floor area (m²)" min="0"><br>
+    <input type="number" step="any" id="floor_area" class="non_zero" name="floor_area" placeholder="Room floor area (m²)" min="0" onclick="check_radio('#room_type_dimensions')"><br>
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <label for="room_type_dimensions">Ceiling height:</label> &nbsp;&nbsp; 
-    <input type="number" step="any" id="ceiling_height" class="non_zero" name="ceiling_height" placeholder="Room ceiling height (m²)" min="0"><br>
+    <input type="number" step="any" id="ceiling_height" class="non_zero" name="ceiling_height" placeholder="Room ceiling height (m²)" min="0" onclick="check_radio('#room_type_dimensions')"><br>
     <hr width="80%">
 
     <!-- Ventilation Options -->
@@ -65,9 +65,11 @@
 
     <div id="DIVmechanical_ventilation" style="display:none">
         <input type="radio" id="air_type_supply" name="mechanical_ventilation_type" value="air_supply" onclick="require_fields(this)">
-          <label for="air_type_supply">Air supply flow rate</label> &nbsp;&nbsp; <input type="number" step="any" id="air_supply" class="non_zero" name="air_supply" min="0" placeholder="(m³ / hour)"><br>
+          <label for="air_type_supply">Air supply flow rate</label> &nbsp;&nbsp; 
+        <input type="number" step="any" id="air_supply" class="non_zero" name="air_supply" min="0" placeholder="(m³ / hour)" onclick="check_radio('#air_type_supply')"><br>
         <input type="radio" id="air_type_changes" name="mechanical_ventilation_type" value="air_changes" onclick="require_fields(this)">
-          <label for="air_type_changes">Air changes per hour</label> &nbsp;&nbsp; <input type="number" step="any" id="air_changes" class="non_zero" name="air_changes" min="0" placeholder="(h⁻¹) only fresh air"><br>
+          <label for="air_type_changes">Air changes per hour</label> &nbsp;&nbsp; 
+        <input type="number" step="any" id="air_changes" class="non_zero" name="air_changes" min="0" placeholder="(h⁻¹) only fresh air" onclick="check_radio('#air_type_changes')"><br>
     </div>
 
     <div id="DIVnatural_ventilation" style="display:none">
@@ -86,7 +88,7 @@
       <label for="hepa_no">No</label>&nbsp;&nbsp;
     <input type="radio" id="hepa_yes" name="hepa_option" value=1 onclick="require_fields(this)">
       <label for="hepa_yes">Yes</label>&nbsp;&nbsp;
-    <input type="number" step="any" id="hepa_amount" class="non_zero" name="hepa_amount" placeholder="(m³ / hour)" min="0">
+    <input type="number" step="any" id="hepa_amount" class="non_zero" name="hepa_amount" placeholder="(m³ / hour)" min="0" onclick="check_radio('#hepa_yes')">
     <hr width="80%">
 
     <b>Face masks:</b>
@@ -141,10 +143,10 @@
     <input type="radio" id="event_type_single" name="event_type" value="single_event" onclick="require_fields(this)" required>
       <label for="event_type_single">Single event</label> &nbsp;&nbsp;
       <label for="event_type_single">Date: </label>
-    <input type="text" id="single_event_date" class="datepicker" name="single_event_date" placeholder="dd/mm/yyyy"><br>
+    <input type="text" id="single_event_date" class="datepicker" name="single_event_date" placeholder="dd/mm/yyyy" onclick="check_radio('#event_type_single')"><br>
     <input type="radio" id="event_type_recurrent" name="event_type" value="recurrent_event" onclick="require_fields(this)" required>
       <label for="event_type_recurrent">Recurrent usage</label>
-    <select id="recurrent_event_month" name="recurrent_event_month">
+    <select id="recurrent_event_month" name="recurrent_event_month" onclick="check_radio('#event_type_recurrent')">
         <option value="January">January</option>
         <option value="February">February</option>
         <option value="March">March</option>