diff options
| author | Jannik Schönartz | 2016-11-26 20:33:20 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2016-11-26 20:33:20 +0100 |
| commit | ebe2b84fa451bb1e72b5618879a5495d4dc1e4ed (patch) | |
| tree | f9bf4307e75537c7616647fd3279e8116fcda6a9 /modules-available/locationinfo/api.inc.php | |
| parent | Merge branch 'location-info-panel' of git.openslx.org:openslx-ng/slx-admin in... (diff) | |
| download | slx-admin-ebe2b84fa451bb1e72b5618879a5495d4dc1e4ed.tar.gz slx-admin-ebe2b84fa451bb1e72b5618879a5495d4dc1e4ed.tar.xz slx-admin-ebe2b84fa451bb1e72b5618879a5495d4dc1e4ed.zip | |
Fixed a coordination bug which caused rotation bugs. Deleted the locationinfo db and added a setting_location_info all in the install.php
Diffstat (limited to 'modules-available/locationinfo/api.inc.php')
| -rw-r--r-- | modules-available/locationinfo/api.inc.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index e103905f..1e765be0 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -66,6 +66,8 @@ function getConfig($locationID) { while($dbresult=$dbquery->fetch(PDO::FETCH_ASSOC)) { $config = json_decode($dbresult['config'], true); $config['room'] = $dbresult['locationname']; + $date = getdate(); + $config['time'] = $date['year'] . "-" . $date['mon'] . "-" . $date['mday'] . " " . $date['hours'] . ":" . $date['minutes'] . ":" . $date['seconds']; } if (empty($config)) { echo json_encode(array()); @@ -181,8 +183,8 @@ function getPcInfos($locationID, $coords) { if ($coords == '1') { $position = json_decode($pc['position'], true); - $computer['x'] = $position['gridRow']; - $computer['y'] = $position['gridCol']; + $computer['x'] = $position['gridCol']; + $computer['y'] = $position['gridRow']; } $computer['inUse'] = 0; |