diff options
| author | Michael Scherle | 2017-03-07 00:08:03 +0100 |
|---|---|---|
| committer | Michael Scherle | 2017-03-07 00:08:03 +0100 |
| commit | 5a024aaf236979dbbbdbd2e3c671b2810580deb5 (patch) | |
| tree | b81acc004c8aa7fbd413bf578f63599eff12df7a /modules-available/locationinfo/frontend | |
| parent | frontend: doorsing has now the ability to show overlays, but backend function... (diff) | |
| parent | API: getRoomTree recursive childs are now filtered out if the id is a duplica... (diff) | |
| download | slx-admin-5a024aaf236979dbbbdbd2e3c671b2810580deb5.tar.gz slx-admin-5a024aaf236979dbbbdbd2e3c671b2810580deb5.tar.xz slx-admin-5a024aaf236979dbbbdbd2e3c671b2810580deb5.zip | |
Merge branch 'location-info-panel' of git.openslx.org:openslx-ng/slx-admin into location-info-panel
Diffstat (limited to 'modules-available/locationinfo/frontend')
| -rw-r--r-- | modules-available/locationinfo/frontend/panel.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules-available/locationinfo/frontend/panel.html b/modules-available/locationinfo/frontend/panel.html index 9da9cbc8..f76a9f6d 100644 --- a/modules-available/locationinfo/frontend/panel.html +++ b/modules-available/locationinfo/frontend/panel.html @@ -103,7 +103,7 @@ function init() { var ids = getUrlParameter("id"); - $.getJSON("../../../api.php?do=locationinfo&action=roomtree&ids=" + ids, function (result) { + $.getJSON("../../../api.php?do=locationinfo&action=roomtree&id=" + ids, function (result) { generateLayout(result); setInterval(update,1000); @@ -163,13 +163,13 @@ function update() { if(lastPcUpdate ==null || (new MyDate().getTime()-lastPcUpdate.getTime()) > pcStateUpdateTime*1000){ - $.getJSON("../../../api.php?do=locationinfo&action=pcstates&ids=" + roomidsString, function (result) { + $.getJSON("../../../api.php?do=locationinfo&action=pcstates&id=" + roomidsString, function (result) { updatePcStates(result); lastPcUpdate = new MyDate(); }); } if(lastTimeTableUpdate ==null || (new MyDate().getTime()-lastTimeTableUpdate.getTime()) > TimeTableUpdateTime*1000){ - $.getJSON("../../../api.php?do=locationinfo&action=calendars&ids=" + roomidsString, function (result) { + $.getJSON("../../../api.php?do=locationinfo&action=calendars&id=" + roomidsString, function (result) { UpdateTimeTables(result); lastTimeTableUpdate = new MyDate(); }); @@ -219,7 +219,7 @@ } } - + function updatePcStates(json){ var l = json.length; |