Commit graph

731 commits

Author SHA1 Message Date
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
Andre Henriques
9571fa5e42 Error in the title 2020-11-19 13:17:06 +00:00
gaazzopa
afd3aa29ef Removed beta from version 2020-11-19 13:06:23 +01:00
gaazzopa
702fcb4f74 Added credits to homepage 2020-11-19 13:01:36 +01:00
Phil Elson
ffbe9baba6 Improve the class hierachy, and add an extra ExpertApp test. 2020-11-19 12:49:19 +01:00
gaazzopa
48028692f2 Added HSE logo 2020-11-19 12:47:20 +01:00
Phil Elson
ce4e886e54 Use a HTML output, rather than a stdout one. It produces better lookign visuals, and is less jumpy with an update to the html. 2020-11-19 12:45:49 +01:00
Phil Elson
1bb8bbb6e0 Move the results accordion to its own tab. 2020-11-19 12:44:39 +01:00
Phil Elson
12cb3d1427 Split the MultiModelView so that its data is being handled by the Controller (ExpertApp). 2020-11-19 12:44:39 +01:00
markus
26f621d5af use model presence-boundaries to determine time-interval of plot 2020-11-19 12:44:39 +01:00
markus
936b339edf fix pipeline 2020-11-19 12:44:39 +01:00
markus
fa9b87ca35 move tab-logic to MultiModelView 2020-11-19 12:44:39 +01:00
markus
0d68a6efd4 use widget of comparison_view 2020-11-19 12:44:39 +01:00
markus
455955c391 pre-package tabs and comparison into multi_model_view 2020-11-19 12:44:39 +01:00
markus
e0923d2e83 expose comparison plot canvas as property 2020-11-19 12:44:39 +01:00
markus
32e1548e2f move comparison plot to separate class 2020-11-19 12:44:39 +01:00
markus
23cc6d2f8c change "views" to "tab_views" 2020-11-19 12:44:39 +01:00
markus
c6a374d42f add working comparison tab 2020-11-19 12:44:39 +01:00
markus
202ab88ff9 add placeholder for comparison tab 2020-11-19 12:44:39 +01:00
gaazzopa
942f30276b Added cara logo to report 2020-11-19 12:10:26 +01:00
gaazzopa
7009598389 Added logo to banner and home page 2020-11-19 11:56:24 +01:00
gaazzopa
3ebef5b5b4 Added check that break time < activity time 2020-11-18 23:20:05 +01:00
gaazzopa
cd4d8e5d4e Added tabbing through form 2020-11-18 22:06:47 +01:00
gaazzopa
8eff591ba3 Added click of radio buttons on change of input 2020-11-18 20:53:27 +01:00
gaazzopa
445f927db0 Added clickable input fields for radio buttons 2020-11-18 20:22:26 +01:00
gaazzopa
b8e41a0d21 Added clickable labels for radio buttons 2020-11-18 19:57:53 +01:00
gaazzopa
e8db077e26 Added ACH placeholder 2020-11-18 19:33:11 +01:00
gaazzopa
e6a4194633 Keep # near IDs 2020-11-17 22:51:31 +01:00
gaazzopa
dfd166403d Merged start and finish time validation 2020-11-17 22:40:49 +01:00
Philip James Elson
ae977b26d6 Merge branch 'develop/UI-updates' into 'master'
Updates to form UI

See merge request cara/cara!94
2020-11-17 21:32:50 +00:00
gaazzopa
17ea2939a7 Added non-zero validation on form submission 2020-11-17 21:58:03 +01:00