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 |
|
gaazzopa
|
7a6f4701e2
|
Validate lunch break on activity time change
|
2020-12-02 11:42:50 +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 |
|
gaazzopa
|
8006f58166
|
Added comment
|
2020-11-30 17:39:41 +01:00 |
|
Andre Henriques
|
8ff4ff2878
|
correct report: exposed/infected times
|
2020-11-30 16:02:32 +00:00 |
|
gaazzopa
|
fa60b44966
|
Added data attributes for time windows
|
2020-11-27 16:50:01 +01: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 |
|
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 |
|
Philip James Elson
|
2a0311eec2
|
Merge branch 'develop/UI-updates' into 'master'
UI updates
See merge request cara/cara!106
|
2020-11-20 19:31:22 +00:00 |
|
gaazzopa
|
a841bf3923
|
Updated expert link
|
2020-11-20 19:10:19 +01:00 |
|
gaazzopa
|
7634d7408f
|
Updated code to allow for multiple affiliations
|
2020-11-20 17:36:11 +01:00 |
|
gaazzopa
|
0632227a79
|
Updated code to allow for multiple affiliations
|
2020-11-20 17:35:17 +01:00 |
|
gaazzopa
|
c45b54c245
|
Updated code to allow for multiple affiliations
|
2020-11-20 17:33:06 +01:00 |
|
gaazzopa
|
ffc6f7ecbc
|
Added acknowledgements
|
2020-11-20 17:16:37 +01:00 |
|
gaazzopa
|
7ed106570f
|
Added link to expert app
|
2020-11-20 16:18:09 +01:00 |
|
Philip James Elson
|
0fdfbd0eaf
|
Merge branch 'expert-app-modifs' into 'master'
Fix the logo in the expert-app
See merge request cara/cara!104
|
2020-11-20 12:27:21 +00:00 |
|
Philip James Elson
|
a54f163836
|
Merge branch 'default-activities-expert-app' into 'master'
change default activities
See merge request cara/cara!102
|
2020-11-20 12:26:45 +00:00 |
|
Philip James Elson
|
a0b72b69f6
|
Merge branch 'calculator_library' into 'master'
Added Library activity, seated, no talking!
See merge request cara/cara!103
|
2020-11-20 12:24:53 +00:00 |
|
Phil Elson
|
0d33c3cd08
|
Ensure that the application static files are available in Voila.
|
2020-11-20 13:22:13 +01:00 |
|
jdevine
|
90ae66af21
|
Added Library activity, seated, no talking!
|
2020-11-20 12:30:10 +01:00 |
|
Andre Henriques
|
a8d7d6e7b7
|
change default activities
|
2020-11-20 11:11:50 +00:00 |
|
Philip James Elson
|
ce446dad33
|
Merge branch 'expert-app-modifs' into 'master'
Use the CARA logo without CERN logo in the Expert App.
See merge request cara/cara!101
|
2020-11-20 10:45:38 +00:00 |
|
Phil Elson
|
ddc30e1ff9
|
Use the CARA logo without CERN logo in the Expert App.
|
2020-11-20 11:44:35 +01:00 |
|
Philip James Elson
|
20cd490437
|
Merge branch 'expert-app-modifs' into 'master'
minor modifs in expert app
See merge request cara/cara!98
|
2020-11-20 10:37:21 +00:00 |
|
Phil Elson
|
2075899c5e
|
Update the expert app to include a logo.
|
2020-11-20 11:24:25 +01:00 |
|
Phil Elson
|
de6137004c
|
Improve the layout system for the ventilation schemes on the ExpertApp.
|
2020-11-20 11:14:06 +01:00 |
|
Andre Henriques
|
04b49954f0
|
change title, add logo
|
2020-11-20 11:14:06 +01:00 |
|
Andre Henriques
|
102f22dc16
|
default back to 120
|
2020-11-20 11:14:06 +01:00 |
|
Andre Henriques
|
c59e7762de
|
delete 'aerosols'
|
2020-11-20 11:14:06 +01:00 |
|
Andre Henriques
|
8fa637a790
|
minor modifs in expert app
|
2020-11-20 11:14:06 +01:00 |
|
gaazzopa
|
cc4d51540c
|
Fixed link issue
|
2020-11-20 11:05:50 +01:00 |
|
gaazzopa
|
02e5d1fae4
|
Small fixes from merge 95
|
2020-11-20 11:05:04 +01:00 |
|
Philip James Elson
|
87cad3ead4
|
Merge branch 'develop/UI-updates' into 'master'
Updates to Form UI
Closes #78 and #111
See merge request cara/cara!95
|
2020-11-20 08:39:04 +00:00 |
|
Philip James Elson
|
da484c57df
|
Merge branch 'develop/logo' into 'master'
New logo
See merge request cara/cara!99
|
2020-11-20 08:06:52 +00:00 |
|
Philip James Elson
|
08ab5e0e57
|
Merge branch 'repeated-events-5' into 'master'
reduce repeated events to 5
See merge request cara/cara!100
|
2020-11-20 08:01:07 +00:00 |
|