Phil Elson
|
f10bea7765
|
Fix permalunch. Closes #57.
|
2020-11-06 17:25:31 +01:00 |
|
Philip James Elson
|
227c9c26c4
|
Merge branch 'fix/form-validation' into 'master'
Validate the lunch start and ends in calculator
See merge request cara/cara!48
|
2020-11-06 16:11:46 +00:00 |
|
Philip James Elson
|
aad58ac03c
|
Merge branch 'fix/form-to-model' into 'master'
Addition fix for form to model
See merge request cara/cara!46
|
2020-11-06 16:11:14 +00:00 |
|
Phil Elson
|
28bd37270d
|
Whack-a-mole on some form validation.
|
2020-11-06 17:09:48 +01:00 |
|
gaazzopa
|
d9dfdbac77
|
Added windows_open for form submission
|
2020-11-06 17:02:12 +01:00 |
|
Philip James Elson
|
f9f1ebc7b2
|
Merge branch 'feature/calculator-not-applicable' into 'master'
Make the data from the form optional to avoid some of the common failures we're seeing.
See merge request cara/cara!47
|
2020-11-06 16:00:18 +00:00 |
|
Phil Elson
|
12fadae372
|
Make the data from the form optional to avoid some of the common failures we're seeing.
|
2020-11-06 16:59:17 +01:00 |
|
Philip James Elson
|
bf6a671545
|
Merge branch 'fix/form-to-model' into 'master'
Fix the form to model transformation.
See merge request cara/cara!45
|
2020-11-06 15:40:05 +00:00 |
|
Phil Elson
|
dc73bd77d1
|
Fix the form to model transformation.
|
2020-11-06 16:38:09 +01:00 |
|
Philip James Elson
|
3899a403c3
|
Merge branch 'develop/form-fixes' into 'master'
Fixed issues with form submission
See merge request cara/cara!43
|
2020-11-06 15:19:04 +00:00 |
|
gaazzopa
|
8e9dd9564c
|
Removed debug options
|
2020-11-06 16:16:57 +01:00 |
|
gaazzopa
|
41563d4dae
|
Fixed issues with form submission
|
2020-11-06 16:16:57 +01:00 |
|
Philip James Elson
|
d85cf4a823
|
Merge branch 'infected-coffee' into 'master'
Correctly handle coffee break times
See merge request cara/cara!42
|
2020-11-06 15:15:08 +00:00 |
|
Phil Elson
|
73abcf8596
|
Implement the coffee break method.
|
2020-11-06 16:12:59 +01:00 |
|
Philip James Elson
|
e3799d02d7
|
Merge branch 'fix/broken-test-master' into 'master'
Improve the validation messages for data from the calculator
See merge request cara/cara!44
|
2020-11-06 14:59:10 +00:00 |
|
Phil Elson
|
0a51738d4d
|
Improve the validation messages.
|
2020-11-06 15:58:09 +01:00 |
|
Andre Henriques
|
a6946b889d
|
Merge branch 'feature/pizzazz' into 'master'
Implement a real landing page for CARA
See merge request cara/cara!40
|
2020-11-06 14:51:10 +00:00 |
|
markus
|
3b597a2467
|
replace hard-coded values
|
2020-11-06 15:39:06 +01:00 |
|
markus
|
aafc6f3b9f
|
use infected_start/finish to calculate present_intervals and coffee_times
|
2020-11-06 15:30:43 +01:00 |
|
Philip James Elson
|
8f272d3382
|
Merge branch 'fix/broken-test-master' into 'master'
Fix the failing test on master.
See merge request cara/cara!41
|
2020-11-06 14:25:50 +00:00 |
|
Phil Elson
|
b9bd8ac2d7
|
Fix the failing test on master.
|
2020-11-06 15:24:57 +01:00 |
|
Phil Elson
|
b998026607
|
Implement a real landing page.
|
2020-11-06 15:16:50 +01:00 |
|
Philip James Elson
|
c308387341
|
Merge branch 'key-validation' into 'master'
Key validation
See merge request cara/cara!38
|
2020-11-06 13:52:44 +00:00 |
|
markus
|
a6a91471ba
|
pre-process minutes
|
2020-11-06 14:51:14 +01:00 |
|
markus
|
d7c64c875c
|
move minutes_to_string into report_generator.py
|
2020-11-06 14:42:15 +01:00 |
|
Nicolas Mounet
|
6f842b2c94
|
Merge branch 'develop/hepa_in_calculator' into 'master'
Minor (transparent) fix in model_generator test for HEPA
See merge request cara/cara!39
|
2020-11-06 13:36:42 +00:00 |
|
Nicolas Mounet
|
ac208eb2be
|
Minor (transparent) fix in model_generator test for HEPA
|
2020-11-06 14:33:57 +01:00 |
|
markus
|
5e11292a60
|
validate keys
|
2020-11-06 14:18:00 +01:00 |
|
markus
|
a88ff3cf1f
|
resolve todo
|
2020-11-06 14:17:34 +01:00 |
|
markus
|
76d74132ef
|
use correct windows_open value-name
|
2020-11-06 14:06:15 +01:00 |
|
Philip James Elson
|
16f3e6943b
|
Merge branch 'develop/hepa_in_calculator' into 'master'
Adding support to HEPA in calculator
See merge request cara/cara!37
|
2020-11-06 13:01:40 +00:00 |
|
markus
|
93207ff8e8
|
use minutes_to_string in report
|
2020-11-06 13:52:04 +01:00 |
|
markus
|
0b6acecd47
|
use correct keys
|
2020-11-06 13:51:34 +01:00 |
|
markus
|
c4d474304a
|
add minutes_to_string
|
2020-11-06 13:51:03 +01:00 |
|
markus
|
7dbb2cc632
|
comment out breaks-option because of lacking model capability
|
2020-11-06 13:50:37 +01:00 |
|
markus
|
da95cedb4d
|
change air_type to mechanical_ventilation_type
|
2020-11-06 13:50:15 +01:00 |
|
Nicolas Mounet
|
314a29d271
|
HEPA addition now fully supported in model_generator.py
|
2020-11-06 13:41:06 +01:00 |
|
Nicolas Mounet
|
2710daacd7
|
Clarifying the use of HVAC (instead of HEPA) or manual air change, in model_generator (transparent change)
|
2020-11-06 13:37:46 +01:00 |
|
Nicolas Mounet
|
4ce57f6491
|
Adding hepa_option in FormData class (model_generator.py)
|
2020-11-06 13:32:40 +01:00 |
|
Nicolas Mounet
|
98f2b77350
|
Adding tests for window ventilation with HEPA in test_model_generator
|
2020-11-06 13:31:19 +01:00 |
|
Nicolas Mounet
|
c5e6540406
|
Adding a test for models (checking that until the first presence time of an infected person, the concentration remains at zero)
|
2020-11-06 13:19:17 +01:00 |
|
Nicolas Mounet
|
860d68583d
|
Adding tests for mechanical ventilation in test_model_generator
|
2020-11-06 13:18:01 +01:00 |
|
markus
|
11feee4050
|
create sets of valid values
|
2020-11-06 12:57:21 +01:00 |
|
markus
|
d5d572c943
|
add test_key_validation
|
2020-11-06 12:36:53 +01:00 |
|
Philip James Elson
|
5a64291f2b
|
Merge branch 'mechanical-ventilation-type' into 'master'
add mechanical_ventilation_type
See merge request cara/cara!36
|
2020-11-06 11:17:02 +00:00 |
|
markus
|
7cd4e4ac85
|
de-capitalize activity_dict
|
2020-11-06 12:13:01 +01:00 |
|
markus
|
25c1704e43
|
add mechanical_ventilation_type
|
2020-11-06 12:09:18 +01:00 |
|
Philip James Elson
|
1a14d3bc0f
|
Merge branch 'feature/scenario_graph' into 'master'
Include a scenario graph in the report
See merge request cara/cara!34
|
2020-11-06 10:20:03 +00:00 |
|
Phil Elson
|
0f2f306ff3
|
Include a scenario graph in the report.
|
2020-11-06 11:17:11 +01:00 |
|
Philip James Elson
|
d9b880d056
|
Merge branch 'develop/form_report-UI' into 'master'
Updates to form and report UI
See merge request cara/cara!33
|
2020-11-06 10:11:41 +00:00 |
|