Philip James Elson
|
ae691a5c12
|
Merge branch 'fix/volume-in-report' into 'master'
Use the Jinja templating engine to remove pre-formatting values
See merge request cara/cara!62
|
2020-11-06 22:44:17 +00:00 |
|
Phil Elson
|
641d236aa9
|
Prevent arbitrary code execution exploits.
|
2020-11-06 23:41:42 +01:00 |
|
Phil Elson
|
89f1e6e62c
|
Use the Jinja templating engine to remove pre-formatting values.
|
2020-11-06 23:32:25 +01:00 |
|
Philip James Elson
|
61ea8a8842
|
Merge branch 'enhancement/remove-temporary-form-dictionary-access' into 'master'
Enhancement/remove temporary form dictionary access
See merge request cara/cara!61
|
2020-11-06 22:16:22 +00:00 |
|
Philip James Elson
|
68c15e84cc
|
Merge branch 'fix/volume-in-report' into 'master'
Ensure that the volume is correct in the report
See merge request cara/cara!60
|
2020-11-06 22:15:43 +00:00 |
|
Phil Elson
|
eb2f8d99e8
|
Remove the use of the direct dictionary (un validated) data in favour of the FormData class.
|
2020-11-06 23:12:04 +01:00 |
|
Phil Elson
|
762c4c3e49
|
Ensure that the volume is correct in the report.
|
2020-11-06 23:06:40 +01:00 |
|
Philip James Elson
|
c0057a144a
|
Merge branch 'fix/date-picking' into 'master'
Ensure that the maximum number of infected people remains below the total number
Closes #65
See merge request cara/cara!59
|
2020-11-06 20:49:21 +00:00 |
|
Phil Elson
|
8ef0d41660
|
Ensure that the maximum number of infected people remains below the total number, even if pressing the back button. Closes #65.
|
2020-11-06 21:48:09 +01:00 |
|
Philip James Elson
|
0cab2dff0e
|
Merge branch 'fix/date-picking' into 'master'
Only validate the date if it is required. Addresses the date part of #65.
See merge request cara/cara!58
|
2020-11-06 20:28:57 +00:00 |
|
Phil Elson
|
11e68887e0
|
Only validate the date if it is required. Addresses the date part of #65.
|
2020-11-06 21:26:56 +01:00 |
|
Philip James Elson
|
78bdc92eeb
|
Merge branch 'Form-validation' into 'master'
Added datepicker validation
See merge request cara/cara!56
|
2020-11-06 19:47:26 +00:00 |
|
gaazzopa
|
3d80e054c1
|
Added datepicker validation
|
2020-11-06 20:06:29 +01:00 |
|
Philip James Elson
|
f0c5a07fbd
|
Merge branch 'develop/form-fixes' into 'master'
Unrequire fields when not selected
See merge request cara/cara!55
|
2020-11-06 18:12:50 +00:00 |
|
gaazzopa
|
b4469a905f
|
Room size min 0.01
|
2020-11-06 18:42:05 +01:00 |
|
gaazzopa
|
91444ca527
|
Unrequire fields when not selected
|
2020-11-06 18:38:55 +01:00 |
|
Philip James Elson
|
9bc9914122
|
Merge branch 'develop/report-fixes' into 'master'
Report fixes
See merge request cara/cara!54
|
2020-11-06 17:09:26 +00:00 |
|
Philip James Elson
|
36ecdcfbb8
|
Merge branch 'fix/plot_xaxis_label' into 'master'
Update the xaxis label to hour of day.
Closes #63
See merge request cara/cara!53
|
2020-11-06 17:07:48 +00:00 |
|
Phil Elson
|
10b9a5e24d
|
Stop passing window data through the dictionary, and start using the form.
|
2020-11-06 18:07:29 +01:00 |
|
gaazzopa
|
12d09b438d
|
HEPA option was hard-coded for report generation
|
2020-11-06 18:04:08 +01:00 |
|
gaazzopa
|
dc6fcfd56f
|
Result format was not user friendly
|
2020-11-06 18:03:25 +01:00 |
|
Phil Elson
|
8b0e5d4c11
|
Update the xaxis label to hour of day.
|
2020-11-06 17:57:14 +01:00 |
|
Philip James Elson
|
9b875d3b28
|
Merge branch 'fix/hepa_in_report' into 'master'
Fix the HEPA information in the report.
See merge request cara/cara!52
|
2020-11-06 16:55:40 +00:00 |
|
Phil Elson
|
61b2237446
|
Fix the HEPA information in the report.
|
2020-11-06 17:54:29 +01:00 |
|
Philip James Elson
|
ed408d96ad
|
Merge branch 'feature/plot-title' into 'master'
Remove the aerosols word from the plot title.
Closes #53
See merge request cara/cara!51
|
2020-11-06 16:30:53 +00:00 |
|
Phil Elson
|
6b9ec722b8
|
Remove the aerosols word from the plot title.
|
2020-11-06 17:29:39 +01:00 |
|
Philip James Elson
|
9180fc5aa6
|
Merge branch 'fix/permalunch' into 'master'
Fix permalunch. Closes #57.
Closes #57
See merge request cara/cara!50
|
2020-11-06 16:26:23 +00:00 |
|
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 |
|