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 |
|
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 |
|
Phil Elson
|
dd60c0ef23
|
Implement alternative scenarios infrastructure for the calculator.
|
2020-11-20 14:03:18 +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 |
|
Andre Henriques
|
2fb5797222
|
reduce repeated events to 5
|
2020-11-20 07:47:12 +00:00 |
|
Gabriella Azzopardi
|
738fa5ac3f
|
Merge branch 'master' into 'develop/logo'
# Conflicts:
# cara/apps/calculator/templates/calculator.form.html.j2
# cara/apps/templates/index.html.j2
|
2020-11-19 22:10:49 +00:00 |
|
gaazzopa
|
6dc2cb42e6
|
Title update
|
2020-11-19 23:08:06 +01:00 |
|
gaazzopa
|
78eeb9e7ad
|
Grayed-out unused inputs in form UI
|
2020-11-19 22:53:32 +01:00 |
|
gaazzopa
|
f302267bbe
|
Minor code changes
|
2020-11-19 19:59:18 +01:00 |
|
gaazzopa
|
75ffc84357
|
Minor code changes
|
2020-11-19 19:57:23 +01:00 |
|
gaazzopa
|
050b378482
|
Added logo cosmetic changes
|
2020-11-19 17:56:37 +01:00 |
|
Gabriella Azzopardi
|
c34070f926
|
Merge branch 'calc_page_title' into 'master'
Modification of calculator title
See merge request cara/cara!97
|
2020-11-19 15:19:34 +00:00 |
|
Philip James Elson
|
d05708ea37
|
Merge branch 'comparison-tab' into 'master'
Expert app scenario comparisons
See merge request cara/cara!89
|
2020-11-19 13:38:43 +00:00 |
|
Gabriella Azzopardi
|
d35af90e88
|
Merge branch 'Home_page_title' into 'master'
Error in the title
See merge request cara/cara!96
|
2020-11-19 13:37:57 +00:00 |
|
Andre Henriques
|
f35d44f615
|
Modification of calculator title
|
2020-11-19 13:20:53 +00:00 |
|