diff options
author | Jannik Schönartz | 2017-02-21 05:46:26 +0100 |
---|---|---|
committer | Jannik Schönartz | 2017-02-21 05:46:26 +0100 |
commit | 212e462b54c6dc054afea07e5a366fa141578d03 (patch) | |
tree | 217a229e1344a71fd3e991a804c3df78fdeba68e /modules-available | |
parent | API: roominfo is now supporting mutliple id. (diff) | |
download | slx-admin-212e462b54c6dc054afea07e5a366fa141578d03.tar.gz slx-admin-212e462b54c6dc054afea07e5a366fa141578d03.tar.xz slx-admin-212e462b54c6dc054afea07e5a366fa141578d03.zip |
API: fixed pcStates function because of the roomInfo rework
Diffstat (limited to 'modules-available')
-rw-r--r-- | modules-available/locationinfo/api.inc.php | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index 78c9f197..d854df64 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -27,8 +27,9 @@ function HandleParameters() { $roomIDS = Request::get('ids', 0, 'string'); getRoomTree($roomIDS); } elseif ($getAction == "pcstates") { - $roomIDS = Request::get('ids', 0, 'string'); - getPcStates($roomIDS); + $roomIDs = Request::get('id', 0, 'string'); + $array = getMultipleInformations($roomIDs); + echo getPcStates($array); } elseif ($getAction == "calendars") { $roomIDS = Request::get('ids', 0, 'string'); getCalendars($roomIDS); @@ -54,40 +55,36 @@ function getCalendars($ids) { echo json_encode($calendars); } -function getPcStates($ids) { - $idList = getMultipleInformations($ids); - +function getPcStates($idList) { $pcStates = array(); - foreach ($idList as $id) { - $a['id'] = $id; - $b = array(); - $b = json_decode(getPcInfos($id), true); + $roominfoList = json_decode(getRoomInfo($idList), true); + foreach ($roominfoList as $roomInfo) { + $result['id'] = $id; $idle = 0; $occupied = 0; $off = 0; $broken = 0; - foreach ($b as $c) { - if ($c['pcState'] == 0) { + foreach ($roomInfo['computer'] as $computer) { + if ($computer['pcState'] == 0) { $idle++; - } elseif($c['pcState'] == 1) { + } elseif($computer['pcState'] == 1) { $occupied++; - } elseif($c['pcState'] == 2) { + } elseif($computer['pcState'] == 2) { $off++; - } elseif($c['pcState'] == 3) { + } elseif($computer['pcState'] == 3) { $broken++; } } - $a['idle'] = $idle; - $a['occupied'] = $occupied; - $a['off'] = $off; - $a['broken'] = $broken; - $pcStates[] = $a; + $result['idle'] = $idle; + $result['occupied'] = $occupied; + $result['off'] = $off; + $result['broken'] = $broken; + $pcStates[] = $result; } - - echo json_encode($pcStates); + return json_encode($pcStates); } function getRoomTree($ids) { |