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
Andre Henriques
cfc95bd1da
test merge procedure
2020-11-29 15:12:30 +00:00
gaazzopa
3f12a69168
Mark overlap between exposed and infected presence
2020-11-27 19:17:50 +01:00
gaazzopa
fa60b44966
Added data attributes for time windows
2020-11-27 16:50:01 +01:00
Philip James Elson
87cba1c6c3
Merge branch 'comparison-note' into 'master'
...
update-report-comparison-note
See merge request cara/cara!112
2020-11-27 13:44:36 +00:00
gaazzopa
2a6a7143bb
Added braces
2020-11-27 13:12:55 +01:00
gaazzopa
5c111085fb
Acknowledge removal of lunch break
2020-11-26 16:14:54 +01:00
gaazzopa
8041cb3da6
Remove finish time error when not required
2020-11-26 16:04:26 +01:00
gaazzopa
f4795a6198
Fixed breaks length error location
2020-11-26 15:57:57 +01:00
gaazzopa
521d2543c4
Lunch times must be within activity times
2020-11-26 15:52:11 +01:00
jdevine
92463a3ed2
changed position and font size for scenario notes
2020-11-26 15:42:17 +01:00
Andre Henriques
c7a38d1399
update-report-comparison-note
2020-11-26 10:27:20 +00:00
Phil Elson
1934fba291
Merge branch 'feature/report-scenarios'
...
* feature/report-scenarios:
Fix typos in the calculator report regarding alternative scenarios.
minor tweaks to alternative scenario text
Refine the logic for the calculation of alternative scenarios in the calculator report.
updated following diff comments
moved legend, added dashed cases, changed scenario names a little
added hyperlink to rules warning
changed warning to be generic
added dashed line for FFP2 comparison
added multiple scenarios to calculator and simple rules violation warning
Implement alternative scenarios infrastructure for the calculator.
2020-11-26 09:51:43 +01:00
Phil Elson
f5a8c2d477
Fix typos in the calculator report regarding alternative scenarios.
2020-11-26 09:51:14 +01:00
jdevine
0957987740
minor tweaks to alternative scenario text
2020-11-26 09:29:31 +01:00
Phil Elson
df034b7145
Refine the logic for the calculation of alternative scenarios in the calculator report.
2020-11-26 08:18:13 +01:00
jdevine
9fa6c4cd87
updated following diff comments
2020-11-25 23:45:05 +01:00
gaazzopa
5dbb5e87a4
Added window types and window width
2020-11-25 19:51:32 +01:00
Andre Henriques
1f9ecf15d5
Update user guide
2020-11-25 11:13:58 +00:00
jdevine
598a845434
moved legend, added dashed cases, changed scenario names a little
2020-11-24 12:09:12 +01:00
jdevine
c82f8e611a
added hyperlink to rules warning
2020-11-23 18:17:10 +01:00
jdevine
48e7398c7b
changed warning to be generic
2020-11-23 18:12:06 +01:00
jdevine
3cf41c5004
added dashed line for FFP2 comparison
2020-11-23 18:10:04 +01:00
jdevine
3b8c10c8c3
added multiple scenarios to calculator and simple rules violation warning
2020-11-23 15:43:55 +01:00
Nicolas Mounet
a15ee2981c
Adding hinged windows in models (WindowOpening class)
2020-11-23 15:29:23 +01:00
Nicolas Mounet
595289c957
Adding two ventilation tests (sliding/hinged windows)
2020-11-23 15:23:14 +01:00
Gabriella Azzopardi
e8c80ec04f
Merge branch 'develop/lunch_coffee_bug' into 'master'
...
Correction of lunch/coffee breaks bug in COVID calculation
Closes #106
See merge request cara/cara!107
2020-11-23 12:32:05 +00:00
Nicolas Mounet
8c093e6d43
Different splitting for coffee breaks w.r.t lunch, as a function of the fraction of the total time spent before lunch (from P. Elson / G. Azzopardi)
2020-11-23 11:35:10 +01:00
Nicolas Mounet
a325a34d66
Adding test with unbalance between time before and after lunch (for calculator)
2020-11-23 11:33:36 +01:00
Nicolas Mounet
a427898126
Improvement of the coffee breaks implementation (avoiding too much logic in report generation) - thanks to P. Elson
2020-11-23 09:21:31 +01:00
Philip James Elson
e7268a7be4
Merge branch 'superscript-guide-calc' into 'master'
...
Correct superscript character in quick guide
See merge request cara/cara!108
2020-11-23 06:04:11 +00:00
Andre Henriques
f8332fede4
correct superscript character in quick guide
2020-11-21 16:04:44 +00:00
Nicolas Mounet
3ee7931a6e
Correction of the bug on coffee breaks in calculator
2020-11-21 11:11:58 +01:00
Nicolas Mounet
80ead5e58d
New tests for long/many coffee breaks (test_model_generator.py)
2020-11-21 11:06:25 +01:00
