From 5e5bc7ce5c7e888fc6458f581b716336c8341825 Mon Sep 17 00:00:00 2001
From: gaazzopa <gabriella.azzopardi@cern.ch>
Date: Wed, 4 Nov 2020 11:11:52 +0100
Subject: [PATCH] Connected result object to POST request and removed .DS_Store
 files

---
 .gitignore                             |   2 +-
 cara/.DS_Store                         | Bin 6148 -> 0 bytes
 cara/apps/.DS_Store                    | Bin 6148 -> 0 bytes
 cara/apps/calculator/.DS_Store         | Bin 6148 -> 0 bytes
 cara/apps/calculator/static/.DS_Store  | Bin 6148 -> 0 bytes
 cara/apps/calculator/static/form.html  |  37 +++++++++++++++++--------
 cara/apps/calculator/static/js/form.js |  34 ++---------------------
 7 files changed, 29 insertions(+), 44 deletions(-)
 delete mode 100644 cara/.DS_Store
 delete mode 100644 cara/apps/.DS_Store
 delete mode 100644 cara/apps/calculator/.DS_Store
 delete mode 100644 cara/apps/calculator/static/.DS_Store

diff --git a/.gitignore b/.gitignore
index b7b823bb..41198cdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 __pycache__
 .ipynb_checkpoints
 *.egg-info
-
+*.DS_Store
 
 # Editor stuff
 *.swp
