1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-16 00:00:03 +01:00
Commit graph

707 commits

Author SHA1 Message Date
Sonja Happ
c35acc8c2d move editing of simulation model (except for signal mappings) into dialog instead of separate frame, exclude file selection and upload for now 2020-02-05 11:45:59 +01:00
Sonja Happ
aefd73c398 compatibility with new react version and ES6 2020-02-05 11:43:45 +01:00
Sonja Happ
ec01ba7d8f remove a few lines from license header 2020-02-05 11:42:07 +01:00
Sonja Happ
d57cd81cb6 remove some console output 2020-02-05 11:38:54 +01:00
Sonja Happ
a38dc4b953 minor edits 2020-02-05 11:38:16 +01:00
Sonja Happ
26781f7c11 simulation model frame finally showing, there are still a lot of errors to fix 2020-02-03 17:24:03 +01:00
Sonja Happ
739aa3c073 add signal store and signal data manager 2020-02-03 13:24:41 +01:00
Sonja Happ
50cbcd3696 progress with simulation model 2020-01-28 16:50:23 +01:00
Sonja Happ
42ffff2d2d Merge branch 'example-dashboard' into develop
# Conflicts:
#	src/dashboard/dashboard.js
2020-01-28 14:23:55 +01:00
Sonja Happ
6fa61d07f8 initialize temporal widget as empty before it is overwritten with props widget 2020-01-28 14:18:02 +01:00
Sonja Happ
5ad2c98732 put widgets in the state of a dashboard and link them to WidgetStore, change the way widgets of a dashboard are aquired, remove unused function 2020-01-28 14:11:45 +01:00
Sonja Happ
925950fcbc remove a simulation item in the context menu 2020-01-28 14:10:11 +01:00
Sonja Happ
cfef3fb7e0 fix issue with FluxContainerConverter workaround 2020-01-28 14:03:20 +01:00
Laura Fuentes Grau
d954941d9f most widgets now editable again 2020-01-28 12:31:36 +01:00
Sonja Happ
8066cbb19c merge example-dashboard 2020-01-27 14:54:40 +01:00
Sonja Happ
95c7a86561 Remove one more componentWillUpdate #212 2020-01-27 14:26:11 +01:00
Sonja Happ
e88068923e Merge branch 'fix-react-lifecycles' into example-dashboard 2020-01-27 13:28:56 +01:00
Laura Fuentes Grau
0dc1365a83 wip: Cancel restores old dashboard 2020-01-25 18:57:56 +01:00
Laura Fuentes Grau
0bfeb325cb widgets are now resizable 2020-01-21 21:33:41 +01:00
Laura Fuentes Grau
10bb5c263f fixed edit bug 2020-01-21 13:46:28 +01:00
Laura Fuentes Grau
d40d5b2901 Merge branch 'example-dashboard' of git.rwth-aachen.de:acs/public/villas/web into example-dashboard 2020-01-21 10:28:46 +01:00
Laura Fuentes Grau
9516ced50c widgets are now rendered in edit mode 2020-01-21 10:26:52 +01:00
Sonja Happ
251aec38d9 fix icons of dashboard button group 2020-01-16 16:49:00 +01:00
Sonja Happ
6f4604c75e Removes componentWillUpdate and componentWillReceiveProps due conflicts with React's unsafe life cycles #212 2020-01-16 15:11:17 +01:00
Laura Fuentes Grau
374437dfad context menu now integrated into widget 2020-01-11 20:03:53 +01:00
Laura Fuentes Grau
b4343aaa78 wip: restore editability 2020-01-11 19:16:55 +01:00
Laura Fuentes Grau
60e82fbbff wip: restore editability 2020-01-06 18:27:56 +01:00
Laura Fuentes Grau
7fcbe73796 wip: add and edit widgets 2020-01-02 18:24:33 +01:00
Laura Fuentes Grau
2f6a6851c4 wip: make widgets editable 2019-12-26 18:37:28 +01:00
Laura Fuentes Grau
9190cd52e9 wip: edit widget panel now viewable 2019-12-17 11:46:14 +01:00
Laura Fuentes Grau
c662285037 wip: cleanup 2019-12-08 19:06:14 +01:00
Laura Fuentes Grau
508ad8918e wip: widgets are now viewable, to get the needed testdata switch to the example-dashboard branch in the backend 2019-12-03 13:55:34 +01:00
Sonja Happ
6a2201a59a Remove logging output and do not load simulator and scenarios upon login since they are loaded in their containers anyway 2019-11-28 16:17:25 +01:00
Sonja Happ
0895ad3c85 Major modifications in login data management:
- only token and currentUser are stored (and error msg if any)
- token and current User are stored in local storage and used by app.js
- placeholders in user edit dialogs are replaced by actual values (except for pw)
- UserStore is renamed to LoginStore to resolve naming confusion
- Error notifications are moved to react components instead of data managers/ dispatchers
- updateCurrentUser method was added in UserDataManager for updating own user #197
- cleanup of edit-own-user dialog #197
2019-11-28 16:01:17 +01:00
Sonja Happ
0646d85aa3 minor fix required after the last merge 2019-11-26 16:42:16 +01:00
Sonja Happ
7fc0ed2d5c Merge branch 'add-scenario-frame' into example-dashboard
# Conflicts:
#	src/dashboard/dashboard.js
2019-11-26 16:39:05 +01:00
Sonja Happ
04265d31d7 show only simulation models and dashboards that belong to currently selected scenario, remove users for now, show name of simulator in simulation model list 2019-11-26 16:36:33 +01:00
Sonja Happ
e50a43a569 Dashboards are now reachable via scenarios, removed example dashboard 2019-11-26 16:33:57 +01:00
Laura Fuentes Grau
a7fa55f32d wip: user component now rerenders after editing 2019-11-26 16:29:47 +01:00
Sonja Happ
20967006a4 use ButtonToolbar to place run button next to drop down menu 2019-11-26 16:27:27 +01:00
Sonja Happ
3aacba30be initial version of scenario frame (users not showing, no buttons tested) 2019-11-26 15:09:40 +01:00
Sonja Happ
e9d06d7a48 fix renaming from visualization to dashboard 2019-11-26 15:08:51 +01:00
Sonja Happ
5ab70f2bbd link to scenario only in first table column (name) 2019-11-26 14:27:42 +01:00
Sonja Happ
4bcebd29a4 remove logging 2019-11-26 14:27:06 +01:00
Sonja Happ
c7937486b2 remove logging, ? indicating start of parameter has to be contained in param 2019-11-26 14:26:42 +01:00
Laura Fuentes Grau
33cc47c178 fixed version bugs 2019-11-26 11:48:42 +01:00
Sonja Happ
3b3448e111 fix icon syntax in dashboard button group 2019-11-26 11:19:05 +01:00
Laura Fuentes Grau
ab714e6896 wip: dashboardA and widgets can be accessed but aren't rendered yet 2019-11-24 20:32:12 +01:00
Sonja Happ
cfb6cae688 fix a bug in RequestURL method 2019-11-19 11:24:03 +01:00
Sonja Happ
a9e0a8e7b6 Merge branch 'add-query-parameters-to-restdatamanager' into develop 2019-11-19 10:25:21 +01:00