pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
607 commits 24 branches 13 tags 17 MiB
Commit graph

370 commits

Author SHA1 Message Date
Phil Elson
42e64c3064 Fix the disclaimer text which I broke in https://gitlab.cern.ch/cara/cara/-/merge_requests/141/ 2021-03-03 19:53:43 +01:00
Phil Elson
d4a33b546b Add a disclaimer about the repository, and remove the inaccurate GPL statement. 2021-03-03 16:55:42 +01:00
Nicola Tarocco
18af16f749 Merge branch 'feature/oidc-nginx' into 'master' 
Implement authentication through nginx's ngx_http_auth_request_module module

See merge request cara/cara!139
 2021-03-02 17:54:13 +00:00
Phil Elson
28f7b678d7 Address remaining review actions. 2021-03-02 18:43:01 +01:00
Gaby Azzopardi
efb17a05cb Specified intended users of CARA 2021-03-02 15:09:53 +01:00
Phil Elson
8611cdef4d Improve the auth-service to encode the session information into a single secure cookie that cara can read. 2021-03-01 18:45:18 +01:00
Gabriella Azzopardi
2997607e60 Automatic report regeneration 2021-03-01 15:19:15 +00:00
Phil Elson
85a378691e Implement OIDC through nginx's ngx_http_auth_request_module module. 2021-02-26 22:08:05 +01:00
Gabriella Azzopardi
3b620b0be0 Refine the form attributes & values in readiness for exposing a public perma-URL 2021-02-18 10:33:37 +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
0dcea6a9d0 upadate_thanks 2021-02-04 09:05:58 +00:00
Andre Henriques
c8b351adff update_authors_Nico 2021-02-03 14:58:21 +00:00
James Devine
c90507f235 removed individual date option 2021-01-27 17:02:31 +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
Gaby Azzopardi
69f4ae4698 Pi display fix 2021-01-15 10:24:35 +01: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
Nicolas Mounet
1b61d07bcb Fixing bug onf start and finish time when there is no breaks (calculator) 2021-01-12 19:23:12 +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
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
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
Gabriella Azzopardi
f19127ad6c Fixed lunch break bugs 2020-12-14 14:10:13 +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
Nicola Tarocco
a8f8b94414 Fix Piwik URL 
* closes #49
 2020-12-07 22:16:02 +01:00