jdevine
dcc1dac1d4
Modified activity parameters and updated calculator scenarios
2020-11-17 18:21:11 +01:00
Philip James Elson
526ec57b7b
Merge branch 'develop/UI-updates' into 'master'
...
Updates to form UI
Closes #65 and #88
See merge request cara/cara!93
2020-11-17 15:36:56 +00:00
gaazzopa
6e100edf9a
Restructured lunch required code
2020-11-17 15:55:33 +01:00
gaazzopa
40ee0a87c9
Updated require fields logic
2020-11-17 15:43:57 +01:00
gaazzopa
728813fdd3
Fixed banner links and location in user-guide
2020-11-17 15:39:18 +01:00
gaazzopa
1aad8ef753
Update function name
2020-11-17 15:27:50 +01:00
gaazzopa
6d4ec0dafc
Curly brace request
2020-11-17 09:48:27 +01:00
gaazzopa
a96a881145
Preserve lunch times on back button
2020-11-16 22:19:06 +01:00
gaazzopa
7b4d72c8dd
Fixed date validation
2020-11-16 22:12:54 +01:00
gaazzopa
9490ea8e40
Fixed lunch option required on back
2020-11-16 22:09:54 +01:00
gaazzopa
70e2bfcca7
Modularised validation
2020-11-16 21:59:38 +01:00
gaazzopa
5088b87435
Adjusted logo margin
2020-11-16 17:52:46 +01:00
gaazzopa
408be1439d
Made banner height consistent
2020-11-16 17:32:40 +01:00
gaazzopa
2e85cdd0aa
Added additional HSE logos
2020-11-16 17:31:08 +01:00
gaazzopa
fa811a9e29
Added consistent HSE colors
2020-11-16 12:53:19 +01:00
gaazzopa
757595bbd5
Added banner with logo
2020-11-16 12:42:08 +01:00
gaazzopa
274eb17e8b
Adjusted date validation error
2020-11-14 16:42:02 +01:00
gaazzopa
6e10721adf
Added real-time form validation
2020-11-14 16:30:20 +01:00
Nicolas Mounet
1478bdd0b4
Merge branch 'feature/reproduction_rate' into 'master'
...
Implement an ExposureModel.reproduction_number, which is modelled by having precisely one infected person in the concentration model
Closes #98
See merge request cara/cara!88
2020-11-13 18:15:22 +00:00
Gabriella Azzopardi
5b60ddd3fb
Merge branch 'feature/office-meeting-split' into 'master'
...
Separate the Meeting/Office profiles.
See merge request cara/cara!91
2020-11-13 16:21:52 +00:00
gaazzopa
3743935b0f
Added meeting option to user guide
2020-11-13 17:18:37 +01:00
Phil Elson
55e406e94b
Separate the Meeting/Office profiles.
2020-11-13 16:54:35 +01:00
Philip James Elson
22c93b05f6
Merge branch 'conversation_profile' into 'master'
...
Added new expiration profile "Conversation", changed office activity type + new activity "call centre"
Closes #93 and #96
See merge request cara/cara!86
2020-11-13 15:45:40 +00:00
Phil Elson
b4ebad785f
Allow the COVID calculator to have a blended Expiration type to represent conversations.
2020-11-13 16:42:29 +01:00
jdevine
842b5418f2
Updated readme.md with changed activities
2020-11-13 16:40:57 +01:00
jdevine
dee2c0d0ab
fixed reporting for call centre type
2020-11-13 16:40:57 +01:00
jdevine
041f03c06e
Created new conversation exp. profile, modified office/meeting activity and created call centre activity
2020-11-13 16:40:57 +01:00
Philip James Elson
d3786b74b2
Merge branch 'develop/training-infected-limit' into 'master'
...
Added training infected limit
See merge request cara/cara!90
2020-11-13 15:35:54 +00:00
gaazzopa
ad604a3e5b
Added training infected limit
2020-11-13 16:30:35 +01:00
Philip James Elson
8c3bd0dad8
Merge branch 'develop/calculator_inf_vs_exp_times' into 'master'
...
Disentangle infected and exposed presence times in model_generator
See merge request cara/cara!87
2020-11-13 14:07:08 +00:00
Nicolas Mounet
fe9fde0e86
model_generator: putting the common part of exposed_present_interval and infected_present_interval into a separate method (code cleanout)
2020-11-13 14:58:28 +01:00
Phil Elson
31f628f9e5
Implement an ExposureModel.reproduction_number, which is modelled by having precisely one infected person in the concentration model.
2020-11-12 21:27:01 +01:00
Philip James Elson
e3d0a6a4d7
Merge branch 'develop/form-updates' into 'master'
...
Form UI updates
Closes #97 and #79
See merge request cara/cara!84
2020-11-12 19:26:09 +00:00
Nicolas Mounet
3860e39959
Adding second coffee break in test on exposed presence interval (test_model_generator.py)
2020-11-12 18:58:25 +01:00
Nicolas Mounet
a9e07f77f6
Extending the time range for the plot in the report_generator
2020-11-12 18:50:14 +01:00
Nicolas Mounet
306e7fc31d
tests for modele_generator: replace test on presence intervals by two tests on infected and exposed presence intervals
2020-11-12 18:40:03 +01:00
Philip James Elson
2f1b77e8f5
Merge branch 'develop/outside_temp_always_lower' into 'master'
...
Inside temperature is always at least 0.1 K higher than outside temperature
See merge request cara/cara!83
2020-11-12 16:52:30 +00:00
gaazzopa
c4d6476a96
Removed window width from report
2020-11-12 15:47:40 +01:00
gaazzopa
601458150c
Replaced R0 with expected new cases
2020-11-12 15:34:34 +01:00
gaazzopa
cff927b954
Removed window width from model
2020-11-12 15:26:22 +01:00
gaazzopa
a99d4c0205
Updated tooltip text again
2020-11-12 15:21:00 +01:00
gaazzopa
ada7626873
Updated tooltip text
2020-11-12 15:16:34 +01:00
Nicolas Mounet
1ec9a0e9b0
More concise/clearer way to compute the deltaT in air_exchange for WindowOpening; adding comments
2020-11-12 12:06:33 +01:00
Philip James Elson
372fa0e53a
Merge branch 'feature/test-cara-CI' into 'master'
...
Always trigger a re-deploy to test-cara.web.cern.ch if we are on the live/test-cara branch.
See merge request cara/cara!85
2020-11-12 10:15:09 +00:00
Phil Elson
3ac1ebdadd
Always trigger a re-deploy to test-cara.web.cern.ch if we are on the live/test-cara branch.
2020-11-12 11:13:27 +01:00
gaazzopa
f9ef4bb659
Fixed tooltip size
2020-11-11 22:33:01 +01:00
gaazzopa
b6819bfef9
Added tooltips
2020-11-11 22:22:12 +01:00
gaazzopa
ccd68bfbbb
Edited inputs
2020-11-11 20:34:40 +01:00
gaazzopa
ec6deef5e3
Removed unused window width
2020-11-11 20:13:16 +01:00
gaazzopa
89a50d132b
Added default lunch times on select
2020-11-11 20:11:12 +01:00
