summaryrefslogtreecommitdiffstats
path: root/modules-available/locationinfo/page.inc.php
diff options
context:
space:
mode:
authorJannik Schönartz2016-12-02 17:18:38 +0100
committerJannik Schönartz2016-12-02 17:18:38 +0100
commitdf4a420dedabcaac420e32287e4a48e4ce968fba (patch)
treefc0fced1cd40dbb69fa0e57a56a23454ecb97398 /modules-available/locationinfo/page.inc.php
parentfrontend: fixed cases whend the backend doens't answer (diff)
downloadslx-admin-df4a420dedabcaac420e32287e4a48e4ce968fba.tar.gz
slx-admin-df4a420dedabcaac420e32287e4a48e4ce968fba.tar.xz
slx-admin-df4a420dedabcaac420e32287e4a48e4ce968fba.zip
Locationinfo config: added auto scale mode. Fixed some api bugs
Diffstat (limited to 'modules-available/locationinfo/page.inc.php')
-rw-r--r--modules-available/locationinfo/page.inc.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index b05153b0..271b15fc 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -63,13 +63,14 @@ class Page_LocationInfo extends Page
$result['mode'] = Request::post('mode', 1, 'int');
$result['vertical'] = Request::post('vertical', false, 'bool');
$result['eco'] = Request::post('eco', false, 'bool');
+ $result['scaledaysauto'] = Request::post('autoscale', false, 'bool');
$result['daystoshow'] = Request::post('daystoshow', 7, 'int');
$result['rotation'] = Request::post('rotation', 0, 'int');
$result['scale'] = Request::post('scale', 50, 'int');
$result['switchtime'] = Request::post('switchtime', 20, 'int');
- $result['calupdate'] = Request::post('calupdate', 0, 'int'); //TODO SET DEFAULT TIME INSTEAD OF 0
- $result['roomupdate'] = Request::post('roomupdate', 0, 'int'); //TODO SET DEFAULT TIME INSTEAD OF 0
- $result['configupdate'] = Request::post('configupdate', 0, 'int'); //TODO SET DEFAULT TIME INSTEAD OF 0
+ $result['calupdate'] = Request::post('calupdate', 30, 'int');
+ $result['roomupdate'] = Request::post('roomupdate', 30, 'int');
+ $result['configupdate'] = Request::post('configupdate', 180, 'int');
Database::exec("INSERT INTO `location_info` VALUES (:id, :hidden, '', :config, '') ON DUPLICATE KEY UPDATE config=:config",
array('id' => $locationid, 'hidden' => false, 'config' => json_encode($result, true)));
@@ -80,7 +81,6 @@ class Page_LocationInfo extends Page
private function updateOpeningTimeExpert()
{
- //$existingDays = Request::post('existingdays'); TODO maybe use openingdays from the html so we don't need the db query
$days = Request::post('days');
$locationid = Request::post('id', 0, 'int');
$openingtime = Request::post('openingtime');
@@ -404,7 +404,7 @@ class Page_LocationInfo extends Page
$array = json_decode($dbdata['config'], true);
}
echo Render::parse('config', array('id' => $id, 'language' => $array['language'], 'mode' => 'mode'.$array['mode'], 'vertical' => $array['vertical'],
- 'eco' => $array['eco'], 'daystoshow' => 'day'.$array['daystoshow'], 'rotation' => 'rotation'.$array['rotation'],
+ 'eco' => $array['eco'], 'daystoshow' => 'day'.$array['daystoshow'], 'scaledaysauto' => $array['scaledaysauto'], 'rotation' => 'rotation'.$array['rotation'],
'scale' => $array['scale'], 'switchtime' => $array['switchtime'], 'calupdate' => $array['calupdate'],
'roomupdate' => $array['roomupdate'], 'configupdate' => $array['configupdate']));
}