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

638 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phil Elson
e6fb1b9374 Use the compressed URL only for the QR code, and always present the full URL to the user/browser. 2021-04-06 12:19:07 +02:00
Phil Elson
eae08e81f9 Shorten the form URL by compressing and b64 encoding it. In a real-world example, the baseline URL goes from 1086 characters to 620. This is good for the resulting QR barcode. 2021-04-06 12:19:07 +02:00
Nicola Tarocco
ce6b4a4420 Merge branch 'feature/error_pages' into 'master' 
Improved webservice error handling

See merge request cara/cara!157
 2021-04-06 10:16:16 +00:00
Gabriella Azzopardi
e6c791699f Merge branch 'fix/logo_distortion' into 'master' 
Fix logo distortion issue and reduce the size of some logos rather than scaling them in the browser

See merge request cara/cara!154
 2021-04-01 19:20:17 +00:00
Philip James Elson
b437ef29b5 Fix logo distortion issue and reduce the size of the image downloaded when presenting the logo in small. 2021-04-01 19:20:17 +00:00
Gabriella Azzopardi
51d3b969b2 Merge branch 'fix/date_timezone' into 'master' 
Rename the report version to calculator_version, and report a timezone in the report

See merge request cara/cara!156
 2021-04-01 19:13:41 +00:00
Phil Elson
c9fec0ac05 Rename the form element to calculator_version. 2021-04-01 18:17:43 +02:00
Phil Elson
eb08e1f7ae Introduce a general error handler (including traceback still) and a 404 handler. 2021-03-26 22:13:33 +01:00
Phil Elson
69de1e372c Make the expert-app trigger the same 404 as the webservice. 2021-03-26 21:32:36 +01:00
Phil Elson
f530a52886 Rename the report version to calculator_version, and report a timezone with the date in the report (UTC). 2021-03-26 20:37:12 +01:00
Nicola Tarocco
2c12797962 Merge branch 'main/reduce_builds' into 'master' 
Simplify the build since we only need one application image for both the calculator and the expert app

See merge request cara/cara!152
 2021-03-26 10:28:22 +00:00
Nicola Tarocco
c87ec4f4cb Merge branch 'feature/user_domain_tracking' into 'master' 
Set a custom variable in piwik in order to track the authenticated user's origin/domain

Closes #146

See merge request cara/cara!153
 2021-03-26 10:28:09 +00:00
Phil Elson
71deccf6e0 Set a custom variable in piwik in order to track the authenticated user's origin/domain. 2021-03-26 10:22:58 +01:00
Phil Elson
989a7ddd6a Simplify the build since we only need one application image for both the caclulator and the expert app. 2021-03-26 08:50:51 +01:00
Philip James Elson
d5d583ad8b Merge branch 'fix/breaks_validation' into 'master' 
Removed infected break validation if breaks not separate

Closes #152

See merge request cara/cara!151
 2021-03-19 15:38:29 +00:00
Gabriella Azzopardi
5bd1c36d9b Removed infected break validation if breaks not separate 2021-03-19 15:38:27 +00:00
James Devine
a7eaad409f Merge branch 'feature/r-warning' into 'master' 
Added unacceptable red warning if expected new cases >1

Closes #151

See merge request cara/cara!149
 2021-03-17 16:11:27 +00:00
James Devine
00ac31ea47 Added unacceptable red warning if expected new cases >1 2021-03-17 16:11:27 +00:00
James Devine
4cfb0f80f8 Merge branch 'feature/control-rooms' into 'master' 
New activity profiles for control rooms

Closes #150

See merge request cara/cara!150
 2021-03-17 10:34:07 +00:00
James Devine
28b5d01ab3 New activity profiles for control rooms 2021-03-17 10:34:06 +00:00
Philip James Elson
4b7544acef Merge branch 'fix/calculator_UI' into 'master' 
Unrequire ventilation options not selected

See merge request cara/cara!148
 2021-03-12 13:57:00 +00:00