diff --git a/cara/.DS_Store b/cara/.DS_Store
deleted file mode 100644
index 9848ce380fa579b6377d49df4893e08ed6638a0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHL&5qMB5VqSc>##!ffV6w`g%cHOVbz|{W=lD60x1X%fVK&#wvm!JYEr7*(p4_|
z5by@P1~;An9)gEp#x^0L3rB>|Of~-O`LQQoqBt&NjE|S$fUz!POn@S`9B8f(^rLP`
z%UZ4ja-1Vr<yjD`0LGuUqRH?tGJyB4!+e&(FR$OfAd92C==Z<yR=cxvZC41fCvJ$>
z-dwG`!Y`Kj*k8QF(Nn*e2e$uAskrL<!SiUgI_chesM5lZ(%C{MN8t=YUcHFYP_4#l
znTENZ$1@JcafEZyJy@@Y_eMQA92{<Xay=ULd-Cx9aI<m5{_Vko$J6BOeEn{7@!qh?
z;Q`cg)8Y^K0G;Xr<I{onMkSeX9$nUbiJDC8!z;eE_rE^*`02Rm5C7=T=JmPt64knI
zy+s<U^c3d9I(JyXW-Ny`Z&q|?-1OFKO72!Q)$$Ydv#P5jnsrTK0TN<>7$64hD^u(d
z6~q8BKn(oC0KOk2D57hzG^k%4(C8xoU<b@vppRz>%#jvdi={#EfN+xvXi~X7VsMiV
zc4^~Wi={!6&bVF~=CLbtdqUxQb+Ahv&bVukT4I10Xfn_?!!GXskA8ptZzj=*7$64z
zD+YLH;!W_M2fMd!T^#PU5_AfRf^nt6Dg`=vD~4FyiVr}wfL&q-(6v|^1Pcg#2xuCp
KAqM^`1K$A@mWkT{

diff --git a/cara/apps/.DS_Store b/cara/apps/.DS_Store
deleted file mode 100644
index 6c073fa6543112c8c474253d41463390b7efca81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!A|2a5VcDI2ZYE0u^fHj)<e6C+7nVJ<-lo?g5UrM5>nAfX<W4_6_ld<2Kxv5
z8++R?V5Q|#I51-y1Zpe6Wwk;x()f+XGj{x3*&W6hulJ)0V=iM%fFc$gXeJ1bqmD_z
zdgcJRo}<qa7O;#d)*Xu`$N$Ixp4|dFhf_<SeRY1}pw|f#6~g%Mu#?2StX#h5g_+{)
z+`JHCQ7nlQzoiC#7G(WiJ?I``Z!gGNp|$swN?z<BJcyfvQ+H)srCAWC&8|+4qb7tL
zAI52<26fd>qn@6}Hv^922<OyY8xE^qYb9B&Y>Y~BSgVywa^qWdG;+k3^~&b%S^MgG
zcr&`aGYoV1F=|=1_zXY5n7G;GqT-*ccE<#|f2YN@Rij}^5f6{6f4=|xwKY99dUtH6
z^?Lm>e#XS_y!5+iqS6Z(f8Ha;k`M#L05R}E2J96g7C)Fr;luzj@c9|Q`$2*tdKPno
z`s#p2mjHl8aBBe@YYEJe7Cno(K^OtyCKb@6a$90>lMa4q<2;MGL6gq7Ek3wincE75
z>(ya?slyrf3{p!B5Cd-+m@!=!-~XNI_5a%>>JbCPz^7t>7aM+~4qLKs>)7V-t(Bl>
rpePuZ8+=ItLqEk3i%;<ys21=`Gypw|xk2!N&>sO!12x3JKV{$v>Fayv

diff --git a/cara/apps/calculator/.DS_Store b/cara/apps/calculator/.DS_Store
deleted file mode 100644
index cba7f52a6cd5f21fca2a802aa27f612f9ccd4ebf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}(1u5Z+Bfx)ws@fFQ@c^p-<HQF1~u!5lah$*4U*1$G<}OO7{+omwTN@@vpH
z=xg-GjT<~gAED~(Pf$%joPyeFMw<O*XJ>Z3-`cxgLI~|nf)*h)LI?wuShApaLS(zt
z1t}R%6_BbvLelfIWaLM}Ux-G>-^hSmyDCXYN<7fw`rY`WC`{63^NyCvm6hrn#@H%b
zW1rlC$lTORCrQ^EpUB#gmkxYm9}5vZ*q;9(>}O}SjeQZPUKsbsDme`L5OVr4j02H%
z#Uu_A)sL$iEX!inS*<>uwzoSC-fr#88hqO6G#h;9U3)gO*w)+D?&10H%jNWH_Vrpb
zOW`F{vTkq=-@qtLGP-EFJuw{V0QU27`%pNJd5PKWug&}S-+$~a#sn|Mj0S&>BR{g@
zb9{EkaU|jk@Xw!J#-Jbr$N)01WCqNZ!&a9(4t9?WAOrs%19E@hpb~9^xkj~hK%uSx
zfE92n0bBj%0CMR7v<>DO!2?2dDxglK=88deI{3MXvkm4NbvmJHWa!6?OwA32s?ovE
zRXCxxMl6v5WT41ESyyZF{6Bd9{$EVO8Zv+k{8tRnisL$6n36eL7bYjqS`K;+Dn-WS
n8Xr=?P)9Mu%A>drss#L88i2OJTqAfu@JB$=fCVz}sto)FiraH)

diff --git a/cara/apps/calculator/static/.DS_Store b/cara/apps/calculator/static/.DS_Store
deleted file mode 100644
index 492d88d0f734534a6d11a83967cf601f9d08552e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKPjAyO6t}xF992^*m_(1haO<HdL)s2VSyv7mCLsmE0nnO|s?C(fRg)4yD9YD>
zZ?OA5!ERi*@^yI6cE_f&>sC$gN%rsg{c-GHQoD~a#`}xNWvs;*6VMQA4s`z!^kZ9-
znzd{La-1VfR0#U7aF)bt(PY>}2Jqe0*eT1xBAZ=(e_7t`{^7N)`h)F<LWqXg5g+}D
zD*Qai7g;};zsJ$*AfJR*f1^}#sR!ZPcvPIUc8^q=2XQ)@>*P2ZLCA-9aT=+juNG;P
z>3MwPa2!WCC#`l_?zzu8a<A82c4WDK;CAHm-obL|h$m0o7q5oXFJH@V%kMu7qZ~dy
zElrCn_z8;MTrzh3Pii_djz<`;?Nc=v*iDP(<MZFgXBUV6e9?`*+2rbc5~tPkefH;R
zqS7&pS8GBa2{Awn5Ca>=fIXr_W5d=(%OM7cfxBk_&j$$&(X&_?)JF$&x&#2MgINpc
zSW94zwCGu^41x!Qn^ZuP%590kO*+`6jq@y422DESw)o)o$=p^bTt6M=mpYtr&mi^0
z05Nc#fh{v^;r;&-e#<x1|JRdfL<|rE_lf~tANYelY{}lOYn#KnRze#>L&3Pp;AILZ
i`YMK4yo%e<w18cr0_a(+41xuO{s?Fqs3Qh$m4Ux1nPw~i

diff --git a/cara/apps/calculator/static/form.html b/cara/apps/calculator/static/form.html
index dee79d54..5ceb664f 100644
--- a/cara/apps/calculator/static/form.html
+++ b/cara/apps/calculator/static/form.html
@@ -16,7 +16,7 @@
 
 <h1> <p><b>CARA</b> Covid Calculator </p></h1>
 
-<form name="CARAinputs" onsubmit='return on_submit(this)'>
+<form id="covid_calculator" name="covid_calculator" onsubmit='return on_submit(this)'>
 <div style="width: 33%; float:left;">
 
     <!-- General Options -->
@@ -180,29 +180,27 @@
 
 <script>
 
-// Contents from https://stackoverflow.com/a/5004276/741316
+
+/* -------Submit form------- */
 
 // Variable to hold request
 var request;
 
-// Bind to the submit event of our form
-$("#covid-calculator").submit(function(event){
+// Bind to the submit event of our form - from https://stackoverflow.com/a/5004276/741316
+function on_submit(form){
 
     // Prevent default posting of form - put here to work in case of errors
     event.preventDefault();
 
     // Abort any pending request
-    if (request) {
+    if (request)
         request.abort();
-    }
-    // setup some local variables
-    var $form = $(this);
 
     // Let's select and cache all the fields
-    var $inputs = $form.find("input, select, button, textarea");
+    var $inputs = $(form).find("input, select, button, textarea");
 
     // Serialize the data in the form
-    var serializedData = objectifyForm($form.serializeArray());
+    var serializedData = objectifyForm($(form).serializeArray());
 
     console.log(['Sending over', JSON.stringify(serializedData)])
 
@@ -227,7 +225,24 @@ $("#covid-calculator").submit(function(event){
             textStatus, errorThrown
         );
     });
-});
+}
+
+// Convert all type int in form
+function objectifyForm(formArray) {
+  returnArray = {};
+  for (var i = 0; i < formArray.length; i++) {
+
+    var value = Number(formArray[i]['value']);
+
+    if (formArray[i]['name'] === "simulation_name")
+      returnArray[formArray[i]['name']] = formArray[i]['value'].toString();
+    else if(isNaN(value) || !formArray[i]['value'].trim())
+      returnArray[formArray[i]['name']] = formArray[i]['value'];
+    else
+      returnArray[formArray[i]['name']] = value;
+  }
+  return returnArray;
+}
 
 
 function build_report(report_data) {
diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js
index 9f120408..ca15b3d0 100644
--- a/cara/apps/calculator/static/js/form.js
+++ b/cara/apps/calculator/static/js/form.js
@@ -1,5 +1,5 @@
 function clear_form(){
-    document.CARAinputs.reset();
+    document.covid_calculator.reset();
 }
 
 /* -------Show/Hide DIVs------- */
@@ -139,34 +139,4 @@ function require_coffee(option) {
 /* -------UI------- */
 $(function() {
   $("#datepicker").datepicker();
-});  
-
-/* -------Submit form------- */
-function on_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
-}
-
-//Convert all type int in form
-function objectifyForm(formArray) {
-  returnArray = {};
-  for (var i = 0; i < formArray.length; i++) {
-
-    var value = Number(formArray[i]['value']);
-
-    if (formArray[i]['name'] === "simulation_name")
-      returnArray[formArray[i]['name']] = formArray[i]['value'].toString();
-    else if(isNaN(value) || !formArray[i]['value'].trim())
-      returnArray[formArray[i]['name']] = formArray[i]['value'];
-    else
-      returnArray[formArray[i]['name']] = value;
-  }
-  return returnArray;
-}
\ No newline at end of file
+});  
\ No newline at end of file