From 1548ff96932dd61184b5b2d6ee8d15c73dc689c7 Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Mon, 6 Mar 2017 22:07:22 +0100 Subject: API: getRoomTree recursive childs are now filtered out if the id is a duplicate. Frontendpanel: Some url fixes due to reworked api. --- modules-available/locationinfo/frontend/panel.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules-available/locationinfo/frontend') diff --git a/modules-available/locationinfo/frontend/panel.html b/modules-available/locationinfo/frontend/panel.html index d899ffd2..61df4f12 100644 --- a/modules-available/locationinfo/frontend/panel.html +++ b/modules-available/locationinfo/frontend/panel.html @@ -101,7 +101,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); @@ -161,13 +161,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(); }); @@ -217,7 +217,7 @@ } } - + function updatePcStates(json){ var l = json.length; -- cgit v1.2.3-55-g7522