Gabriella Azzopardi
|
7bf3c07296
|
Merge branch 'master' into 'RESTwireframe'
# Conflicts:
# cara/apps/calculator/static/form.html
|
2020-11-05 10:50:14 +00:00 |
|
gaazzopa
|
f98a96f546
|
Finalised input validation and updated form with new fields
|
2020-11-05 11:36:36 +01:00 |
|
Philip James Elson
|
260af15781
|
Merge branch 'feature/form-to-model' into 'master'
Generate a model from the form
See merge request cara/cara!20
|
2020-11-05 10:12:44 +00:00 |
|
Phil Elson
|
f7853feb6f
|
Restructure the calculator app to have a strong separation between the form input and the form processing.
|
2020-11-05 11:05:40 +01:00 |
|
markus
|
cecd029142
|
Initial cara.calculator.model_generator implementation from @mrognlie.
|
2020-11-05 08:57:08 +01:00 |
|
Philip James Elson
|
2f61d2a264
|
Merge branch 'Calculator-report-page' into 'master'
Added foundations of calculator report page
See merge request cara/cara!18
|
2020-11-05 06:51:28 +00:00 |
|
gaazzopa
|
e4d5066c87
|
Added foundations of calculator report page
|
2020-11-04 22:18:08 +01:00 |
|
jdevine
|
825ec88025
|
UI update based on wireframe
|
2020-11-04 20:12:55 +01:00 |
|
Philip James Elson
|
241a1ae123
|
Merge branch 'HTML-form' into 'master'
Added foundations of HTML form
See merge request cara/cara!14
|
2020-11-04 10:25:07 +00:00 |
|
gaazzopa
|
5e5bc7ce5c
|
Connected result object to POST request and removed .DS_Store files
|
2020-11-04 11:11:52 +01:00 |
|
gaazzopa
|
86333d7188
|
Added foundations of HTML form
|
2020-11-04 09:39:53 +01:00 |
|
Philip James Elson
|
0d195cb4ce
|
Merge branch 'develop/exp_aerosols_order' into 'master'
Fix the implementation of models.Expiration
Closes #24
See merge request cara/cara!13
|
2020-11-03 18:30:02 +00:00 |
|
Nicolas Mounet
|
ed5e4980cd
|
Avoid dependency of Expiration aerosols on particle_sizes order, in cara/models.py
|
2020-11-03 17:32:06 +01:00 |
|
Nicolas Mounet
|
bc1053e49a
|
Adding test on expiration aerosols (should be independent on particle_sizes order)
|
2020-11-03 17:28:50 +01:00 |
|
Philip James Elson
|
e30c9c0993
|
Merge branch 'feature/calculator-infra' into 'master'
Add the POST endpoint and the infrastructure to allow the calculator form to be developed
See merge request cara/cara!12
|
2020-11-03 15:52:24 +00:00 |
|
Phil Elson
|
adfd4058d9
|
Add the POST endpoint and the infrastructure to allow the calculator form to be developed.
|
2020-11-03 16:40:00 +01:00 |
|
Philip James Elson
|
f2644a720d
|
Merge branch 'develop/nginx_proxy' into 'master'
Fix the rewrite of the old URL, and allow the build to be triggered correctly by the CI.
See merge request cara/cara!11
|
2020-11-03 12:26:01 +00:00 |
|
Phil Elson
|
8ddef2584b
|
Fix the rewrite of the old URL, and allow the build to be triggered correctly by the CI.
|
2020-11-03 13:22:32 +01:00 |
|
Philip James Elson
|
9ffc0e35c1
|
Merge branch 'develop/nginx_proxy' into 'master'
Put a reverse-proxy in front of the voila server to give us more flexibility
Closes #10
See merge request cara/cara!10
|
2020-11-03 11:50:21 +00:00 |
|
Phil Elson
|
ffa2e53994
|
Prepare the repository for having a separate calculator app.
|
2020-11-03 12:42:14 +01:00 |
|
Phil Elson
|
d44ae5501f
|
Put an nginx reverse-proxy in front of the voila server to give us more flexibility in how we present the endpoint.
|
2020-11-03 11:46:53 +01:00 |
|
Markus Kongstein Rognlien
|
cf2ca07768
|
Merge branch 'covid-calculator' into 'master'
Covid calculator
See merge request cara/cara!8
|
2020-10-28 09:40:58 +00:00 |
|
markus
|
b7bd89dcc8
|
remove empty cells
|
2020-10-27 16:07:17 +01:00 |
|
markus
|
cd50c4110f
|
revert to master-state
|
2020-10-27 16:06:39 +01:00 |
|
Markus Kongstein Rognlien
|
b48a296132
|
Merge branch 'pelson/improved_concentration_calculation' into 'master'
Re-work the time interval concept, and fix the concentration calculation for intervals
Closes #14
See merge request cara/cara!9
|
2020-10-27 15:02:34 +00:00 |
|
markus
|
5fdf55d9ed
|
padding tweaks
|
2020-10-27 15:16:14 +01:00 |
|
Phil Elson
|
b8b322849b
|
Code review.
|
2020-10-27 15:06:28 +01:00 |
|
Phil Elson
|
332f2414ad
|
Abstract the presence time as an interval.
|
2020-10-27 14:47:45 +01:00 |
|
Phil Elson
|
2a20bf834f
|
Improve the concentration calculation scheme by more strictly defining the time interval concept to be closed start and open end
|
2020-10-27 14:34:45 +01:00 |
|
markus
|
ab8c0702ef
|
add function for getting value
|
2020-10-27 11:51:49 +01:00 |
|
markus
|
afd6d4db58
|
fix double lunch-minute
|
2020-10-27 10:43:07 +01:00 |
|
markus
|
5c907455e3
|
preliminary notebook complete
|
2020-10-27 10:22:13 +01:00 |
|
Phil Elson
|
a70f899b52
|
Extract the concept of an interval for the Ventilation schemes, and correctly handle the time dependence of Ventilation in the concentration calculations.
|
2020-10-27 06:27:38 +01:00 |
|
Philip James Elson
|
943a65b063
|
Merge branch 'application_abstraction' into 'master'
Add infection probability calculation to the model
See merge request cara/cara!6
|
2020-10-26 19:34:19 +00:00 |
|
Phil Elson
|
739864cc28
|
Add infection probability calculation to the model, and introduce it into the model output in a rudimentary form.
|
2020-10-26 20:33:17 +01:00 |
|
Philip James Elson
|
55cf9820fa
|
Merge branch 'pelson/improved_concentration_calculation' into 'master'
Simplify (and fix) the concentration calculation.
See merge request cara/cara!7
|
2020-10-26 19:25:41 +00:00 |
|
Phil Elson
|
9e9f1a28bc
|
Fix a bug in the calculation of the concentration.
|
2020-10-26 20:21:15 +01:00 |
|
Phil Elson
|
4722a5511c
|
Simplify the concentration calculation.
|
2020-10-26 20:12:54 +01:00 |
|
Philip James Elson
|
d984866396
|
Merge branch 'application_abstraction' into 'master'
Fix the broken mask selection widget.
See merge request cara/cara!5
|
2020-10-26 13:38:35 +00:00 |
|
Phil Elson
|
568f7ca56b
|
Fix the broken mask selection widget.
|
2020-10-26 14:36:54 +01:00 |
|
Philip James Elson
|
5168020ed5
|
Merge branch 'application_abstraction' into 'master'
Implement all of the major model parameter widgets
See merge request cara/cara!4
|
2020-10-26 12:48:29 +00:00 |
|
Phil Elson
|
6463e04e71
|
Undo the change to the notebook.
|
2020-10-26 13:45:04 +01:00 |
|
Phil Elson
|
28ae62e040
|
Fix the Ventilation time units bug.
|
2020-10-26 13:42:44 +01:00 |
|
Phil Elson
|
a9d07ebb34
|
Fix the failing test, but without actually implemeting the necessary transactional behaviour.
|
2020-10-26 13:10:57 +01:00 |
|
Phil Elson
|
9037e68c31
|
Add names states for the Ventilation schemes, allowing their state to be persisted even if that scheme isn't currently active.
|
2020-10-26 11:12:16 +01:00 |
|
markus
|
2a7fa5b106
|
add elements for setting time, date and breaks
|
2020-10-26 09:57:33 +01:00 |
|
Philip James Elson
|
77a5808118
|
Merge branch 'application_abstraction' into 'master'
Abstract the model state so that we can mutate it conveniently in applications
See merge request cara/cara!3
|
2020-10-26 08:18:51 +00:00 |
|
Phil Elson
|
a95181612b
|
Implement most of the model parameters in widgets.
|
2020-10-26 08:21:31 +01:00 |
|
markus
|
786524a8eb
|
add padding between boxes
|
2020-10-22 16:24:15 +02:00 |
|
markus
|
3e3c0af9d7
|
add ventilation menu
|
2020-10-22 15:41:52 +02:00 |
|