Commit graph

304 commits

Author SHA1 Message Date
Luis Aleixo
503a831f41 result uncertainties resizable 2023-12-13 15:57:57 +01:00
Luis Aleixo
2244a1dd19 updated concentration and dose labels to "Infectious Respiratory Particles" 2023-12-13 09:46:30 +01:00
Luis Aleixo
600cee9c9e minor version update 2023-12-12 16:23:07 +01:00
Nicolas Mounet
d53d62f3f3 Renaming finf in test_full_algorithm 2023-12-12 16:23:07 +01:00
Luis Aleixo
15e792a3ee modified UI text for CO2 file upload 2023-11-22 14:45:26 +01:00
Luis Aleixo
afdc3cbec8 added explanative text and tooltip question mark 2023-11-21 09:57:21 +01:00
Luis Aleixo
3da67c8c95 add superclass FormData for CO2FormData and VirusFormData 2023-11-21 09:45:42 +01:00
Luis
ac2e8b799d Added validation for the case the header is not a string 2023-11-21 09:45:41 +01:00
Luis
43a6b6e0a6 moved interface methods from init file to co2_model_generator 2023-11-21 09:45:41 +01:00
Luis
96a2b614dc updated validation error message 2023-11-21 09:43:30 +01:00
Luis Aleixo
9245166c4a simplified logic for building a CO2 model 2023-11-21 09:43:29 +01:00
Luis Aleixo
446cc88345 removed unused parameters 2023-11-21 09:43:29 +01:00
Luis Aleixo
2c8819934b updated blocking variable name 2023-11-21 09:43:29 +01:00
Luis Aleixo
f05d48221f updated jquery methods namely on the finding mechanism 2023-11-21 09:43:29 +01:00
Luis Aleixo
d377d6ae94 modified procedure to download CO2 template file 2023-11-21 09:43:29 +01:00
Luis Aleixo
3dc0364d2e optimised validation method 2023-11-21 09:43:29 +01:00
Luis Aleixo
58926b7163 updated no file error label 2023-11-21 09:43:29 +01:00
Luis Aleixo
2992b270ff removed ventilation values from plot 2023-11-21 09:43:29 +01:00
Luis Aleixo
9696d413bd deleted input value (not necessary) 2023-11-21 09:43:28 +01:00
Luis Aleixo
5f4a9c3702 added predictive CO2 line and time labels 2023-11-21 09:43:28 +01:00
Luis Aleixo
c83b5cdcab added correct pelt suggestion for transition times 2023-11-21 09:43:28 +01:00
Luis Aleixo
69c1c10f6e modified fitting label and handled error display 2023-11-21 09:43:28 +01:00
Luis Aleixo
f64aeb8c22 replaced more JavaScript entries with jQuery 2023-11-21 09:43:28 +01:00
Luis Aleixo
b0d94f2318 formatting issues and introduction of pelt algorithm to display suggested transition times 2023-11-21 09:43:28 +01:00
Luis Aleixo
1c8775c807 back-end optimizations using heritage 2023-11-21 09:43:28 +01:00
Luis Aleixo
965b931773 validation on the excel file given as input (using SheetJS) 2023-11-21 09:43:27 +01:00
Luis Aleixo
6aa485c3d8 use more css classes 2023-11-21 09:43:27 +01:00
Luis Aleixo
16eac4101a added error handling on valid excel files and replaced plain javascript with jquery calls 2023-11-21 09:43:27 +01:00
Luis Aleixo
effc606fc9 replaced alert message on file upload 2023-11-21 09:43:27 +01:00
Luis Aleixo
ab0ec4c4ca version update and UI bugfix on form submission 2023-11-21 09:43:27 +01:00
Luis Aleixo
7da8cc438e back-end updates for co2 logic 2023-11-21 09:42:16 +01:00
Luis Aleixo
7e29c0c5cf ui modifications on js logic 2023-11-21 09:42:16 +01:00
Luis Aleixo
6581586982 ui modifications on html components 2023-11-21 09:42:15 +01:00
Luis Aleixo
caeaa8c39e renamed clear fitting algorithm method 2023-11-21 09:42:15 +01:00
Luis Aleixo
36d7cc0c3f updated one text entry and variable declaration on JS 2023-11-21 09:42:15 +01:00
Luis Aleixo
e861f6ac4e deal with modal button labels and pre-selected ventilation options 2023-11-21 09:42:15 +01:00
Luis Aleixo
a80c804832 added visualisation for ach table in form and report 2023-11-21 09:42:15 +01:00
Luis Aleixo
780467c195 simplified the way to select previous ventilations 2023-11-21 09:42:15 +01:00
Luis Aleixo
ddfe158467 added report data 2023-11-21 09:42:15 +01:00
Luis Aleixo
be732da4ea form modifications - table format 2023-11-21 09:42:15 +01:00
Luis Aleixo
6c86238743 added ventilation option validations on form 2023-11-21 09:42:15 +01:00
Luis Aleixo
be684ee3a6 added back compatibility (form report -> calculator) 2023-11-21 09:42:14 +01:00
Luis Aleixo
1b8aa4f2c1 fixed download template by adding file to CERNBox resources 2023-11-21 09:42:14 +01:00
Luis Aleixo
7a01d39fba added additional ventilation option 2023-11-21 09:42:14 +01:00
Luis Aleixo
8329376a58 rebased and made respective changes 2023-11-21 09:41:24 +01:00
Luis Aleixo
8d2eb38025 edited form display 2023-11-21 09:41:23 +01:00
Luis Aleixo
33f4491195 added lines to generated plot 2023-11-21 09:41:23 +01:00
Luis Aleixo
147cfe757e UI modifications and CO2 fitting calculation on form side 2023-11-21 09:41:23 +01:00
Luis Aleixo
15d28e1711 added a way to download an excel template; added a preview feature to the display CO2 table 2023-11-21 09:41:23 +01:00
Luis Aleixo
210275fc3d added fixed intervals for all the ventilation types 2023-11-21 09:41:23 +01:00
Luis Aleixo
1217201a4d added missing script file 2023-11-21 09:41:23 +01:00
Luis Aleixo
8ff01f4137 added UI elements for CO2 calculations 2023-11-21 09:41:23 +01:00
Luis Aleixo
827327b70e removed unused references from report generator 2023-11-21 09:40:27 +01:00
Luis Aleixo
b79cb8779d fixed mypy errors 2023-11-21 09:40:27 +01:00
Luis Aleixo
106ceec1f9 added co2 model generator 2023-11-21 09:40:27 +01:00
Luis Aleixo
0518642bd4 adapted model generator to consider data from the co2 fitting 2023-11-21 09:40:27 +01:00
Luis Aleixo
ee989e17fe added server-side endpoint for CO2Data 2023-11-21 09:40:27 +01:00
Luis Aleixo
e75846a3b2 generate initial CO2 plot 2023-11-21 09:40:27 +01:00
Luis Aleixo
2faeabf05c ui modifications 2023-11-21 09:40:26 +01:00
Luis Aleixo
36d105b358 updated version 2023-11-17 11:38:15 +01:00
Luis Aleixo
3f75fc77cd injected parameters in models, model and report generator 2023-10-26 16:29:20 +02:00
Luis Aleixo
ac050ee49c adapted defaults from configuration file 2023-10-26 16:27:56 +02:00
Luis Aleixo
ef212f9455 moved data service to separate module and removed logic from caimira calculator module 2023-10-26 16:27:27 +02:00
Luis Aleixo
bb0bcebde8 fixed bug on precise activity 2023-10-20 12:40:06 +02:00
CERN\Andrejh
e0b027ef47 Merge branch 'update/commun_text_update' of https://gitlab.cern.ch/cara/cara into update/commun_text_update
# Conflicts:
#	caimira/apps/templates/about.html.j2
2023-10-05 10:10:15 +02:00
CERN\Andrejh
d71b6ad4f2 typos 2023-10-05 10:08:22 +02:00
CERN\Andrejh
febc66af09 additiobal updates 2023-10-05 08:48:15 +02:00
CERN\Andrejh
1a7624fde2 about text update 2023-10-05 08:48:15 +02:00
Andre Henriques
19f4e2c188 update Acknowledgements 2023-10-05 08:48:15 +02:00
CERN\Andrejh
4257d835db additiobal updates 2023-10-04 17:54:42 +02:00
CERN\Andrejh
b5bb363a71 about text update 2023-10-04 17:49:34 +02:00
Luis Aleixo
6a9d0c0ec2 expert apps updates following new matplotlib release 2023-10-03 15:14:51 +02:00
Andre Henriques
dd29dbf473 update Acknowledgements 2023-10-03 12:02:00 +02:00
Luis Aleixo
4f1a497954 modified env var fetch method 2023-09-13 09:49:06 +02:00
Luis Aleixo
1d72ef7aa7 increased patch version 2023-09-05 10:17:43 +02:00
Nicolas Mounet
f8530d4724 Centering the interval for vl uncertainty computation in report generator -> improving test accuracy 2023-09-01 15:21:04 +02:00
Luis Aleixo
27da077493 added full vl value on key of viral load 2023-08-04 11:17:10 +02:00
Luis Aleixo
77143c13c0 added vl_data on percentiles 2023-08-03 16:16:26 +02:00
Luis Aleixo
1abfe3cfe5 added a method to manufacture conditional probability and send it in the report 2023-08-03 15:01:31 +02:00
Luis Aleixo
96e9aead44 removed manufacture viral load scenarios method and related references 2023-08-03 15:01:06 +02:00
Luis Aleixo
6622315dd9 changed mypy type 2023-07-31 17:33:44 +02:00
Luis Aleixo
7d338d3e2d separated vl method and added a test file 2023-07-28 17:39:17 +02:00
Luis Aleixo
fe60e1703f added mypy typing check 2023-07-28 17:39:17 +02:00
Luis Aleixo
b6051778eb modified method to calculate conditional probability 2023-07-28 17:39:16 +02:00
Luis Aleixo
8e877ec357 created a simple population class for the CO2 concentration model 2023-07-25 13:18:33 +02:00
Luis Aleixo
68bc8cc6a1 Merge branch 'feature/vl_dist' into 'master'
Propagate viral load distribution to front-end side

