Commit graph

591 commits

Author SHA1 Message Date
markus
d01ebda19e create montecarlo.py 2021-02-10 16:11:44 +01:00
Philip James Elson
182294348f Merge branch 'feature/openshift-templates' into 'master'
Add OpenShift templates

See merge request cara/cara!135
2021-02-10 10:39:15 +00:00
Philip James Elson
858e51262e Merge branch 'feature/split_break_times' into 'master'
Split break times

Closes #118

See merge request cara/cara!129
2021-02-10 10:17:49 +00:00
Gabriella Azzopardi
ad82e73c27 Revert "Automate infected breaks DIV creation in JS"
This reverts commit c8fb1b68f65e41575ba698814e6d835cc3bf389f
2021-02-10 10:17:48 +00:00
Andre Henriques
bada12692b Merge branch 'upadate_Acknowledgements' into 'master'
upadate_thanks

See merge request cara/cara!137
2021-02-04 09:07:37 +00:00
Andre Henriques
0dcea6a9d0 upadate_thanks 2021-02-04 09:05:58 +00:00
Gabriella Azzopardi
582f7e0e3b Merge branch 'update_authors' into 'master'
update_authors_Nico

See merge request cara/cara!136
2021-02-04 08:45:13 +00:00
Andre Henriques
c8b351adff update_authors_Nico 2021-02-03 14:58:21 +00:00
Nicola Tarocco
80dedeeebb Add OpenShift templates 2021-02-01 18:53:43 +01:00
James Devine
819399df82 Merge branch 'feature/month' into 'master'
removed individual date option

Closes #137

See merge request cara/cara!134
2021-01-27 17:02:32 +00:00
James Devine
c90507f235 removed individual date option 2021-01-27 17:02:31 +00:00
Philip James Elson
6edfb15ba5 Merge branch 'README_tests' into 'master'
Update README.md: running the tests

See merge request cara/cara!133
2021-01-26 18:11:49 +00:00
Nicolas Mounet
9cbedc41f3 Update README.md: running the tests 2021-01-26 14:49:13 +00:00
Nicolas Mounet
e83371040a Merge branch 'feature/type-checking' into 'master'
Fix the type annotations for the cara codebase

See merge request cara/cara!125
2021-01-19 09:47:53 +00:00
Andre Henriques
61f32e25d3 Merge branch 'Pi_fix' into 'master'
Pi display fix

See merge request cara/cara!131
2021-01-15 09:55:17 +00:00
Gaby Azzopardi
69f4ae4698 Pi display fix 2021-01-15 10:24:35 +01:00
Andre Henriques
ae3aff1616 Merge branch 'feature/report_colour_coding' into 'master'
Feature/report colour coding [now actually ready]

Closes #128

See merge request cara/cara!126
2021-01-14 20:12:47 +00:00
James Devine
40a0326977 Included additional remarks from Andre (colour coded intro + footnote) and code improvements from Gabriella. 2021-01-14 20:12:46 +00:00
Philip James Elson
93e12464ed Merge branch 'develop/fix_nobreaks_calculator' into 'master'
Fix bug in calculator in "no breaks" case

Closes #134

See merge request cara/cara!128
2021-01-13 13:35:45 +00:00
Nicolas Mounet
1b61d07bcb Fixing bug onf start and finish time when there is no breaks (calculator) 2021-01-12 19:23:12 +01:00
Nicolas Mounet
ecba479c7c Adding a test without breaks for the model generator 2021-01-12 19:19:41 +01:00
Phil Elson
c8f39dc26b Track down the issue with the expert app and typing.
The visitor pattern in the StateBuilder means that it is easy to miss type changes in the dataclass definition.
2021-01-06 16:21:33 +01:00
Phil Elson
e9f9b7fde9 Fix up type annotation issues with the cara.state module. 2021-01-06 16:15:21 +01:00
Phil Elson
64fa2b60a4 Address and enable static type analysis checking of cara. 2021-01-06 16:15:21 +01:00
Nicolas Mounet
718a08ef1b Merge branch 'feature/improved-validation' into 'master'
Improve the validation of FormData

See merge request cara/cara!122
2021-01-06 14:36:40 +00:00
Phil Elson
69b882410a Pass all arguments through to the present_interval method, rather than pulling them from the state. This method can be made entirely indep at this point (static). 2020-12-17 21:51:21 +01:00
Phil Elson
6eadd9cf17 Simplified the present_interval algorithm to be entirely logic based. 2020-12-17 21:21:59 +01:00
Phil Elson
cf535c954a Two improved algorithms for present_interval. About to remove the more complex one. 2020-12-17 20:49:30 +01:00
Nicola Tarocco
d0156f5b54 Merge branch 'security/review' into 'master'
Add a CSRF token in the calculator form. Avoid printing an unescaped error (which may contain JS).

Closes #131

See merge request cara/cara!123
2020-12-17 16:02:01 +00:00
Phil Elson
bcad48f091 Add a CSRF token in the calculator form. Avoid printing an unescaped error (which may contain JS). 2020-12-17 14:11:07 +01:00
Phil Elson
4532fdce59 Improve the testing of the present intervals. We have a failing test as a result of a problem with the algorithm. I'm going to rewite and simplify the algorithm as a result. 2020-12-17 09:14:53 +01:00
Philip James Elson
5759e94b44 Merge branch 'develop/add-user-context' into 'master'
Auth: add user context

See merge request cara/cara!121
2020-12-16 12:59:18 +00:00
Nicola Tarocco
41376bbdd7 Auth: add user context 2020-12-15 16:49:17 +01:00
Phil Elson
9faf7c6134 Beef up the interval testing for model generator. Improve the validation of the FormData. 2020-12-14 15:12:20 +01:00
Philip James Elson
4715005b77 Merge branch 'fix/breaks-bug' into 'master'
Fixed lunch break bugs

See merge request cara/cara!120
2020-12-14 14:10:14 +00:00
Gabriella Azzopardi
f19127ad6c Fixed lunch break bugs 2020-12-14 14:10:13 +00:00
Philip James Elson
6208777d05 Merge branch 'develop/UI-updates' into 'master'
Updates to form UI

See merge request cara/cara!119
2020-12-10 19:38:55 +00:00
gaazzopa
8153065cd9 Generalised radio button selection 2020-12-09 21:46:15 +01:00
gaazzopa
5760b49c74 On back button restore venting options 2020-12-09 21:36:39 +01:00
gaazzopa
d9801553a7 Updated venting display in report 2020-12-09 21:17:48 +01:00
Andre Henriques
a825feeced update-user-guide-window 2020-12-09 19:55:13 +00:00
Andre Henriques
57af3bc1a5 update-quick-guide-window 2020-12-09 19:47:20 +00:00
gaazzopa
ce3b0f63d7 Intertwine changes of new features - window type and window venting 2020-12-09 19:11:21 +01:00
gaazzopa
be557c7665 Resolved conflicts in report.html.j2 2020-12-09 18:39:01 +01:00
gaazzopa
f173fd504b Resolved conflicts in calculator.form.html.j2 2020-12-09 18:37:29 +01:00
gaazzopa
c31c1b320f Tabbed ventilation divs 2020-12-09 18:36:44 +01:00
gaazzopa
afff8713a8 Updated venting UI 2020-12-09 18:36:44 +01:00
gaazzopa
bf23713c99 Fixed model to use venting in minutes 2020-12-09 18:36:44 +01:00
gaazzopa
be33f4070f Resolved conflicts in calculator.form.html.j2 2020-12-09 18:36:33 +01:00
gaazzopa
a91c6a4c90 Restructured form validation 2020-12-09 18:35:00 +01:00