From 7587a460472127d7e46bdeb6a0e58316594c38bb Mon Sep 17 00:00:00 2001 From: lrdossan Date: Tue, 19 Nov 2024 12:06:38 +0100 Subject: [PATCH] updated readme and removed jinja2 files --- README.md | 5 +- .../cern_caimira/apps/calculator/__init__.py | 9 +- .../cern_caimira/apps/templates/about.html.j2 | 77 ------ .../templates/base/calculator.form.html.j2 | 55 +--- .../apps/templates/base/index.html.j2 | 8 +- .../apps/templates/base/layout.html.j2 | 9 +- .../apps/templates/base/userguide.html.j2 | 253 ------------------ .../apps/templates/cern/userguide.html.j2 | 5 - .../apps/templates/userguide.html.j2 | 2 - cern_caimira/tests/test_webapp.py | 26 -- 10 files changed, 20 insertions(+), 429 deletions(-) delete mode 100644 cern_caimira/src/cern_caimira/apps/templates/about.html.j2 delete mode 100644 cern_caimira/src/cern_caimira/apps/templates/base/userguide.html.j2 delete mode 100644 cern_caimira/src/cern_caimira/apps/templates/cern/userguide.html.j2 delete mode 100644 cern_caimira/src/cern_caimira/apps/templates/userguide.html.j2 diff --git a/README.md b/README.md index a88cf95b..b8857f87 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,9 @@ Contributions are welcome on our [GitHub repository](https://github.com/CERN/CAi ## Authors & License -Developed by CERN's HSE, Beams, and IT departments, in collaboration with WHO. © Copyright 2020-2021 CERN. All rights not expressly granted are reserved. +Developed by CERN's HSE, Beams, and IT departments, in collaboration with WHO. + +© Copyright 2020-2021 CERN. All rights not expressly granted are reserved.
+Licensed under the Apache License, Version 2.0 See the full [license](caimira/LICENSE) for details. diff --git a/cern_caimira/src/cern_caimira/apps/calculator/__init__.py b/cern_caimira/src/cern_caimira/apps/calculator/__init__.py index 6afb4745..15d07bb3 100644 --- a/cern_caimira/src/cern_caimira/apps/calculator/__init__.py +++ b/cern_caimira/src/cern_caimira/apps/calculator/__init__.py @@ -135,6 +135,7 @@ def write_error(self, status_code: int, **kwargs) -> None: get_url = template.globals['get_url'], get_calculator_url = template.globals["get_calculator_url"], active_page='Error', + documentation_url = template.globals["documentation_url"], error_id=error_id, status_code=status_code, datetime=datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S"), @@ -278,6 +279,7 @@ def get(self): template = template_environment.get_template( "index.html.j2") report = template.render( + documentation_url = template.globals["documentation_url"], user=self.current_user, get_url = template_environment.globals['get_url'], get_calculator_url = template_environment.globals['get_calculator_url'], @@ -458,12 +460,6 @@ def make_app( (get_root_calculator_url(r'/baseline-model/result'), StaticModel), (get_root_calculator_url(r'/api/arve/v1/(.*)/(.*)'), ArveData), # Generic Pages - (get_root_url(r'/about'), GenericExtraPage, { - 'active_page': 'about', - 'filename': 'about.html.j2'}), - (get_root_calculator_url(r'/user-guide'), GenericExtraPage, { - 'active_page': 'calculator/user-guide', - 'filename': 'userguide.html.j2'}), (get_root_url(r'/expert-app'), GenericExtraPage, { 'active_page': 'expert-app', 'filename': 'expert-app.html.j2'}), @@ -510,6 +506,7 @@ def make_app( ) template_environment.globals['get_url']=get_root_url template_environment.globals['get_calculator_url']=get_root_calculator_url + template_environment.globals['documentation_url']='https://caimira.docs.cern.ch' if debug: tornado.log.enable_pretty_logging() diff --git a/cern_caimira/src/cern_caimira/apps/templates/about.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/about.html.j2 deleted file mode 100644 index c503c1bb..00000000 --- a/cern_caimira/src/cern_caimira/apps/templates/about.html.j2 +++ /dev/null @@ -1,77 +0,0 @@ -{% extends "layout.html.j2" %} - -{% block main %} - -
- -

Airborne Transmission of SARS-CoV-2


-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 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 CAiMIRA?


-CAiMIRA stands for CERN Airborne Model for Indoor Risk Assessment, previously known as CARA - COVID Airborne Risk Assessment, 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. -Since then, the model has evolved and now is capable of simulating the short-range component. CAiMIRA comes with different applications that allow more or less flexibility in the input parameters: - - -The mathematical and physical model simulate the airborne spread of SARS-CoV-2 virus in a finite volume, assuming a homogenous mixture and a two-stage exhaled jet model, and estimates the risk of COVID-19 airborne transmission therein. The results DO NOT include 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 good hand hygiene and other barrier measures.
-

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

-

The short-range component of the model was adapted from Jia et al. (2022) Exposure and respiratory infection risk via the short-range airborne route .

- -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. - -The tool helps assess the potential dose of infectious airborne viruses in indoor gatherings, with people seated, standing, moving around, while breathing, speaking or shouting/singing. The model is based on the exponential dose-response of disease transmission, which assumes a fixed value for the average infectious dose. -The methodology of the model is divided into five parts: -
    -
  1. Estimating the emission rate of virions;
  2. -
  3. Estimating the removal rate of virions;
  4. -
  5. Modeling the concentration of virions within a given volume, as a function of time;
  6. -
  7. Absorbed dose of infectious viruses, inhaled during the exposure time;
  8. -
  9. Estimating the probability of a COVID-19 infection (or secondary transmission) and the expected number of new cases arising from the event
  10. -
-
-

What is the aim of CAiMIRA?


-Although the user is able to calculate the infection probability of a stand-alone event with a pre-defined set of protection measures, the main utility of CAiMIRA is to compare the relative impact of different measures and/or combination of measure. For example: - - -
-

Collaboration with the World Health Organization (WHO)


-

The tool has attracted the attention of many international organisations, including the World Health Organization (WHO) and the United Nations Office at Geneva (UNOG). -In June 2021, CERN shared its own approach towards risk assessments for occupational hazards, which was at the time called CARA, to WHO's COVID Expert Panel.

-

As a result, WHO has invited CERN to become a member of a multidisciplinary expert group of international experts called ARIA, which will work to define a standardised algorithm to quantify airborne transmission risk in indoor settings. -This will ensure that the model inculdes not only the science related to aerosol science but also the virological effects, such as host-pathogen interaction.

- -The collaboration takes place within CERNs wide-ranging engagement with other international organisations, promoting shared solutions to societal challenges. -

- -

Main code developers:


-{{ text_blocks['Main Developers'] }} -
-

Other contributions from:


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

References:


-{{ text_blocks['References'] }} -
-

Acknowledgements:


-
- Click to expand -
- {{ text_blocks['Acknowledgements'] }} -
- -
-
-
- -{% endblock main %} diff --git a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2 index 8410844c..198a0574 100644 --- a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2 +++ b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2 @@ -774,60 +774,15 @@

- Quick Guide:
- This tool simulates the airborne spread SARS-CoV-2 virus in a finite volume and estimates the risk of COVID-19 infection. It is based on current scientific data and can be used to compare the effectiveness of different mitigation measures.
- Virus data:
- SARS-CoV-2 covers the original "wild type" strain of the virus and three variants of concern (VOC):
- - Modify the default as necessary, according to local area prevalence e.g. for Geneva - or Ain (France).
- Ventilation data:
- - Activity types:
- The type of activity applies to both the infected and exposed persons: - - Activity breaks:
- - Refer to Calculator App user guide - for more detailed explanations on how to use this tool.
+ Quick Guide: Refer to Calculator App quick user guide. +
+ Full Guide: Refer to Calculator App full user guide. +

About

-
About page for details on methodology, assumptions and limitations of CAiMIRA.
+
About page for details on methodology, assumptions and limitations of CAiMIRA.

Documentation

-
Documentation for CAiMIRA, available here.
+
Documentation for CAiMIRA, available here.

Git

@@ -91,7 +91,7 @@ DOI
© Copyright 2020-2021 CERN. All rights not expressly granted are reserved.
Licensed under the Apache License, Version 2.0
- LICENSE + LICENSE

diff --git a/cern_caimira/src/cern_caimira/apps/templates/base/layout.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/base/layout.html.j2 index 9e743f72..8415b92b 100644 --- a/cern_caimira/src/cern_caimira/apps/templates/base/layout.html.j2 +++ b/cern_caimira/src/cern_caimira/apps/templates/base/layout.html.j2 @@ -44,7 +44,7 @@ @@ -52,11 +52,11 @@
- +
{% block covid_information%} {% endblock covid_information%} - + {% if user.is_authenticated() %}