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

50 commits

Author SHA1 Message Date
Sonja Happ
01edd65710 Scenario import and export working #216 2020-05-29 10:07:53 +02:00
Sonja Happ
704c36ab90 Move import logic from Iris to RestDataManager and object stores (to be tested!) 2020-05-28 11:27:21 +02:00
Sonja Happ
33fb73819d Merge branch 'develop' of git.rwth-aachen.de:acs/public/villas/web into develop 2020-04-27 11:48:29 +02:00
Sonja Happ
309084f73c add some todos 2020-04-27 11:48:22 +02:00
Laura Fuentes Grau
cf41a751c3 Cancel Editing now deletes newly dropped widgets 2020-04-24 14:57:10 +02:00
Laura Fuentes Grau
30f80ecdee Widget and Context Menu layering now works. Box Widget always has lowest z value when dropped: #165 & #79 2020-04-17 18:32:09 +02:00
Laura Fuentes Grau
8e7340b171 fix for PlotTable: PlotLegend now only created if signals are selected 2020-03-29 15:10:02 +02:00
Sonja Happ
9a3aa77851 name edit button of dashboard to edit layout 2020-03-27 14:19:40 +01:00
Sonja Happ
72cc4bfb7b fix license statement in all source files (closes #140) 2020-03-25 13:25:07 +01:00
Laura Fuentes Grau
10143c9198 wip: cancel edit now resets widget 2020-03-22 14:22:26 +01:00
Laura Fuentes Grau
a63c943d2f dashboard grid now editable 2020-03-16 17:02:51 +01:00
Sonja Happ
5c4afb686f store file of all widgets in state of dashboard 2020-03-13 17:24:36 +01:00
Sonja Happ
27d7ee0172 rename simulation model to component configuration 2020-03-12 12:26:56 +01:00
Sonja Happ
dfc538113f cleanup 2020-03-11 16:26:42 +01:00
Sonja Happ
bc089fdc89 rename simulator to infrastructure component (ic) 2020-03-11 15:53:18 +01:00
Sonja Happ
87be9069f1 WIP resolving dependencies of widgets on simulation models (use signals instead) 2020-02-19 15:04:37 +01:00
Sonja Happ
937bda8f1c re-organize widget and dashboard files 2020-02-19 09:04:50 +01:00
Sonja Happ
73d2bd4bd3 remove project and simulation files since Project and Simulation are no longer part of the data model 2020-02-05 11:58:45 +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
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
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
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
Laura Fuentes Grau
374437dfad context menu now integrated into widget 2020-01-11 20:03:53 +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
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
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
e9d06d7a48 fix renaming from visualization to dashboard 2019-11-26 15:08:51 +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
Laura Fuentes Grau
700c64fc1f wip #210 fixed query parameters, added an example dashboard file for testing 2019-11-12 15:17:40 +01:00
Sonja Happ
31ef67356d Fix for flux container converter #211 2019-11-12 09:49:18 +01:00
Sonja Happ
d03d7bacdc Make API calls in componentDidMount instead of componentWillMount, closes #84 2019-11-07 16:52:22 +01:00
Sonja Happ
7331bf517b cherry picked all changes from the cleanup-widgets branch and merged them to the new file/ folder structure and package versions; most likely, further fixes are required to make things work. Improves #209 and #205 2019-11-04 15:20:54 +01:00
Laura Fuentes Grau
5ecb254e13 renamed visualization to dashboard 2019-10-29 14:41:35 +01:00