From 996230333c18c9d2315451a13cea632237b83342 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Wed, 2 Feb 2022 12:23:17 +0100 Subject: [PATCH 01/20] Set new logic for the cern_level color variable --- .../templates/cern/calculator.report.html.j2 | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/cara/apps/templates/cern/calculator.report.html.j2 b/cara/apps/templates/cern/calculator.report.html.j2 index cea08ada..36e65cd2 100644 --- a/cara/apps/templates/cern/calculator.report.html.j2 +++ b/cara/apps/templates/cern/calculator.report.html.j2 @@ -1,5 +1,10 @@ {% extends "base/calculator.report.html.j2" %} +{% if ((prob_inf > 10) or (expected_new_cases >= 1)) %} {% set cern_level = 'red' %} +{% elif (2 <= prob_inf <= 10) %} {% set cern_level = 'orange' %} +{% else %} {% set cern_level = 'green' %} +{% endif %} + {% block report_preamble_navtab %}
  • Applicable Rules @@ -7,9 +12,9 @@ {% endblock report_preamble_navtab %} {% block warning_animation %} - {% if ((prob_inf > 10) or (expected_new_cases >= 1)) %} {% set warning_color= 'bg-danger' %} - {% elif (2 <= prob_inf <= 10) %} {% set warning_color = 'bg-warning' %} - {% elif (prob_inf < 2) %} {% set warning_color = 'bg-success' %} + {% if cern_level == 'red' %} {% set warning_color= 'bg-danger' %} + {% elif cern_level == 'orange' %} {% set warning_color = 'bg-warning' %} + {% elif cern_level == 'green' %} {% set warning_color = 'bg-success' %} {% endif %}
    @@ -23,18 +28,18 @@ {% block report_summary %}
    - {% if ((prob_inf > 10) or (expected_new_cases >= 1)) %} + {% if cern_level == 'red' %} - {% elif 2 <= prob_inf <= 10 %} + {% elif cern_level == 'orange' %} - {% elif prob_inf < 2 %} + {% elif cern_level == 'green' %}
    -

    Acknowledgements


    - {{ text_blocks['Acknowledgements'] }} +

    Acknowledgements


    + {{ text_blocks['Acknowledgements'] }}
    From 6fa82d3f082cd5adbde0999580455b5a848d1199 Mon Sep 17 00:00:00 2001 From: Andre Henriques Date: Fri, 28 Jan 2022 11:16:41 +0100 Subject: [PATCH 06/20] update acknowledgements text --- cara/apps/templates/common_text.md.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cara/apps/templates/common_text.md.j2 b/cara/apps/templates/common_text.md.j2 index f0c793bf..5eebb32d 100644 --- a/cara/apps/templates/common_text.md.j2 +++ b/cara/apps/templates/common_text.md.j2 @@ -20,7 +20,7 @@ ## Acknowledgements -We wish to thank CERN’s HSE Unit, Beams Department, Experimental Physics Department, Information Technology Department, Industry, Procurement and Knowledge Transfer Department and International Relations Sector for their support to the study. Thanks to Doris Forkel-Wirth, Benoit Delille, Walid Fadel, Olga Beltramello, Letizia Di Giulio, Evelyne Dho, Wayne Salter, Benoit Salvant and colleagues from the COVID working group for providing expert advice and extensively testing the model. Finally, we wish to thank Fabienne Landua and the design service for preparing the illustrations and Alessandro Raimondo, Ana Padua and Manuela Cirilli from the Knowledge Transfer Group for their continuous support. Our compliments towards the work and research performed by world leading scientists in this domain: Dr. Julian Tang, Prof. Manuel Gameiro, Dr. Linsey Marr, Prof. Jose Jimenez, Prof. Lidia Morawska, Prof. Yuguo Li et al. – their scientific contribution was indispensable for this project. +We wish to thank CERN’s HSE Unit, Beams Department, Experimental Physics Department, Information Technology Department, Industry, Procurement and Knowledge Transfer Department and International Relations Sector for their support to the study. Thanks to Doris Forkel-Wirth, Benoit Delille, Walid Fadel, Olga Beltramello, Letizia Di Giulio, Evelyne Dho, Wayne Salter, Benoit Salvant and colleagues from the COVID working group for providing expert advice and extensively testing the model. Finally, we wish to thank Fabienne Landua and the design service for preparing the illustrations and Alessandro Raimondo and Manuela Cirilli from the Knowledge Transfer Group for their continuous support. Our compliments towards the work and research performed by world leading scientists in this domain: Dr. Julian Tang, Prof. Manuel Gameiro, Dr. Linsey Marr, Prof. Lidia Morawska, Prof. Yuguo Li, and others – their scientific contribution was indispensable for this project. ## References From ec6b37c845f9208849e78045a878ec942c0dd194 Mon Sep 17 00:00:00 2001 From: Andre Henriques Date: Fri, 28 Jan 2022 11:28:39 +0100 Subject: [PATCH 07/20] add collapsable section --- cara/apps/templates/common_text.md.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cara/apps/templates/common_text.md.j2 b/cara/apps/templates/common_text.md.j2 index 5eebb32d..b9734ae2 100644 --- a/cara/apps/templates/common_text.md.j2 +++ b/cara/apps/templates/common_text.md.j2 @@ -19,9 +19,13 @@ 4University of Manitoba
    ## Acknowledgements - +
    + Click to expand +
    We wish to thank CERN’s HSE Unit, Beams Department, Experimental Physics Department, Information Technology Department, Industry, Procurement and Knowledge Transfer Department and International Relations Sector for their support to the study. Thanks to Doris Forkel-Wirth, Benoit Delille, Walid Fadel, Olga Beltramello, Letizia Di Giulio, Evelyne Dho, Wayne Salter, Benoit Salvant and colleagues from the COVID working group for providing expert advice and extensively testing the model. Finally, we wish to thank Fabienne Landua and the design service for preparing the illustrations and Alessandro Raimondo and Manuela Cirilli from the Knowledge Transfer Group for their continuous support. Our compliments towards the work and research performed by world leading scientists in this domain: Dr. Julian Tang, Prof. Manuel Gameiro, Dr. Linsey Marr, Prof. Lidia Morawska, Prof. Yuguo Li, and others – their scientific contribution was indispensable for this project. +
    + ## References Reference list can be found in the CARA paper: CERN-OPEN-2021-004 From 930a34b613027ebd9896642ab7d8edaf7c072fd2 Mon Sep 17 00:00:00 2001 From: Andre Henriques Date: Tue, 8 Feb 2022 23:32:57 +0100 Subject: [PATCH 08/20] update the reference and citation --- README.md | 9 +++++++-- cara/apps/templates/base/index.html.j2 | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 832d39f2..14bead05 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,14 @@ Andre Henriques1, Luis Aleixo1, Marco Andreini1 5Information Technology Department, Collaboration, Devices & Applications Group, CERN
    6Norwegian University of Science and Technology (NTNU)
    -### Citation -A. Henriques, M. Andreini, G. Azzopardi, J. Devine, P. Elson, N. Mounet, M. Kongstein, N. Tarocco. CARA - COVID Airborne Risk Assessment tools. CERN (2021). +### Reference and Citation +test +**For the use of the CARA web app** +CARA – COVID Airborne Risk Assessment tool +© Copyright 2020-2021 CERN. All rights not expressly granted are reserved. +**For use of the model** +Henriques A, Mounet N, Aleixo L, Elson P, Devine J, Azzopardi G, Andreini M, Rognlien M, Tarocco N, Tang J. (2021). Modelling airborne transmission of SARS-CoV-2 using CARA: risk assessment for enclosed spaces. _Interface Focus 20210076_. https://doi.org/10.1098/rsfs.2021.0076 ## Applications diff --git a/cara/apps/templates/base/index.html.j2 b/cara/apps/templates/base/index.html.j2 index 2a124752..458afac5 100644 --- a/cara/apps/templates/base/index.html.j2 +++ b/cara/apps/templates/base/index.html.j2 @@ -54,10 +54,19 @@

    Reference & Citation


    - For users that would like to reference the tool or use the data for studies, assessments, etc. please use the following citation: + For use of the CARA model:

      -
    • Henriques A et al. (2022). Modelling airborne transmission of SARS-CoV-2 using CARA: risk assessment for enclosed spaces. - Interface Focus 20210076. doi.org/10.1098/rsfs.2021.0076
      • +
    • Henriques A, Mounet N, Aleixo L, Elson P, Devine J, Azzopardi G, Andreini M, Rognlien M, Tarocco N, Tang J. (2021). + Modelling airborne transmission of SARS-CoV-2 using CARA: risk assessment for enclosed spaces. + Interface Focus 12: 20210076. doi.org/10.1098/rsfs.2021.0076
      • + Download citation +
    + For use of the CARA web app:
    +
      +
    • CARA – COVID Airborne Risk Assessment tool
      • + © Copyright 2020-2021 CERN. All rights not expressly granted are reserved.
      + Licensed under the Apache License, Version 2.0
      + LICENSE

    From 0d768897d4afd92289c01d52c228a48a3f28aa51 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 11 Feb 2022 10:08:23 +0000 Subject: [PATCH 09/20] added acknowledgements class --- cara/apps/static/css/style.css | 2 +- cara/apps/templates/base/index.html.j2 | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index 022b4ca6..34dfaaf8 100644 --- a/cara/apps/static/css/style.css +++ b/cara/apps/static/css/style.css @@ -221,7 +221,7 @@ footer img { font-size: 2rem; } - .developers { + .developers .acknowledgements { text-align: left; font-size: 1.5rem; } diff --git a/cara/apps/templates/base/index.html.j2 b/cara/apps/templates/base/index.html.j2 index 458afac5..f610edda 100644 --- a/cara/apps/templates/base/index.html.j2 +++ b/cara/apps/templates/base/index.html.j2 @@ -72,8 +72,12 @@
    -

    Acknowledgements


    - {{ text_blocks['Acknowledgements'] }} +

    Acknowledgements


    +
    + Click to expand +
    + {{ text_blocks['Acknowledgements'] }} +
    From 2dc8cbbe950b1524b617985f0d0034fe1a974e01 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 11 Feb 2022 10:09:04 +0000 Subject: [PATCH 10/20] Changed location for the logic on the Acknowledgements button --- cara/apps/templates/about.html.j2 | 6 +++++- cara/apps/templates/common_text.md.j2 | 6 +----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cara/apps/templates/about.html.j2 b/cara/apps/templates/about.html.j2 index c4c414a8..3f23bf4b 100644 --- a/cara/apps/templates/about.html.j2 +++ b/cara/apps/templates/about.html.j2 @@ -49,7 +49,11 @@ Although the user is able to calculate the infection probability of a stand-alon {{ text_blocks['Code Contributors'] }}

    Acknowledgements:


    -{{ text_blocks['Acknowledgements'] }} +
    + Click to expand +
    + {{ text_blocks['Acknowledgements'] }} +

    References:


    {{ text_blocks['References'] }} diff --git a/cara/apps/templates/common_text.md.j2 b/cara/apps/templates/common_text.md.j2 index b9734ae2..5eebb32d 100644 --- a/cara/apps/templates/common_text.md.j2 +++ b/cara/apps/templates/common_text.md.j2 @@ -19,12 +19,8 @@ 4University of Manitoba
    ## Acknowledgements -
    - Click to expand -
    -We wish to thank CERN’s HSE Unit, Beams Department, Experimental Physics Department, Information Technology Department, Industry, Procurement and Knowledge Transfer Department and International Relations Sector for their support to the study. Thanks to Doris Forkel-Wirth, Benoit Delille, Walid Fadel, Olga Beltramello, Letizia Di Giulio, Evelyne Dho, Wayne Salter, Benoit Salvant and colleagues from the COVID working group for providing expert advice and extensively testing the model. Finally, we wish to thank Fabienne Landua and the design service for preparing the illustrations and Alessandro Raimondo and Manuela Cirilli from the Knowledge Transfer Group for their continuous support. Our compliments towards the work and research performed by world leading scientists in this domain: Dr. Julian Tang, Prof. Manuel Gameiro, Dr. Linsey Marr, Prof. Lidia Morawska, Prof. Yuguo Li, and others – their scientific contribution was indispensable for this project. -
    +We wish to thank CERN’s HSE Unit, Beams Department, Experimental Physics Department, Information Technology Department, Industry, Procurement and Knowledge Transfer Department and International Relations Sector for their support to the study. Thanks to Doris Forkel-Wirth, Benoit Delille, Walid Fadel, Olga Beltramello, Letizia Di Giulio, Evelyne Dho, Wayne Salter, Benoit Salvant and colleagues from the COVID working group for providing expert advice and extensively testing the model. Finally, we wish to thank Fabienne Landua and the design service for preparing the illustrations and Alessandro Raimondo and Manuela Cirilli from the Knowledge Transfer Group for their continuous support. Our compliments towards the work and research performed by world leading scientists in this domain: Dr. Julian Tang, Prof. Manuel Gameiro, Dr. Linsey Marr, Prof. Lidia Morawska, Prof. Yuguo Li, and others – their scientific contribution was indispensable for this project. ## References From 659301fa6dafa3dd3ddff8e5124693db6ab43efc Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 11 Feb 2022 10:12:43 +0000 Subject: [PATCH 11/20] Removed unused text (test) in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14bead05..747987ce 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Andre Henriques1, Luis Aleixo1, Marco Andreini1 6Norwegian University of Science and Technology (NTNU)
    ### Reference and Citation -test + **For the use of the CARA web app** CARA – COVID Airborne Risk Assessment tool © Copyright 2020-2021 CERN. All rights not expressly granted are reserved. From 07b09133f8255122838c0dbc7fa9a1bbd3df47f7 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 11 Feb 2022 11:07:21 +0000 Subject: [PATCH 12/20] Changed about page --- cara/apps/static/css/style.css | 10 +++++----- cara/apps/templates/about.html.j2 | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index 34dfaaf8..93eb34c7 100644 --- a/cara/apps/static/css/style.css +++ b/cara/apps/static/css/style.css @@ -121,6 +121,11 @@ body { font-size: 1.25rem; } +.acknowledgements { + text-align: left; + font-size: 1.5rem; +} + .center { position: relative; display: flex; @@ -220,11 +225,6 @@ footer img { text-align: left; font-size: 2rem; } - - .developers .acknowledgements { - text-align: left; - font-size: 1.5rem; - } .split > * + * { margin-left: 2em; diff --git a/cara/apps/templates/about.html.j2 b/cara/apps/templates/about.html.j2 index 3f23bf4b..508e024b 100644 --- a/cara/apps/templates/about.html.j2 +++ b/cara/apps/templates/about.html.j2 @@ -48,15 +48,15 @@ Although the user is able to calculate the infection probability of a stand-alon

    Code Contributors:


    {{ text_blocks['Code Contributors'] }}
    -

    Acknowledgements:


    +

    References:


    +{{ text_blocks['References'] }} +
    +

    Acknowledgements:


    Click to expand
    {{ text_blocks['Acknowledgements'] }}
    -
    -

    References:


    -{{ text_blocks['References'] }}

    From 1d74101a56feb722af2912af4a71690be3a461fb Mon Sep 17 00:00:00 2001 From: Andre Henriques Date: Fri, 11 Feb 2022 14:27:32 +0100 Subject: [PATCH 13/20] update about --- cara/apps/templates/about.html.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cara/apps/templates/about.html.j2 b/cara/apps/templates/about.html.j2 index 508e024b..31343545 100644 --- a/cara/apps/templates/about.html.j2 +++ b/cara/apps/templates/about.html.j2 @@ -8,7 +8,7 @@ Currently, the existing public health measures point to the importance of proper building and environmental engineering control measures, such as proper Indoor Air Quality (IAQ). This pandemic clearly raised increased awareness on airborne transmission of respiratory viruses in indoor settings. Out of the main modes of viral transmission, the airborne route of SARS-CoV-2 seems to have a significant importance to the spread of COVID-19 infections world-wide, hence proper guidance to building engineers or facility managers, on how to prevent on-site transmission, is essential.
    -For information on the Airborne Transmission of SARS-CoV-2, feel free to check out the HSE Seminar: https://cds.cern.ch/record/2743403.
    +For information on the Airborne Transmission of SARS-CoV-2, feel free to check out the special issue on the Interface Focus journal from Royal Society publishing: Interface Focus: Volume 12, Issue 2 and an CERN HSE Seminar: https://cds.cern.ch/record/2743403.


    What is CARA?


    CARA stands for COVID Airborne Risk Assessment and was developed in the spring of 2020 to better understand and quantify the risk of long-range airborne spread of SARS-CoV-2 virus in workplaces. CARA comes with different applications that allow more or less flexibility in the input parameters: @@ -17,8 +17,8 @@ CARA stands for COVID Airborne Risk Assessment and was developed in the spring o
  • CARA expert app
    • -The mathematical and physical model simulate the long-range airborne spread of SARS-CoV-2 virus in a finite volume, assuming a homogenous mixture, and estimates the risk of COVID-19 airborne transmission therein. The results DO NOT include short-range airborne exposure (where the physical distance plays a factor) nor the other known modes of SARS-CoV-2 transmission. Hence, the output from this model is only valid when the other recommended public health & safety instructions are observed, such as adequate physical distancing, good hand hygiene and other barrier measures.
    -

    The methodology, mathematical equations and parameters of the model are described here in the CARA paper: CERN-OPEN-2021-004.

    +The mathematical and physical model simulate the long-range airborne spread of SARS-CoV-2 virus in a finite volume, assuming a homogenous mixture, and estimates the risk of COVID-19 airborne transmission therein. The results DO NOT include (for now) short-range airborne exposure (where the physical distance plays a factor) nor the other known modes of SARS-CoV-2 transmission. Hence, the output from this model is only valid when the other recommended public health & safety instructions are observed, such as adequate physical distancing, good hand hygiene and other barrier measures.
    +

    The methodology, mathematical equations and parameters of the model are published here in the CARA paper: Modelling airborne transmission of SARS-CoV-2 using CARA: risk assessment for enclosed spaces..

    The model used is based on scientific publications relating to airborne transmission of infectious diseases, virology, epidemiology and aerosol science. It can be used to compare the effectiveness of different airborne-related risk mitigation measures. From 7eeac2df3c94e48bdc34bd981c481f887d6acc72 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 11 Feb 2022 13:46:33 +0000 Subject: [PATCH 14/20] typo in about --- cara/apps/templates/about.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cara/apps/templates/about.html.j2 b/cara/apps/templates/about.html.j2 index 31343545..50d2a8bf 100644 --- a/cara/apps/templates/about.html.j2 +++ b/cara/apps/templates/about.html.j2 @@ -18,7 +18,7 @@ CARA stands for COVID Airborne Risk Assessment and was developed in the spring o The mathematical and physical model simulate the long-range airborne spread of SARS-CoV-2 virus in a finite volume, assuming a homogenous mixture, and estimates the risk of COVID-19 airborne transmission therein. The results DO NOT include (for now) short-range airborne exposure (where the physical distance plays a factor) nor the other known modes of SARS-CoV-2 transmission. Hence, the output from this model is only valid when the other recommended public health & safety instructions are observed, such as adequate physical distancing, good hand hygiene and other barrier measures.
    -

    The methodology, mathematical equations and parameters of the model are published here in the CARA paper: Modelling airborne transmission of SARS-CoV-2 using CARA: risk assessment for enclosed spaces..

    +

    The methodology, mathematical equations and parameters of the model are published here in the CARA paper: Modelling airborne transmission of SARS-CoV-2 using CARA: risk assessment for enclosed spaces.

    The model used is based on scientific publications relating to airborne transmission of infectious diseases, virology, epidemiology and aerosol science. It can be used to compare the effectiveness of different airborne-related risk mitigation measures. From 616f92a4ec413e2ba4a2ded1bf042dc9397b0789 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Tue, 15 Feb 2022 13:35:01 +0000 Subject: [PATCH 15/20] Navbar options lowered and right alignment fixed --- cara/apps/templates/base/layout.html.j2 | 18 +++++++++--------- cara/apps/templates/cern/layout.html.j2 | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cara/apps/templates/base/layout.html.j2 b/cara/apps/templates/base/layout.html.j2 index cfa9bb09..406ecb23 100644 --- a/cara/apps/templates/base/layout.html.j2 +++ b/cara/apps/templates/base/layout.html.j2 @@ -34,26 +34,26 @@