Commit graph

431 commits

Author SHA1 Message Date
Luis Aleixo
24b3eba422 fixed bug on displaying inf. probability > 99.9% 2024-03-11 13:45:41 +01:00
Luis Aleixo
5e9d6501ae added cast to int when fetching env. variables 2024-03-11 13:44:58 +01:00
Luis Aleixo
c5963a978a Added timeout to fetch method 2024-03-06 14:26:35 +01:00
Luis Aleixo
c8cc0b0908 handled environment variables to be consistent 2024-03-05 17:03:19 +01:00
Nicola Tarocco
ddfe0b660e
tests: make report generation time limit configurable 2024-02-27 21:17:46 +01:00
Luis Aleixo
55850f9971 Merge branch 'feature/profiler' into 'master'
Profiler

See merge request caimira/caimira!480
2024-02-16 15:29:15 +01:00
Luis Aleixo
f9d2fc39ec mypy fix 2024-02-12 12:10:33 +01:00
Nicola Tarocco
00dc79f492
add PyInstrument and cProfile profilers 2024-02-11 17:40:47 +01:00
Luis Aleixo
c78ffadc02 updated qa to prod in data service fetch 2024-01-31 16:39:36 +01:00
Luis Aleixo
38376857fa modified activity types 2024-01-31 11:50:29 +01:00
Luis Aleixo
7199143257 removed authentication methods and tests for data service 2024-01-31 11:50:12 +01:00
Luis Aleixo
d09d6f0ec8 methods updated to reflect changes 2024-01-26 10:30:59 +01:00
Luis Aleixo
b498e776f7 updated data registry to reflect changes in test data service 2024-01-26 10:30:37 +01:00
Luis Aleixo
2deba13950 bugfix 2023-12-22 08:37:41 +00:00
Andre Henriques
45b81b1761 Merge branch 'feature/inject-data-service' into 'master'
inject data registry instance instead of static config

Closes #365

See merge request caimira/caimira!476
2023-12-20 14:44:25 +01:00
Luis Aleixo
ddecd91a85 increased version 2023-12-20 13:20:01 +00:00
Luis Aleixo
17a5fa6316 Merge branch 'feature/resizable_histogram' into 'master'
Result uncertainties resizable

See merge request caimira/caimira!477
2023-12-15 14:49:04 +01:00
Luis Aleixo
d3daca23d3 updated enum values and removed fixme references 2023-12-14 15:44:39 +01:00
Nicola Tarocco
00ff1af71d fix enums for data service 2023-12-14 15:34:08 +01:00
Luis Aleixo
d79ef934cb finished injection of data_service param 2023-12-14 15:34:08 +01:00
Luis Aleixo
20e8bf1df7 added data_service attr where needed 2023-12-14 15:34:08 +01:00
Nicola Tarocco
2abdd130cf config: remove Ref: config parsing 2023-12-14 15:34:08 +01:00
Nicola Tarocco
bb51eaa360 config: inject data registry instance instead of static config
* closes #365
2023-12-14 15:34:08 +01:00
Luis Aleixo
e0867f1b27 updated minor version 2023-12-14 14:49:28 +01:00
Luis Aleixo
23c8959244 fixed bug related to specific breaks 2023-12-14 14:49:06 +01:00
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
Nicolas Mounet
1f90d08163 Multiplying all emission rate values by 0.305 (average of uniform distribution of f_inf - 0.01 to 0.6) in test_monte_carlo_full_models, to adapt it to f_inf now included in emission rate 2023-12-01 07:35:07 +01:00
Nicolas Mounet
605a2d3fb7 Adapting test_full_algorithm to new concentration with f_inf included (f_inf and HI displaced in SimpleConcentrationModel) 2023-12-01 07:33:26 +01:00
Nicolas Mounet
5b4345e40a Multiplying all known concentrations in test_exposure_model by f_inf=0.5, as concentration is now with f_inf included 2023-12-01 07:32:03 +01:00
Nicolas Mounet
b39131c14c Putting f_inf in emission rate, in models.py, and removing it from dose computation 2023-12-01 07:30:29 +01:00
Luis Aleixo
d70029d0ed Merge branch 'feature/CO2_fit' into 'master'
Fit ventilation and exhalation rates on CO2 sensor data

See merge request caimira/caimira!444
2023-11-22 15:43:00 +01:00
Luis Aleixo
f6abdc91c6 merged tests (custom and fixed) 2023-11-22 14:45:57 +01:00
Luis Aleixo
15e792a3ee modified UI text for CO2 file upload 2023-11-22 14:45:26 +01:00
Luis Aleixo
eca8e035c4 added test for natural and mechanical ventilation fitting algorithm 2023-11-22 10:15:04 +01:00
Nicola Tarocco
6cad72356d
data service: add JWT expiration validation 2023-11-21 14:34:05 +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
0fb4cd895e replaced Population class by simplePopulation on CO2DataModel method 2023-11-21 09:43:29 +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
76ed60aaac updated models.py 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
61fc627e35 added CO2 data class 2023-11-21 09:40:26 +01:00
Luis Aleixo
36d105b358 updated version 2023-11-17 11:38:15 +01:00
Luis Aleixo
34449788cc added # type: ignore annotations and modified default precise activity 2023-11-17 09:16:33 +01:00
Nicola Tarocco
035190564c
refactor data service 2023-11-16 16:11:49 +01:00
Luis Aleixo
e0714d6aad added module init 2023-10-26 17:11:16 +02:00
Luis Aleixo
3f75fc77cd injected parameters in models, model and report generator 2023-10-26 16:29:20 +02:00