See merge request caimira/caimira!457
2023-07-19 18:32:05 +02:00
Luis Aleixo
e732fb48d7 data service: add toggle env var to make it optional 2023-07-19 11:39:39 +02:00
Luis Aleixo
c9a64a2d92 handled exceptions 2023-07-17 17:28:46 +02:00
Luis Aleixo
38587c43ef added the data service as an external component (class) 2023-07-17 17:28:09 +02:00
Luis Aleixo
9c33ac1df0 updated server-side logic 2023-07-17 17:28:09 +02:00
Luis Aleixo
6cc6121075 developed server side API connection to Service Data (WP3) 2023-07-17 17:28:09 +02:00
Luis Aleixo
43630cda2c added logarithm of viral load distribution to jinja variable 2023-07-14 11:23:42 +02:00
Luis Aleixo
2d1e8af30f added viral load distribution as a variable to display in the front-end side 2023-07-12 17:11:03 +02:00
Andre Henriques
f6579fb31a Merge branch 'feature/CO2_profile' into 'master'
CO₂ Concentration Plot

Closes #307 and #297

See merge request caimira/caimira!428
2023-06-16 14:58:58 +02:00
Luis Aleixo
96da4cc980 version update 2023-06-15 14:53:52 +02:00
Luis Aleixo
706c352392 removed unused methods 2023-06-13 16:00:30 +02:00
Luis Aleixo
f45ca3904d added logic with IntPiecewiseConstant for dynamic CO2 2023-06-13 15:58:27 +02:00
Luis Aleixo
a261ac4bf0 added method to combine different present intervals 2023-06-12 15:19:55 +02:00
Luis Aleixo
4f6a967864 added way to determine size of tooltip 2023-06-12 15:19:06 +02:00
Luis Aleixo
800578f031 adjustments to d3 plot 2023-06-12 15:19:06 +02:00