Phil Elson
b74ffebeb2
Tool to generate the config from the templates.
2021-07-29 09:38:59 +02:00
Phil Elson
91ea826060
Add a CI job to validate the test-cara instance.
2021-07-29 09:38:59 +02:00
Nicolas Mounet
43fd580ac2
Merge branch 'feature/py39' into 'master'
...
Add support, and CI for Python 3.9
See merge request cara/cara!228
2021-07-28 12:31:51 +00:00
Phil Elson
7109c821e8
Add support, and CI for Python 3.9
2021-07-28 11:17:45 +02:00
Luis Aleixo
d0a30f26ef
Merge branch 'master' into feature/concentration_cumulative_dose
2021-07-26 14:33:33 +02:00
Luis Aleixo
f329d76e22
Performed some calculations missed on the code
2021-07-26 14:20:16 +02:00
Luis Aleixo
1803d4e919
mypy errors - added some dummy variables to test_exposure_model.py
2021-07-26 14:16:51 +02:00
Luis Aleixo
e881173432
added image with arrow to show % of probability of getting infected
2021-07-26 12:38:42 +02:00
Luis Aleixo
5983fca92e
test exposure model fix
2021-07-26 09:55:56 +02:00
Luis Aleixo
7bab716532
added @cached to integrated_concentrations method
2021-07-23 15:11:19 +02:00
Luis Aleixo
56e8714633
Concentration plot for alternative scenarios fix
2021-07-23 14:31:46 +02:00
Luis Aleixo
680db38cce
pipelined fixed for returning value models.py
2021-07-23 12:15:50 +02:00
Luis Aleixo
460c5cf520
Cumulative dose calculation code in models fixes #164
2021-07-23 10:57:52 +02:00
Luis Aleixo
bc38f5ec7a
cumulated_exposure method in models.py
2021-07-23 09:15:25 +02:00
Nicola Tarocco
145509ba68
Merge branch 'feature/docker-builds' into 'master'
...
Build the auth-service through a Dockerfile (and move to py39)
See merge request cara/cara!226
2021-07-21 15:27:39 +00:00
Luis Aleixo
85045f02db
Alternative Scenarios with cumulative dose fix #227
2021-07-21 11:01:41 +02:00
Luis Aleixo
f7b2f3c567
Alternative Scenarios with cumulative dose plot
2021-07-21 09:42:46 +02:00
Luis Aleixo
749e73a603
UI improvements with transparent png images and bootstrap classes for components styling
2021-07-21 08:48:19 +02:00
Luis Aleixo
e07bee91ac
Legend correction and order
2021-07-20 15:34:06 +02:00
Luis Aleixo
e7a1c831b7
Concentration profile plot with cumulative dose #fixes164
2021-07-20 12:36:21 +02:00
Phil Elson
2fcadc7952
Add auth-service building to the CI.
2021-07-20 11:14:08 +02:00
Phil Elson
d7199f7a15
Build the auth-service through a Dockerfile to allow us to use the latest versions of libraries (e.g. python 3.9)
2021-07-20 11:06:07 +02:00
Andre Henriques
74586f70b1
Merge branch 'feature/scale-warning' into 'master'
...
CERN Covid scale update - yellow level 2
See merge request cara/cara!225
2021-07-19 14:55:09 +00:00
Luis Aleixo
918149e4c7
CERN Covid scale update - yellow level 2
2021-07-19 16:43:28 +02:00
Andre Henriques
3fbb953246
Merge branch 'feature/percentage_precision' into 'master'
...
Change % format for P(i)
See merge request cara/cara!222
2021-07-18 21:41:56 +00:00
Nicola Tarocco
99396fd7b1
Merge branch 'feature/parallelism_strikes_back' into 'master'
...
Re-introduce parallelism through loky
See merge request cara/cara!224
2021-07-16 13:29:42 +00:00
Phil Elson
77e9215812
Re-introduce parallelism through loky.
2021-07-16 13:56:28 +02:00
Philip James Elson
b21a387053
Merge branch 'feat/run-from-docker' into 'master'
...
Update the openshift templates to better reflect the deployed state of test-cara
See merge request cara/cara!221
2021-07-16 08:57:05 +00:00
Luis Aleixo
b291b6217e
Collapsible sections - applicable rules; results; alternative scenarios
2021-07-15 12:15:53 +02:00
Luis Aleixo
6656da768b
Printable version image dimensions fix
2021-07-15 10:08:40 +02:00
jdevine
967127384f
Changed % responses for P(i), now given as 0.1f (1 decimal place, unless <1 then 2dp as previously)
...
Modified alternative scenarios:
- The base case is no longer added to alternate scenarios
- HEPA/FFP2 options revised to make more sense
If using FFP2, no alternatives are added.
If using HEPA and FFP2, HEPA + Type 1 is included as an alternate
If using HEPA and Type I, HEPA + FFP2 is included as an alternate
2021-07-14 18:20:25 +02:00
Luis Aleixo
f43c7d382e
results apart from input data in tabs layout
2021-07-14 17:30:30 +02:00
Luis Aleixo
8ceb334101
two tabs - results and input data
2021-07-14 14:41:41 +02:00
Phil Elson
7d14bc488f
Tests passing for OpenShift config checking on the test-cara instance.
2021-07-14 13:32:02 +02:00
Luis Aleixo
9e2a965505
Report header title and image
2021-07-14 12:03:15 +02:00
Andre Henriques
29a39040a5
Merge branch 'feature/scale-warning' into 'master'
...
Feature/scale warning
Closes #171 and #173
See merge request cara/cara!213
2021-07-13 13:02:02 +00:00
Gabriella Azzopardi
a966a03dd1
Merge branch 'maint/major_cara_version_update' into 'master'
...
Increment the major version of the CARA model and the calculator.
See merge request cara/cara!220
2021-07-13 11:14:41 +00:00
Phil Elson
6aca5164c1
Increment the major version of the CARA model and the calculator.
2021-07-13 13:02:28 +02:00
Philip James Elson
6802fbd737
Merge branch 'fix/revert-multiprocessing' into 'master'
...
Revert the multiprocessing change from #214 .
See merge request cara/cara!219
2021-07-13 10:24:27 +00:00
Phil Elson
13973bd61b
Revert the multiprocessing change from #214 .
2021-07-13 12:22:14 +02:00
Philip James Elson
9fd04828d9
Merge branch 'feature/logout_functionality' into 'master'
...
Logout redirect link updated to "/auth/logout"
Closes #140
See merge request cara/cara!218
2021-07-13 10:07:43 +00:00
Philip James Elson
952078c3c0
Merge branch 'fix-docker-compose' into 'master'
...
Fix QR code redirection for calculator-cern
Closes #177
See merge request cara/cara!215
2021-07-13 10:07:17 +00:00
Luis Aleixo
694951d639
logout redirect link updated to "/auth/logout" fixes #140
2021-07-13 11:57:37 +02:00
Luis Aleixo
b5206fad44
normal font weight for the onsite_access variable and warning box centered fixes #173
2021-07-13 11:35:23 +02:00
Philip James Elson
babadda48f
Merge branch 'feature/logout_functionality' into 'master'
...
Added logout functionality
See merge request cara/cara!216
2021-07-13 09:19:49 +00:00
Philip James Elson
e9b31aca65
Merge branch 'cern_form_typo_fix' into 'master'
...
Typo: Modify CERN Form
Closes #178
See merge request cara/cara!217
2021-07-13 09:17:53 +00:00
Luis Aleixo
54b45b0046
misprint next to ceiling hight it should be metros (m) fixes #178
2021-07-13 09:56:27 +02:00
Luis Aleixo
a8d77c5a96
typo in image names
2021-07-12 12:31:10 +02:00
Luis Aleixo
4170fcabd4
typo in scale_warning text
2021-07-12 12:04:25 +02:00
Philip James Elson
db9af9cf04
Merge branch 'feature/parallel_scenarios' into 'master'
...
Distribute the calculation of alternative scenarios
See merge request cara/cara!209
2021-07-12 08:06:55 +00:00
