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 |
|
gaazzopa
|
e75d87cf8f
|
Added venting validation in form
|
2020-12-09 18:35:00 +01:00 |
|
gaazzopa
|
23706ea6cd
|
Updated app version to v1.2.0
|
2020-12-09 18:35:00 +01:00 |
|
gaazzopa
|
535ec2ce15
|
Updated baseline model
|
2020-12-09 18:35:00 +01:00 |
|
gaazzopa
|
0f98136172
|
Resolved conflicts in model_generator.py and report.html.j2
|
2020-12-09 18:34:44 +01:00 |
|
gaazzopa
|
aa62ee9981
|
Added venting to UI form
|
2020-12-09 18:33:23 +01:00 |
|
gaazzopa
|
230424edfc
|
Resolved conflict in form.js
|
2020-12-09 18:32:53 +01:00 |
|
Philip James Elson
|
b2b8938b9f
|
Merge branch 'develop/hinged_window' into 'master'
Hinged windows
Closes #95
See merge request cara/cara!109
|
2020-12-08 13:35:37 +00:00 |
|
Philip James Elson
|
647f62589b
|
Merge branch 'fix-piwkik' into 'master'
Fix Piwik URL
Closes #49
See merge request cara/cara!118
|
2020-12-07 21:19:17 +00:00 |
|
Nicola Tarocco
|
a8f8b94414
|
Fix Piwik URL
* closes #49
|
2020-12-07 22:16:02 +01:00 |
|
Philip James Elson
|
7be99d9494
|
Merge branch 'develop/UI-updates' into 'master'
Foundations for break times constrained within activity times
Closes #106
See merge request cara/cara!113
|
2020-12-03 19:25:41 +00:00 |
|
gaazzopa
|
a3054a2d17
|
Renaming and minor updating of code elements
|
2020-12-03 09:38:21 +01:00 |
|
Nicolas Mounet
|
e02e542eea
|
Merge branch 'develop/hinged_window' of https://gitlab.cern.ch/cara/cara into develop/hinged_window
|
2020-12-03 08:59:06 +01:00 |
|
Nicolas Mounet
|
9c885186ae
|
Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/hinged_window
|
2020-12-03 08:54:49 +01:00 |
|
gaazzopa
|
8873262e69
|
Added units to report
|
2020-12-02 22:13:04 +01:00 |
|
gaazzopa
|
1b0b56a873
|
Updated window types in report
|
2020-12-02 22:09:21 +01:00 |
|
gaazzopa
|
f55dffee60
|
Make obj argument consistent
|
2020-12-02 21:55:21 +01:00 |
|
gaazzopa
|
485aa3a3b0
|
Added ID to error span
|
2020-12-02 21:46:19 +01:00 |
|
gaazzopa
|
5282266bce
|
Restructured lunch time validation
|
2020-12-02 21:18:03 +01:00 |
|
Andre Henriques
|
f0033030e6
|
Update-user-guide
|
2020-12-02 19:14:29 +00:00 |
|
Andre Henriques
|
62716a0136
|
window type picture
|
2020-12-02 19:07:05 +00:00 |
|
Andre Henriques
|
837bd80f83
|
update-quick-guide
|
2020-12-02 19:04:04 +00:00 |
|
gaazzopa
|
675aedf938
|
Updated window type names
|
2020-12-02 19:18:45 +01:00 |
|
gaazzopa
|
7fdb6c6001
|
Merge branch 'develop/hinged_window' of https://gitlab.cern.ch/cara/cara into develop/hinged_window
|
2020-12-02 19:14:00 +01:00 |
|
gaazzopa
|
258446369c
|
Default sliding window and fix disable input logic
|
2020-12-02 19:12:47 +01:00 |
|