diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js index 8c9a9256..db3874a7 100644 --- a/cara/apps/calculator/static/js/form.js +++ b/cara/apps/calculator/static/js/form.js @@ -162,8 +162,9 @@ function require_hepa(option) { function require_input_field(id, option) { $(id).prop('required', option); - if (!option) + if (!option) { removeInvalid(id); + } } function disable_input_field(id, option) { @@ -381,8 +382,8 @@ function parseValToNumber(val) { } function parseTimeToMins(cTime) { - var time = cTime.match(/(\d+)(:(\d+))/); - return parseInt(time[1]*60) + parseInt(time[3]); + var time = cTime.match(/(\d+):(\d+)/); + return parseInt(time[1]*60) + parseInt(time[2]); } /* -------On Load------- */ diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index e908fffb..477b57b5 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -28,12 +28,22 @@

Authors:


-

Andre Henriques¹, Gabriella Azzopardi², James Devine³, Philip Elson⁴, Nicolas Mounet², Markus Kongstein Rognlien²


+

Andre Henriques1, Gabriella Azzopardi2, James Devine3, Philip Elson4, Nicolas Mounet2, Markus Kongstein Rognlien2


- ¹HSE Unit, Occupational Health & Safety Group, CERN
- ²Beams Department, Accelerators and Beam Physics Group, CERN
- ³Experimental Physics Department, Safety Office, CERN
- ⁴Beams Department, Controls Group, CERN
+ 1HSE Unit, Occupational Health & Safety Group, CERN
+ 2Beams Department, Accelerators and Beam Physics Group, CERN
+ 3Experimental Physics Department, Safety Office, CERN
+ 4Beams Department, Controls Group, CERN
+ +

+ +

Acknowledgements:


+

+ We thank CERN’s HSE Unit, Beams Department and Experimental Physics Department for their continuous support. + Thanks to Doris Forkel-Wirth, Olga Beltramello, Letizia Di Giulio and Evelyne Dho for providing expert advice and extensively testing the tool. + We thank Fabienne Landua and the Design and Visual Identity Service for preparing the logo. + Thanks also to colleagues like Oriol Rios, Lina Dimovasili for the technical discussions and advice. + Many thanks to the work and research performed by world leading scientists in this domain: Prof. Manuel Gameiro, Prof. Shelly Miller, Prof. Linsey Marr, Prof. Jose Jimenez, Dr. Lidia Morawska, Prof Yuguo Li – their contribution was indispensable for this project.

diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index 869acc83..fddec817 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -92,13 +92,11 @@
- -
-