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

672 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andre Henriques
a3ad121f71 typo in heading style 2021-05-03 15:11:45 +00:00
Philip James Elson
f0d8da7361 Merge branch 'author_citation' into 'master' 
Add authorship and citation to README.md

See merge request cara/cara!169
 2021-05-03 14:28:24 +00:00
Philip James Elson
e02396514e Merge branch 'develop/hours2time_in_concentration_plot' into 'master' 
Better xtick labels in concentration plots

See merge request cara/cara!165
 2021-05-03 14:27:30 +00:00
Nicolas Mounet
26d7ef9f5d Replacing the use of hours2timestring by datetimes, in the x-axis of the plots generated in report_generator 2021-05-03 14:27:29 +00:00
Andre Henriques
54b2fc96ef add NTNU for Markus 2021-05-03 13:03:49 +00:00
Andre Henriques
7abd6dd65b Add authorship and citation to README.md 2021-05-03 12:57:47 +00:00
Andre Henriques
99152f7e44 Merge branch 'fix/license_headers' into 'master' 
Compromise on the header information added to key files

See merge request cara/cara!168
 2021-05-03 12:46:21 +00:00
Phil Elson
05dffa3f50 Compromise on the header information added to key files, ensuring that the details are correct, but are canonically defined in one place. 2021-05-03 13:46:03 +02:00
Andre Henriques
58006ebe5f Merge branch 'feature/OSS_license' into 'master' 
Prepare the repository for an Apache 2.0 license

See merge request cara/cara!161
 2021-05-03 11:38:43 +00:00
Gabriella Azzopardi
5a6711be3e Merge branch 'feature/md_text_blocks' into 'master' 
Implement common markdown blocks infrastructure

See merge request cara/cara!166
 2021-05-03 11:33:18 +00:00
Philip James Elson
49c28aaa98 Implement common markdown blocks infrastructure 2021-05-03 11:33:17 +00:00
Andre Henriques
bef6602cc1 Merge branch 'link-cara-parameters' into 'master' 
Update userguide with link to existing cara parameters

Closes #158

See merge request cara/cara!164
 2021-04-29 22:05:22 +00:00
Andre Henriques
b79440512d Update userguide with link to existing cara parameters 2021-04-29 22:05:21 +00:00
Phil Elson
93d91e0d4d Review actions. 2021-04-29 23:56:33 +02:00
Phil Elson
5eb87372be Update the pages based on the open source requirements. 2021-04-29 23:56:33 +02:00
Phil Elson
597a27eadc Prepare the repository for an Apache 2.0 license. 2021-04-29 23:56:33 +02:00
Nicolas Mounet
2d00bc859f Merge branch 'feature/model_vectorisation_pt2' into 'master' 
Vectorise PiecewiseConstant and WindowOpenings

See merge request cara/cara!159
 2021-04-29 04:35:10 +00:00
Phil Elson
8654cd5ed9 Review actions for vectorisation. 2021-04-28 20:10:35 +02:00
Philip James Elson
2a43eea709 Merge branch 'feature/shorter_url' into 'master' 
Clean up the FormData defaults and casting rules

Closes #143

See merge request cara/cara!155
 2021-04-21 14:07:52 +00:00
Philip James Elson
48b9c91f43 Clean up the FormData defaults and casting rules. Using this information we now shorten the FormData dictionary. The baseline form URL is now 490 characters compared to 1089 previously. Closes #143. 2021-04-21 14:07:50 +00:00
Philip James Elson
da5cbc6891 Merge branch 'feature/configurable_reports' into 'master' 
Allow theming of CARA (initially in the report only, to be extended later on)

Closes #157

See merge request cara/cara!160
 2021-04-21 14:06:09 +00:00
Phil Elson
cffbff0305 Fix the badly floating QR text, and address the extends vs implement comment for theme templates. 2021-04-16 21:09:22 +02:00
Phil Elson
14ca6d3b38 Restore the disclaimer in the base, but extend it in the CERN theme. 2021-04-15 21:53:26 +02:00
Phil Elson
9a17121d9e Allow theming of CARA (initially in the report only, to be extended later on). 2021-04-15 13:46:46 +02:00
Phil Elson
910ed4f3db Ensure that piecewise constant values all have the same shape. 2021-04-07 10:25:00 +02:00
Phil Elson
eccc57702d Vectorise PiecewiseConstant and WindowOpenings. 2021-04-07 10:19:20 +02:00
Nicolas Mounet
7152be47e6 Merge branch 'feature/model_vectorisation' into 'master' 
Begin to introduce vectorisation in the model

See merge request cara/cara!158
 2021-04-06 18:21:14 +00:00
Phil Elson
7ee8276fba Update some of the method return types based on the review. 2021-04-06 14:28:52 +02:00
Nicola Tarocco
3d3127845c Merge branch 'feature/zlib_url' into 'master' 
Shorten the form URL by compressing and b64 encoding it

See merge request cara/cara!147
 2021-04-06 12:01:22 +00:00
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
67df4495a5 Add the tests that went with the changes. 2021-04-01 18:18:34 +02:00
Phil Elson
c9fec0ac05 Rename the form element to calculator_version. 2021-04-01 18:17:43 +02:00
Phil Elson
eb2c4eff08 Handle virus vectorisation. 2021-03-28 08:18:35 +02:00
Phil Elson
e4e44bddd5 Implement vectorisation support for the ventilation schemes. 2021-03-28 07:35:42 +02:00
Phil Elson
9b836a6507 Handle arrays in the cache of the model by using the memoization library. Speeds up the single model case too. 2021-03-28 06:56:49 +02:00
Phil Elson
bb9b8657c6 Give some context of what cara.models represents. 2021-03-28 05:53:47 +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