Nicolas Mounet
|
775339cdad
|
Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/expert_app_ventilation_temp
|
2020-11-10 21:10:37 +01:00 |
|
Philip James Elson
|
3a3358aa6d
|
Merge branch 'feature/new_input_options' into 'master'
Added new input options
Closes #68, #75, #55, and #81
See merge request cara/cara!75
|
2020-11-10 18:57:30 +00:00 |
|
gaazzopa
|
211ec92ada
|
HEPA min value is 0
|
2020-11-10 17:55:36 +01:00 |
|
gaazzopa
|
ef65039cad
|
Fixed label ID in form
|
2020-11-10 17:48:43 +01:00 |
|
gaazzopa
|
ec6ef6a156
|
Bumped up version and centralised version setting
|
2020-11-10 17:19:30 +01:00 |
|
gaazzopa
|
824ad5886b
|
Added HEPA amount to model and report
|
2020-11-10 17:08:07 +01:00 |
|
gaazzopa
|
1cc73d4fbc
|
Added HEPA amount option to form
|
2020-11-10 16:59:05 +01:00 |
|
gaazzopa
|
154754000e
|
Fixed mask type in baseline model
|
2020-11-10 16:44:03 +01:00 |
|
gaazzopa
|
7af010d2f5
|
Added debug option in form
|
2020-11-10 16:33:23 +01:00 |
|
gaazzopa
|
5e26e0196e
|
Added mask option and fixed display in report
|
2020-11-10 16:32:34 +01:00 |
|
Nicolas Mounet
|
f348a0c7c5
|
Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/expert_app_ventilation_temp
|
2020-11-10 09:19:11 +01:00 |
|
Philip James Elson
|
050c9fd9ba
|
Merge branch 'develop/refine_time_mesh_for_temp' into 'master'
Refine the time mesh for Geneva temperatures
Closes #72
See merge request cara/cara!70
|
2020-11-10 07:33:31 +00:00 |
|
Philip James Elson
|
a11762eb73
|
Merge branch 'develop/form-updates' into 'master'
Updates to UI form
Closes #69 and #64
See merge request cara/cara!72
|
2020-11-10 06:30:23 +00:00 |
|
Nicolas Mounet
|
f5f7eea084
|
Adding choice of temperature (including hourly time-dependence) in expert app
|
2020-11-09 20:57:01 +01:00 |
|
Nicolas Mounet
|
4f502b4b55
|
Expert app: HEPA -> Mechanical; starting time scale at first presence time; minor change in temperatures and in y scale
|
2020-11-09 20:54:20 +01:00 |
|
gaazzopa
|
e7d9ba96c8
|
Office option interchangeable with meeting
|
2020-11-09 20:02:04 +01:00 |
|
gaazzopa
|
79ca14d088
|
Added report html title
|
2020-11-09 19:58:18 +01:00 |
|
gaazzopa
|
0b608ebc5d
|
Finish time must be after start time
|
2020-11-09 19:55:06 +01:00 |
|
Nicolas Mounet
|
6dacddedbe
|
Improve readability of tests; adding 2 end-to-end tests (on infection probability)
|
2020-11-09 18:32:56 +01:00 |
|
Nicolas Mounet
|
ddbfbf2631
|
GenevaTemperatures refined in the proper way in data.py
|
2020-11-09 17:22:15 +01:00 |
|
Nicolas Mounet
|
e63b4c9e6a
|
Adding cara/data.py (forgotten in previous commit)
|
2020-11-09 17:17:03 +01:00 |
|
Nicolas Mounet
|
c264e6bfc2
|
Moving Geneva temperature from cara/models.py to cara/data.py
|
2020-11-09 17:11:26 +01:00 |
|
Nicolas Mounet
|
87c2a9bebd
|
Adding refine method (with linear interpolation) in PiecewiseConstant class
|
2020-11-09 16:08:58 +01:00 |
|
Nicolas Mounet
|
d56731cebc
|
Adding a test of the interpolation in the PiecewiseConstant.refine method
|
2020-11-09 16:02:11 +01:00 |
|
Andre Henriques
|
4bc097686c
|
Merge branch 'patch-1' into 'master'
Update README.md
See merge request cara/cara!69
|
2020-11-09 13:01:59 +00:00 |
|
Andre Henriques
|
15529f18e7
|
Update README.md
|
2020-11-09 13:01:58 +00:00 |
|
Nicolas Mounet
|
225324cc5b
|
Changing default mesh of temperatues to one point every 6 minutes (Geneva temperature)
|
2020-11-09 12:39:16 +01:00 |
|
Nicolas Mounet
|
5a5de009bc
|
Adding a test to that a finer mesh has no impact in itself
|
2020-11-09 12:37:40 +01:00 |
|
Philip James Elson
|
44b1c60ab5
|
Merge branch 'writteninstructions' into 'master'
Detailed user instructions
See merge request cara/cara!67
|
2020-11-09 10:18:25 +00:00 |
|
Phil Elson
|
d02375c2e3
|
Reference the new calculator guide in the main README.
|
2020-11-09 11:16:20 +01:00 |
|
Phil Elson
|
c368ad4856
|
Renamed calculator user-guide, and broke sentences into lines for ease of maintenance.
|
2020-11-09 11:16:05 +01:00 |
|
James Devine
|
f94471f31a
|
Detailed user instructions
|
2020-11-09 10:55:39 +01:00 |
|
Nicolas Mounet
|
ca7f8745aa
|
Merge branch 'feature/n_windows' into 'master'
Allow WindowOpening to have more than one window of the given dimensions.
See merge request cara/cara!68
|
2020-11-09 08:51:10 +00:00 |
|
Phil Elson
|
8f973136e0
|
Allow WindowOpening to have more than one window of the given dimensions.
|
2020-11-09 09:43:47 +01:00 |
|
Philip James Elson
|
9f770b0887
|
Merge branch 'upstream/pizzazz2' into 'master'
Put the calculator form inside the CARA template.
See merge request cara/cara!66
|
2020-11-09 07:36:36 +00:00 |
|
Phil Elson
|
2b8f44b7dd
|
Use the new layout template for both the form and the index page.
|
2020-11-07 12:15:23 +01:00 |
|
Phil Elson
|
a235fb2f5d
|
Put the calculator form inside the CARA template.
|
2020-11-07 12:06:14 +01:00 |
|
Philip James Elson
|
1c4e24e5ba
|
Merge branch 'fix/date-format' into 'master'
Updated date format to european
Closes #66
See merge request cara/cara!65
|
2020-11-07 10:55:24 +00:00 |
|
gaazzopa
|
9fdfee1cb7
|
Updated date format to european
|
2020-11-07 11:52:01 +01:00 |
|
Philip James Elson
|
150b098e43
|
Merge branch 'upstream/pizzazz2' into 'master'
Re-format all of the html, javascript and CSS to make it easier to move around subsequently.
See merge request cara/cara!64
|
2020-11-07 10:37:36 +00:00 |
|
Phil Elson
|
55894263ac
|
Re-format all of the html, javascript and CSS to make it easier to move around subsequently.
|
2020-11-07 11:32:25 +01:00 |
|
Gabriella Azzopardi
|
7e7e89d45b
|
Merge branch 'fix/no-reset-form' into 'master'
Don't reset the ventilation visibility when we hit back in the browser.
See merge request cara/cara!57
|
2020-11-07 08:58:15 +00:00 |
|
Philip James Elson
|
e039ceff2a
|
Merge branch 'feature/usage-tracking' into 'master'
Add usage tracking for test-cara.web.cern.ch and cara.web.cern.ch.
See merge request cara/cara!63
|
2020-11-07 08:08:22 +00:00 |
|
Phil Elson
|
4b6e9c53c3
|
Add usage tracking for test-cara.web.cern.ch and cara.web.cern.ch.
|
2020-11-07 09:05:48 +01:00 |
|
Phil Elson
|
4f2fb894fa
|
Implement no-ventilation option in calculator.
|
2020-11-07 00:03:46 +01:00 |
|
Phil Elson
|
d4a0566782
|
Don't reset the ventilation visibility when we hit back in the browser.
|
2020-11-06 23:45:17 +01:00 |
|
Philip James Elson
|
ae691a5c12
|
Merge branch 'fix/volume-in-report' into 'master'
Use the Jinja templating engine to remove pre-formatting values
See merge request cara/cara!62
|
2020-11-06 22:44:17 +00:00 |
|
Phil Elson
|
641d236aa9
|
Prevent arbitrary code execution exploits.
|
2020-11-06 23:41:42 +01:00 |
|
Phil Elson
|
89f1e6e62c
|
Use the Jinja templating engine to remove pre-formatting values.
|
2020-11-06 23:32:25 +01:00 |
|
Philip James Elson
|
61ea8a8842
|
Merge branch 'enhancement/remove-temporary-form-dictionary-access' into 'master'
Enhancement/remove temporary form dictionary access
See merge request cara/cara!61
|
2020-11-06 22:16:22 +00:00 |
|