From 9fdfee1cb71a928dfd17961a809ea252c38c25f3 Mon Sep 17 00:00:00 2001
From: gaazzopa <gabriella.azzopardi@cern.ch>
Date: Sat, 7 Nov 2020 11:52:01 +0100
Subject: [PATCH] Updated date format to european

---
 cara/apps/calculator/static/form.html  |  2 +-
 cara/apps/calculator/static/js/form.js | 50 +++++++++++++-------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/cara/apps/calculator/static/form.html b/cara/apps/calculator/static/form.html
index 98a3b23f..8a7c765c 100644
--- a/cara/apps/calculator/static/form.html
+++ b/cara/apps/calculator/static/form.html
@@ -92,7 +92,7 @@ Beta v1.0.0 <span style="float:right; font-weight:bold">Please send feedback to
     <input type="radio" id="event_type_single" name="event_type" value="single_event" onclick="require_fields(this)" required></input>
     <label for="event_type_single">Single event</label> &nbsp;&nbsp;
     <label for="single_event_date">Date: </label>
-    <input type="text" id="single_event_date" class="datepicker" name="single_event_date"><br>
+    <input type="text" id="single_event_date" class="datepicker" name="single_event_date" placeholder="dd/mm/yyyy"><br>
     <input type="radio" id="event_type_recurrent" name="event_type" value="recurrent_event" onclick="require_fields(this)" required></input>
     <label for="event_type_recurrent">Recurrent usage</label>
     <select id="recurrent_event_month" name="recurrent_event_month">
diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js
index f4e39559..fefa03b4 100644
--- a/cara/apps/calculator/static/js/form.js
+++ b/cara/apps/calculator/static/js/form.js
@@ -102,8 +102,6 @@ function require_natural_ventilation(option) {
   $("#opening_distance").prop('required', option);
   $("#always").prop('required', option);
   $("#interval").prop('required', option);
-  $("#event_type_single").prop('required', option);
-  $("#event_type_recurrent").prop('required', option);
 }
 
 function require_air_changes(option) {
@@ -134,7 +132,7 @@ function setMaxInfectedPeople() {
 /* -------UI------- */
 $(function () {
   $(".datepicker").datepicker({
-    dateFormat: 'mm/dd/yy'
+    dateFormat: 'dd/mm/yy'
   });
 });
 
@@ -179,34 +177,14 @@ function validate_form(form) {
 function isValidDate(date) {
   var matches = /^(\d+)[-\/](\d+)[-\/](\d+)$/.exec(date);
   if (matches == null) return false;
-  var d = matches[2];
-  var m = matches[1];
+  var d = matches[1];
+  var m = matches[2];
   var y = matches[3];
   if (y > 2100 || y < 1900) return false;
   var composedDate = new Date(y + '/' + m + '/' + d);
   return composedDate.getDate() == d && composedDate.getMonth() + 1 == m && composedDate.getFullYear() == y;
 }
 
-/* -------Debugging------- */
-function debug_submit(form) {
-
-  //Prevent default posting of form - put here to work in case of errors
-  event.preventDefault();
-
-  //Serialize the data in the form
-  var serializedData = objectifyForm($(form).serializeArray());
-
-  console.log(serializedData);
-  return false; //don't submit
-}
-
-function objectifyForm(formArray) {
-  var returnArray = {};
-  for (var i = 0; i < formArray.length; i++)
-    returnArray[formArray[i]['name']] = formArray[i]['value'];
-  return returnArray;
-}
-
 /* ------ On Load ---------- */
 
 $(document).ready(function () {
@@ -235,4 +213,24 @@ $(document).ready(function () {
     require_fields(radioValue.get(0));
   }
 
-});
\ No newline at end of file
+});
+
+/* -------Debugging------- */
+function debug_submit(form) {
+
+  //Prevent default posting of form - put here to work in case of errors
+  event.preventDefault();
+
+  //Serialize the data in the form
+  var serializedData = objectifyForm($(form).serializeArray());
+
+  console.log(serializedData);
+  return false; //don't submit
+}
+
+function objectifyForm(formArray) {
+  var returnArray = {};
+  for (var i = 0; i < formArray.length; i++)
+    returnArray[formArray[i]['name']] = formArray[i]['value'];
+  return returnArray;
+}
\ No newline at end of file