From 02e5d1fae4e280299d67897236d03f30088af53e Mon Sep 17 00:00:00 2001 From: gaazzopa Date: Fri, 20 Nov 2020 11:05:04 +0100 Subject: [PATCH 1/8] Small fixes from merge 95 --- cara/apps/calculator/static/js/form.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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------- */ From cc4d51540cd01198786fe09462f1a22ec5e7167e Mon Sep 17 00:00:00 2001 From: gaazzopa Date: Fri, 20 Nov 2020 11:05:50 +0100 Subject: [PATCH 2/8] Fixed link issue --- cara/apps/templates/layout.html.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index 869acc83..b71eb683 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -92,13 +92,11 @@
- -
-
+
home From 7ed106570f380e47b8960ea93fc08fef6d850f13 Mon Sep 17 00:00:00 2001 From: gaazzopa Date: Fri, 20 Nov 2020 16:18:09 +0100 Subject: [PATCH 3/8] Added link to expert app --- cara/apps/templates/layout.html.j2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index b71eb683..3e34970f 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -150,6 +150,11 @@ +
  • + + Expert App (BETA) + +
  • Covid Information From ffc6f7ecbce3e79111af39d5cef2e30a68707e0b Mon Sep 17 00:00:00 2001 From: gaazzopa Date: Fri, 20 Nov 2020 17:16:37 +0100 Subject: [PATCH 4/8] Added acknowledgements --- cara/apps/templates/index.html.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index e908fffb..cabf1335 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -36,6 +36,12 @@ ⁴Beams 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. + +

    • From c45b54c245bbe02f2d6031db74833c3faa5771d5 Mon Sep 17 00:00:00 2001 From: gaazzopa Date: Fri, 20 Nov 2020 17:33:06 +0100 Subject: [PATCH 5/8] Updated code to allow for multiple affiliations --- cara/apps/templates/index.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index cabf1335..b74e18ce 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -28,7 +28,7 @@

    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
    From 0632227a79afedc16b109d2b9d897df2e72e7aa8 Mon Sep 17 00:00:00 2001 From: gaazzopa Date: Fri, 20 Nov 2020 17:35:17 +0100 Subject: [PATCH 6/8] Updated code to allow for multiple affiliations --- cara/apps/templates/index.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index b74e18ce..e6336f03 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -28,7 +28,7 @@

    Authors:


    -

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


    +

    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
    From 7634d7408f81ad433765e7c4019884fbcbc51355 Mon Sep 17 00:00:00 2001 From: gaazzopa Date: Fri, 20 Nov 2020 17:36:11 +0100 Subject: [PATCH 7/8] Updated code to allow for multiple affiliations --- cara/apps/templates/index.html.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index e6336f03..110ff00f 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -30,10 +30,10 @@

    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

    From a841bf3923d48e06878de67cc9b43894baa751ef Mon Sep 17 00:00:00 2001 From: gaazzopa Date: Fri, 20 Nov 2020 19:10:19 +0100 Subject: [PATCH 8/8] Updated expert link --- cara/apps/templates/index.html.j2 | 6 +++++- cara/apps/templates/layout.html.j2 | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index 110ff00f..477b57b5 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -39,7 +39,11 @@

    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. + 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 3e34970f..fddec817 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -151,7 +151,7 @@
  • - + Expert App (BETA)