From 56c85966257fbd215d9dcc3f46b71e2981e2c2e3 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 9 Sep 2022 16:16:35 +0200 Subject: [PATCH 1/2] added missing image --- .../apps/static/images/caimira_logo.200x200.png | Bin 0 -> 14044 bytes .../apps/templates/base/calculator.form.html.j2 | 2 +- .../templates/base/calculator.report.html.j2 | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 cara/apps/static/images/caimira_logo.200x200.png diff --git a/cara/apps/static/images/caimira_logo.200x200.png b/cara/apps/static/images/caimira_logo.200x200.png new file mode 100644 index 0000000000000000000000000000000000000000..12d63798896d05355943dd8bc0703a2a93379cd3 GIT binary patch literal 14044 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

Calculator

- +
diff --git a/cara/apps/templates/base/calculator.report.html.j2 b/cara/apps/templates/base/calculator.report.html.j2 index ab74a04c..17d219ca 100644 --- a/cara/apps/templates/base/calculator.report.html.j2 +++ b/cara/apps/templates/base/calculator.report.html.j2 @@ -25,7 +25,7 @@ {% block report_header %}
- +

REPORT - {{ form.simulation_name }}

Created {{ creation_date }} using CAiMIRA calculator version v{{ form.calculator_version }}

From 37c40ab146c64c67dffcde812f04d4931245b802 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Mon, 12 Sep 2022 11:57:45 +0200 Subject: [PATCH 2/2] Changed "COVID calculator" to just "Calculator" --- README.md | 4 ++-- cara/apps/templates/base/calculator.form.html.j2 | 2 +- cara/apps/templates/base/layout.html.j2 | 4 ++-- cara/apps/templates/cern/index.html.j2 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a2f46245..6833ad36 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ https://doi.org/10.1016/j.buildenv.2022.109166 ## Applications -### COVID Calculator +### Calculator A risk assessment tool which simulates the airborne spread of the SARS-CoV-2 virus for space managers. @@ -94,7 +94,7 @@ CAiMIRA is also mirrored to Github if you wish to collaborate on development and pip install -e . # At the root of the repository ``` -### Running the COVID calculator app in development mode +### Running the Calculator app in development mode ``` python -m cara.apps.calculator diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2 index db9fd383..dc177114 100644 --- a/cara/apps/templates/base/calculator.form.html.j2 +++ b/cara/apps/templates/base/calculator.form.html.j2 @@ -625,7 +625,7 @@
  • If coffee breaks are included, they are spread out evenly throughout the day, in addition to any lunch break (if applicable).
  • - Refer to COVID Calculator App user guide + Refer to Calculator App user guide for more detailed explanations on how to use this tool.
    diff --git a/cara/apps/templates/base/layout.html.j2 b/cara/apps/templates/base/layout.html.j2 index 25345662..3bc7083c 100644 --- a/cara/apps/templates/base/layout.html.j2 +++ b/cara/apps/templates/base/layout.html.j2 @@ -41,14 +41,14 @@ Apps
    {% block covid_information%} diff --git a/cara/apps/templates/cern/index.html.j2 b/cara/apps/templates/cern/index.html.j2 index 692aeb67..28c4b1ef 100644 --- a/cara/apps/templates/cern/index.html.j2 +++ b/cara/apps/templates/cern/index.html.j2 @@ -5,7 +5,7 @@

    CAiMIRA has been developed by CERN with the intention of allowing members of personnel with roles related to supervision, health & safety or space management to simulate the concerned workplaces on CERN sites. - A hosted CERN version of the CAiMIRA Covid Calculator is available on this site to members of the CERN personnel. + A hosted CERN version of the CAiMIRA Calculator is available on this site to members of the CERN personnel.

    {% endblock cara_at_cern %} \ No newline at end of file