Gaby Azzopardi
09b7dbe4df Unrequire ventilation options not selected 2021-03-12 14:33:35 +01:00
Gabriella Azzopardi
754a7a28c4 Merge branch 'feature/userguide-as-html' into 'master' 
Remove the userguide from the README, and move it to a template. I've...

See merge request cara/cara!146
 2021-03-10 16:28:58 +00:00
Phil Elson
34378e3ca7 Remove the userguide from the README, and move it to a template. I've converted this using mistune (the tool that we use already in cara) to convert from markdown to html. 2021-03-10 15:52:45 +01:00
Nicolas Mounet
079a485545 Merge branch 'userguide-update-P.1' into 'master' 
Added note on P.1 transmission/Manaus antibody levels.

See merge request cara/cara!145
 2021-03-09 11:06:53 +00:00
James Devine
f77a828e6d Added note on P.1 transmission/Manaus antibody levels. 2021-03-09 11:06:53 +00:00
Philip James Elson
bf22611454 Merge branch 'develop/report_PI' into 'master' 
Update Pi display

See merge request cara/cara!144
 2021-03-09 10:55:53 +00:00
Gabriella Azzopardi
7ebdcaace5 Update Pi display 2021-03-09 10:55:52 +00:00
James Devine
12c3721996 Merge branch 'feature/virus_variant' into 'master' 
Feature: virus variant

Closes #133

See merge request cara/cara!130
 2021-03-09 08:38:48 +00:00
Nicolas Mounet
bf45490dfc Renaming variant into B117, and avoid calling it UK variant in forms and reports. Change its viral load back to std value, and increase infectivity to 1/30 2021-03-09 08:38:47 +00:00
Gabriella Azzopardi
e6937ea297 Merge branch 'fix/disclaimer' into 'master' 
Fix the disclaimer text which I broke in https://gitlab.cern.ch/cara/cara/-/merge_requests/141/

See merge request cara/cara!143
 2021-03-03 19:12:05 +00:00
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
Philip James Elson
a06e679393 Merge branch 'feature/openshift-templates-auth-service' into 'master' 
Add OpenShift templates for new auth service

See merge request cara/cara!142
 2021-03-03 18:45:36 +00:00
Nicola Tarocco
babde8b0bc Add OpenShift templates for new auth service 2021-03-03 19:37:18 +01:00
Andre Henriques
c4a288356a Merge branch 'feature/readme_disclaimer' into 'master' 
Add a disclaimer about the repository, and remove the inaccurate GPL statement

See merge request cara/cara!141
 2021-03-03 16:26:28 +00: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
Gabriella Azzopardi
d42d82c312 Merge branch 'doc/intended_users' into 'master' 
Specified intended users of CARA

See merge request cara/cara!140
 2021-03-02 14:12:30 +00: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
Philip James Elson
040ed05008 Merge branch 'nico/test-cara-dev' into 'master' 
Fixes to OpenShift templates

See merge request cara/cara!138
 2021-03-01 15:27:39 +00:00
Philip James Elson
559f380010 Merge branch 'feature/report-QR' into 'master' 
Automatic report regeneration

See merge request cara/cara!124
 2021-03-01 15:19:17 +00:00
Gabriella Azzopardi
2997607e60 Automatic report regeneration 2021-03-01 15:19:15 +00:00
Nicola Tarocco
175fc49338 Fixed to OpenShift templates 2021-03-01 16:15:47 +01:00
Phil Elson
85a378691e Implement OIDC through nginx's ngx_http_auth_request_module module. 2021-02-26 22:08:05 +01:00
Philip James Elson
1ff9a4d352 Merge branch 'form_cleanup' into 'master' 
Form cleanup

- Cleaning up of form elements to have consistent and more clear names 
    - Taken out of merge !124, including bug fix to unrequire ventilation fields when switching between types (closes issue #139)
- Minor update to form UI which:
    1. Only clears invalid inputs when changing ventilation option (closes issue #125)
    2. Avoids red borders when showing ventilation text inputs (closes issue #45)
- Updated calculator version to 1.4.0

See merge request cara/cara!132
 2021-02-18 10:33:38 +00: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
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