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

633 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicola Tarocco
a8f8b94414 Fix Piwik URL 
* closes #49
 2020-12-07 22:16:02 +01:00
Philip James Elson
7be99d9494 Merge branch 'develop/UI-updates' into 'master' 
Foundations for break times constrained within activity times

Closes #106

See merge request cara/cara!113
 2020-12-03 19:25:41 +00:00
gaazzopa
a3054a2d17 Renaming and minor updating of code elements 2020-12-03 09:38:21 +01:00
Nicolas Mounet
e02e542eea Merge branch 'develop/hinged_window' of https://gitlab.cern.ch/cara/cara into develop/hinged_window 2020-12-03 08:59:06 +01:00
Nicolas Mounet
9c885186ae Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/hinged_window 2020-12-03 08:54:49 +01:00
gaazzopa
8873262e69 Added units to report 2020-12-02 22:13:04 +01:00
gaazzopa
1b0b56a873 Updated window types in report 2020-12-02 22:09:21 +01:00
gaazzopa
f55dffee60 Make obj argument consistent 2020-12-02 21:55:21 +01:00
gaazzopa
485aa3a3b0 Added ID to error span 2020-12-02 21:46:19 +01:00
gaazzopa
5282266bce Restructured lunch time validation 2020-12-02 21:18:03 +01:00
Andre Henriques
f0033030e6 Update-user-guide 2020-12-02 19:14:29 +00:00
Andre Henriques
62716a0136 window type picture 2020-12-02 19:07:05 +00:00
Andre Henriques
837bd80f83 update-quick-guide 2020-12-02 19:04:04 +00:00
gaazzopa
675aedf938 Updated window type names 2020-12-02 19:18:45 +01:00
gaazzopa
7fdb6c6001 Merge branch 'develop/hinged_window' of https://gitlab.cern.ch/cara/cara into develop/hinged_window 2020-12-02 19:14:00 +01:00
gaazzopa
258446369c Default sliding window and fix disable input logic 2020-12-02 19:12:47 +01:00
Nicolas Mounet
5476d5ed1d model_generator: raising error when window_type not specified with natural ventilation 2020-12-02 19:01:00 +01:00
Nicolas Mounet
e48d5c1900 Raising an error if window_width is not specified in HingedWindow; using np.rad2deg instead of manual rad to degrees conversion 2020-12-02 18:58:55 +01:00
Philip James Elson
d4e2c34941 Merge branch 'feature/exposure_overlap' into 'master' 
Illustrate  exposure in concentration plot

Closes #123 and #119

See merge request cara/cara!114
 2020-12-02 17:56:08 +00:00
gaazzopa
8f836faebb Display the presence of those exposed to the viral load during the activity in the CARA calculator. 2020-12-02 18:53:27 +01:00
Nicolas Mounet
db25fa9768 HingedWindow discharge_coefficient: improved readability of algorithm 2020-12-02 12:14:03 +01:00
Nicolas Mounet
40ea2fb584 Adding docstring for HingedWindow in models.py 2020-12-02 12:12:19 +01:00
Nicolas Mounet
5a58517367 Adding docstring for SlidingWindow in models.py 2020-12-02 12:11:09 +01:00
Nicolas Mounet
5c51621034 Adding docstring for discharge_coefficient property of WindowOpening; raise NotImplementedError 2020-12-02 12:10:14 +01:00
gaazzopa
7a6f4701e2 Validate lunch break on activity time change 2020-12-02 11:42:50 +01:00
Nicolas Mounet
8f43b137d9 Correcting a bug on angle computation (degrees required), for hinged windows 2020-12-01 18:54:56 +01:00
Nicolas Mounet
04980cc41b Replacing WindowOpening by Sliding Window in expert app 2020-12-01 15:33:48 +01:00
Nicolas Mounet
faac4c2893 Updating tests according to the change cd_b -> discharge_coefficient; no more WindowOpening in tests 2020-12-01 15:32:23 +01:00
Nicolas Mounet
205990c7b4 Renaming cd_b into discharge_coefficient; suppressing discharge_coefficient argument in WindowOpening class 2020-12-01 15:29:35 +01:00
Nicolas Mounet
4007a1aee8 Adding hinged windows to the calculator model_generator (plus test) 2020-12-01 15:28:14 +01:00
gaazzopa
43029283bf Merge branch 'develop/UI-updates' of https://gitlab.cern.ch/cara/cara into develop/UI-updates 2020-12-01 11:44:39 +01:00
gaazzopa
a1c6164014 Added comments 2020-12-01 11:44:09 +01:00
Gaby Azzopardi
4a2fc49f10 Fixed error display 2020-12-01 09:56:47 +01:00
Nicolas Mounet
0c46bac365 Merge branch 'develop/hinged_window' of https://gitlab.cern.ch/cara/cara into develop/hinged_window 2020-12-01 08:24:15 +01:00
Nicolas Mounet
508e6b725e Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/hinged_window 2020-12-01 08:23:42 +01:00
Nicolas Mounet
44a3204bef Improving implementation of Hinged and Sliding window (as subclasses of WindowOpening). Changed cd_b into discharge_coefficient everywhere. 2020-12-01 08:22:51 +01:00
Andre Henriques
3b2216a107 Merge branch 'test-merge-procedure' into 'master' 
test merge procedure

See merge request cara/cara!115
 2020-11-30 22:45:52 +00:00
Andre Henriques
d5f162a860 Merge branch 'user-guide-update-1' into 'master' 
Update user guides / documentation

See merge request cara/cara!111
 2020-11-30 20:15:40 +00:00
gaazzopa
8006f58166 Added comment 2020-11-30 17:39:41 +01:00
Gabriella Azzopardi
cab5172490 Merge branch 'master' into 'user-guide-update-1' 
# Conflicts:
#   cara/apps/calculator/templates/report.html.j2
 2020-11-30 16:26:45 +00:00
Andre Henriques
8ff4ff2878 correct report: exposed/infected times 2020-11-30 16:02:32 +00:00
Andre Henriques
07312313bf each sentence break 2020-11-30 15:47:49 +00:00
Andre Henriques
b3782f44bb minor corrections 2020-11-30 15:07:47 +00:00
Andre Henriques
475246b50b minor correction 2020-11-30 13:43:49 +00:00
Andre Henriques
366cb312a6 update-user-guide-2 2020-11-30 10:50:55 +00:00
Andre Henriques
ccc8429a6a fix confict 2020-11-30 10:14:31 +00:00
Andre Henriques
1682ffff1d update-report-disclaimer-text 2020-11-30 10:07:29 +00:00
Andre Henriques
dfe791bf0c update-html-disclaimer-text 2020-11-30 10:02:58 +00:00
Andre Henriques
71efcfadf7 update quick guide (following feedback from James) 
(cherry picked from commit 2b77374962650175801f5444c4f6221e1274cd5f)
 2020-11-30 09:40:55 +00:00
Nicolas Mounet
7e0e8a4e20 Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/hinged_window 2020-11-30 09:14:07 +01:00