Commit graph

1411 commits

Author SHA1 Message Date
Andre Henriques
d672fd823f Merge branch 'feature/disclaimer_block' into 'master'
Disclaimer block

Closes #252

See merge request cara/cara!343
2022-03-25 16:05:03 +01:00
Luis Aleixo
dc1020c159 Added disclaimer from common_text in report page 2022-03-25 15:04:29 +01:00
Luis Aleixo
9ef38329d1 Added Disclaimer to common text 2022-03-25 15:04:29 +01:00
Andre Henriques
5b58e13391 Merge branch 'feature/applicable_rules_image' into 'master'
Warning scale image - CERN template

See merge request cara/cara!342
2022-03-25 13:40:32 +01:00
Luis Aleixo
c8431e56b2 warning scale at cern image rename 2022-03-25 11:10:57 +01:00
Andre Henriques
b8041505ab Merge branch 'feature/add_publication_report' into 'master'
Update report with new publication reference

See merge request cara/cara!340
2022-03-24 09:52:23 +01:00
Andre Henriques
d06c9b3a4d update report with new publication 2022-03-23 17:28:02 +01:00
Andre Henriques
5f8360655e Merge branch 'feature/scale_status' into 'master'
CERN Covid scale update - green level 1

See merge request cara/cara!338
2022-03-14 17:40:36 +01:00
Luis Aleixo
81b1dc1c99 Changed warning scale level to green 2022-03-14 16:28:46 +00:00
Gabriella Azzopardi
a65c80c845 Merge branch 'feature/warning_scale' into 'master'
Feature/warning scale

See merge request cara/cara!337
2022-03-09 17:45:47 +01:00
Gabriella Azzopardi
5beda5f34f Feature/warning scale 2022-03-09 17:45:47 +01:00
Gabriella Azzopardi
b4c5f8b372 Merge branch 'feature/new_gathering_activity' into 'master'
Add new 'Large meeting' activity

See merge request cara/cara!336
2022-03-09 13:51:10 +01:00
Andre Henriques
0e0a5488f5 Add new 'Large meeting' activity 2022-03-09 13:51:10 +01:00
James Devine
9bc450aad8 Merge branch 'github_test' into 'master'
Github test - merge to gitlab

See merge request cara/cara!334
2022-03-01 09:43:43 +01:00
James Devine
e130d4ded9 Github test - merge to gitlab 2022-03-01 09:43:43 +01:00
Andre Henriques
11a27397ad Merge branch 'feature/correct_year_publication' into 'master'
Update year of publication

See merge request cara/cara!333
2022-02-25 14:56:48 +01:00
Andre Henriques
3b3d1888ee Update year of publication 2022-02-18 15:31:35 +01:00
Andre Henriques
eb68ce000b Update year of publication 2022-02-18 15:29:29 +01:00
Andre Henriques
e1388435ac Merge branch 'feature/userguide_option' into 'master'
Navigation bar options

Closes #206

See merge request cara/cara!329
2022-02-16 08:50:58 +01:00
Luis Aleixo
7f86044d93 COVID information option in navigation bar with upper case 2022-02-15 16:10:29 +00:00
James Devine
4f118bc57e Merge branch 'add_github_ref' into 'master'
Added github message

See merge request cara/cara!332
2022-02-15 16:28:47 +01:00
James Devine
385be44ea2 Added github message 2022-02-15 16:20:45 +01:00
Luis Aleixo
616f92a4ec Navbar options lowered and right alignment fixed 2022-02-15 13:35:01 +00:00
Luis Aleixo
70f932749a Merge branch 'feature/citation' into 'master'
Update of text in the webapp/repo: references, citation and acknowledgments

See merge request cara/cara!331
2022-02-11 14:56:04 +01:00
Luis Aleixo
7eeac2df3c typo in about 2022-02-11 13:46:33 +00:00
Andre Henriques
1d74101a56 update about 2022-02-11 14:27:32 +01:00
Luis Aleixo
07b09133f8 Changed about page 2022-02-11 11:07:21 +00:00
Luis Aleixo
659301fa6d Removed unused text (test) in readme 2022-02-11 10:12:43 +00:00
Luis Aleixo
2dc8cbbe95 Changed location for the logic on the Acknowledgements button 2022-02-11 10:09:54 +00:00
Luis Aleixo
0d768897d4 added acknowledgements class 2022-02-11 10:09:54 +00:00
Andre Henriques
930a34b613 update the reference and citation 2022-02-11 10:09:54 +00:00
Andre Henriques
ec6b37c845 add collapsable section 2022-02-11 10:09:53 +00:00
Andre Henriques
6fa82d3f08 update acknowledgements text 2022-02-11 10:09:53 +00:00
andrejh
c2597dcd7c paragraph in italic 2022-02-11 10:09:53 +00:00
andrejh
11887c4025 add citation chapter 2022-02-11 10:09:53 +00:00
Philip Elson
d0ce546374 Merge branch 'feature/cern_thresholds' into 'master'
Set new logic for the cern_level color variable

See merge request cara/cara!326
2022-02-08 13:41:18 +01:00
Philip Elson
da5b3bc8fb Merge branch 'fix/remove-debug-auth-service' into 'master'
Auth service: pass debug option as CLI arg

Closes #237

See merge request cara/cara!328
2022-02-08 13:40:37 +01:00
Andre Henriques
9dc8237987 Merge branch 'feature/correct_plot_labels' into 'master'
modify label names and delete plot title

See merge request cara/cara!327
2022-02-08 11:26:07 +01:00
Andre Henriques
49221a32a4 modify label names and delete plot title 2022-02-08 10:20:41 +00:00
Nicola Tarocco
99de3e2ebd Auth service: pass debug option as CLI arg
* closes #237
2022-02-08 10:24:11 +01:00
Andre Henriques
7e61cc33e5 Merge branch 'feature/cumulative_inf_aero' into 'master'
Method to calculate the deposited_exposure between two times

See merge request cara/cara!322
2022-02-04 10:38:22 +01:00
Luis Aleixo
60cacfe9a1 Changed inf_aero variable name 2022-02-03 17:21:26 +01:00
Luis Aleixo
fb15b6f451 changed and added tests on test_exposure_model 2022-02-03 15:25:39 +01:00
Luis Aleixo
8855dfc75a Changed test values on test_monte_carlo_full_models 2022-02-03 15:14:33 +01:00
Luis Aleixo
2a43fffec9 changed docstring on models.py for the deposited_expoure method 2022-02-03 10:55:06 +01:00
Luis Aleixo
fee2bcab86 Changed test values on test_known_quantities 2022-02-03 10:54:44 +01:00
Luis Aleixo
c24853516b Changed test_monte_carlo.py exposure method 2022-02-03 10:10:53 +01:00
Luis Aleixo
dd77ba5090 added self.repeats to the deposited exposure calculation 2022-02-02 17:24:41 +01:00
Luis Aleixo
b7007ae345 deposited exposure as public method 2022-02-02 17:03:23 +01:00
Luis Aleixo
996230333c Set new logic for the cern_level color variable 2022-02-02 12:23:17 +01:00