Commit graph

1276 commits

Author SHA1 Message Date
Luis Aleixo
4c3d81c953 Docstringfor exposure_between_bounds changed 2021-09-15 11:29:10 +02:00
Luis Aleixo
4388de9ed1 all times in front approach for the cumulative dose 2021-09-15 11:26:45 +02:00
Andre Henriques
092d566dbe Merge branch 'feature/delta_default' into 'master'
Changes default strain in calculator to Delta.

See merge request cara/cara!257
2021-09-14 23:51:49 +02:00
jdevine
5d4dc4b91d reverted model_generator default virus type 2021-09-14 16:22:49 +02:00
Andre Henriques
705485b1d5 Merge branch 'feature/concentration_normalization' into 'master'
Normalization of the computation of the concentration

See merge request cara/cara!255
2021-09-14 16:11:45 +02:00
Nicolas Mounet
92f9bce7e5 Normalization of the computation of the concentration 2021-09-14 16:11:44 +02:00
jdevine
8fbe7856b9 Addressed comments from Andre. 2021-09-14 14:57:48 +02:00
jdevine
fdca7da53a Changed default strain in calculator to Delta.
Also applies retroactively to QR codes missing delta.
The rational for the retrospective change is that old simulations (wild type)
re-run need to be re-run with the current dominant strain.
2021-09-13 13:50:12 +02:00
Philip Elson
743d4ab706 Merge branch 'feature/no_computing_before_first_time' into 'master'
Model optimisation: avoid computing before first presence time

See merge request cara/cara!254
2021-09-13 12:00:07 +02:00
Nicolas Mounet
9ed65a2b04 Model optimisation: avoid computing before first presence time 2021-09-13 12:00:06 +02:00
Cole Austin Coughlin
1ed67eeca1 moved most html styling to css style sheet 2021-09-08 19:59:21 -05:00
Luis Aleixo
b6ecca5a62 Merge branch 'master' into feature/concentration_cumulative_dose 2021-09-08 16:30:42 +02:00
Cole Austin Coughlin
6c5d97f514 fixed issues mentioned in merge request 2021-09-07 13:39:56 -05:00
Luis Aleixo
a689fe8e74 bug with width fixed 2021-09-07 17:06:41 +02:00
Luis Aleixo
c27f567f3a merge with master 2021-09-07 17:00:51 +02:00
Luis Aleixo
0b83c6491e Changed methods names and variables. New logic to calculate exposure between bounds 2021-09-07 15:30:54 +02:00
Philip Elson
97ac2ab743 Merge branch 'feature/alternative_scenario_d3' into 'master'
Alternative scenarios plot with D3

See merge request cara/cara!246
2021-09-07 06:43:23 +02:00
Luis Aleixo
250b7c0582 Plot alternative scenarios in report using D3.js, speeding up the response time and improving user interactivity 2021-09-07 06:43:22 +02:00
Luis Aleixo
d3e56f69b2 get boundaries from time function 2021-09-06 10:00:53 +02:00
Cole Austin Coughlin
42d7d4aea9 fixed about page 2021-09-03 12:12:53 -05:00
Cole Austin Coughlin
befa2a51f7 fixed website with new report 2021-09-03 11:42:02 -05:00
Luis Aleixo
485518f3f4 new time with breaks included 2021-09-03 09:35:57 +02:00
Philip Elson
0414e15e4b Merge branch 'feature/masks_efficiency' into 'master'
Inward efficiency of masks

See merge request cara/cara!250
2021-09-02 17:15:06 +02:00
Luis Aleixo
cb334cbafa variable renaming for the exposure and inhaled_exposure 2021-09-02 16:19:32 +02:00
Luis Aleixo
ab153ca781 added inward mask efficiency references 2021-09-02 15:23:49 +02:00
Luis Aleixo
70bde2f3fe Merge branch 'master' into feature/concentration_cumulative_dose 2021-09-02 15:09:47 +02:00
Luis Aleixo
bdc51d81b8 Changed relevant references for mask distributions 2021-09-02 12:11:22 +02:00
Andre Henriques
72681b9895 Merge branch 'feature/climate_function' into 'master'
Allow location selection as part of the calculator, with temp profile from local weather station

See merge request cara/cara!211
2021-09-02 11:58:33 +02:00
James Devine
db02132853 Allow location selection as part of the calculator, with temp profile from local weather station 2021-09-02 11:58:32 +02:00
Luis Aleixo
cbb3846eb7 Added uniform distribution for masks 2021-09-01 14:59:13 +02:00
Andre Henriques
3f38897099 Merge branch 'feature/update-nginx' into 'master'
Update the nginx version to 1.18

See merge request cara/cara!248
2021-08-31 09:19:58 +02:00
Andre Henriques
fcdab9506c Merge branch 'feature/report_reformulation' into 'master'
Feature/report reformulation

See merge request cara/cara!234
2021-08-30 18:48:58 +02:00
gaazzopa
cfb43aa259 Update calculator minor version 2021-08-30 17:52:23 +02:00
Luis Aleixo
e556f4d4bd revert d3 resizable plot changes 2021-08-27 17:29:49 +02:00
Luis Aleixo
b6b14070ba responsive image (covid level scale) 2021-08-27 17:24:43 +02:00
Luis Aleixo
788bc1f973 responsive d3 plot 2021-08-27 17:22:37 +02:00
Luis Aleixo
716144fc06 break data bug fix 2021-08-27 17:14:02 +02:00
Luis Aleixo
55e760e644 * note without square brackets 2021-08-27 16:53:18 +02:00
Luis Aleixo
b864bd7a65 Report layout with print version 2021-08-27 16:38:45 +02:00
Luis Aleixo
9c80cfca22 Broken link correction (SARS-CoV-2 (Gamma VOC)) 2021-08-27 15:27:28 +02:00
Luis Aleixo
b54fa3f519 Added a '.' after CERN Open Report link 2021-08-27 15:18:54 +02:00
Luis Aleixo
36c34d7000 added infected occupants under break data in report 2021-08-27 15:09:29 +02:00
Luis Aleixo
d1860484ff moved * notes to the end for the results dialog 2021-08-27 14:36:14 +02:00
Luis Aleixo
23de05928e created some css properties for header components 2021-08-26 10:44:56 +02:00
Luis Aleixo
f52a206728 changed style props into bootstrap classes 2021-08-26 10:40:36 +02:00
Luis Aleixo
439ac3363b moved pdf.js script tag into the bottom of the html page 2021-08-26 10:35:07 +02:00
Luis Aleixo
d8ac052f7b converting pt to px units 2021-08-26 10:32:22 +02:00
Luis Aleixo
0e1936f565 Changed min-width property to apply only for the generated pdf 2021-08-26 10:25:04 +02:00
Phil Elson
6178fc3c15 Update the nginx version to 1.18 2021-08-26 06:08:10 +02:00
Philip James Elson
fd49deaca0 Merge branch 'feature/dockerfile-w-expert' into 'master'
Include the expert app in the public docker image

See merge request cara/cara!247
2021-08-26 05:52:42 +02:00