From 18942f2e247d7e195367ddf7048d071be50feef5 Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Thu, 1 Dec 2016 20:01:08 -0800 Subject: locationinfo: added easymode to the opening time --- modules-available/locationinfo/api.inc.php | 10 +- modules-available/locationinfo/config.json | 2 +- .../locationinfo/lang/de/messages.json | 1 + .../locationinfo/lang/de/template-tags.json | 5 + .../locationinfo/lang/en/messages.json | 1 + .../locationinfo/lang/en/template-tags.json | 5 + modules-available/locationinfo/page.inc.php | 146 ++++++++---- .../locationinfo/templates/config.html | 13 +- .../locationinfo/templates/location-info.html | 5 +- .../locationinfo/templates/pcsubtable.html | 2 +- .../locationinfo/templates/timetable.html | 264 ++++++++++++++++----- 11 files changed, 334 insertions(+), 120 deletions(-) (limited to 'modules-available') diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index 1e765be0..b96dbdc6 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -87,17 +87,19 @@ function checkIfHidden($locationID) { return true; } } + return -1; } function getOpeningTimesFromParent($locationID) { $dbquery = Database::simpleQuery("SELECT parentlocationid FROM `location` WHERE locationid = :locationID", array('locationID' => $locationID)); + $parentlocationid = 0; while($dbdata=$dbquery->fetch(PDO::FETCH_ASSOC)) { - $parentlocationid = $dbdata['parentlocationid']; + $parentlocationid = (int)$dbdata['parentlocationid']; } if ($parentlocationid == 0) { echo json_encode(array()); }else { - echo getOpeningTimes($parentlocationid); + getOpeningTimes($parentlocationid); } } @@ -110,6 +112,8 @@ function getOpeningTimes($locationID) { $dbquery = Database::simpleQuery("SELECT openingtime FROM `location_info` WHERE locationid = :locationID", array('locationID' => $locationID)); $result = array(); + $dbresult = array(); + while($dbdata=$dbquery->fetch(PDO::FETCH_ASSOC)) { $dbresult = json_decode($dbdata['openingtime'], true); } @@ -165,8 +169,6 @@ function getRoomInfoJson($locationID, $coords) { } function getPcInfos($locationID, $coords) { - $dbquery; - if ($coords == '1') { $dbquery = Database::simpleQuery("SELECT machineuuid, position, logintime FROM `machine` WHERE locationid = :locationID" , array('locationID' => $locationID)); } else { diff --git a/modules-available/locationinfo/config.json b/modules-available/locationinfo/config.json index a6e90714..d4cab3f0 100644 --- a/modules-available/locationinfo/config.json +++ b/modules-available/locationinfo/config.json @@ -1,4 +1,4 @@ { "category":"main.content", - "dependencies": ["js_jqueryui"] + "dependencies": ["js_jqueryui", "bootstrap_timepicker", "locations", "bootstrap_switch"] } diff --git a/modules-available/locationinfo/lang/de/messages.json b/modules-available/locationinfo/lang/de/messages.json index f71ee38d..6526c320 100644 --- a/modules-available/locationinfo/lang/de/messages.json +++ b/modules-available/locationinfo/lang/de/messages.json @@ -2,5 +2,6 @@ "no-days-selected": "Es wurden keine Tage ausgewählt.", "added-x-entries": "Eintr\u00e4ge hinzugef\u00fcgt: {{0}}", "deleted-x-entries": "Eintr\u00e4ge gelöscht: {{0}}", + "openingtime-updated": "Öffnungszeiten aktualisierts.", "config-saved": "Einstellungen erfolgreich gespeichert." } diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json index 9f3f0304..da18765a 100644 --- a/modules-available/locationinfo/lang/de/template-tags.json +++ b/modules-available/locationinfo/lang/de/template-tags.json @@ -26,6 +26,11 @@ "lang_shortFriday": "Fr", "lang_shortSaturday": "Sa", "lang_shortSunday": "So", + "lang_shortMonTilFr": "Mo - Fr", + "lang_monTilFr": "Montag - Freitag", + "lang_saturday": "Samstag", + "lang_sunday": "Sonntag", + "lang_expertMode": "Experten Modus", "lang_language": "Sprache", "lang_languageEn": "en", diff --git a/modules-available/locationinfo/lang/en/messages.json b/modules-available/locationinfo/lang/en/messages.json index cbb8006f..22c9b549 100644 --- a/modules-available/locationinfo/lang/en/messages.json +++ b/modules-available/locationinfo/lang/en/messages.json @@ -2,5 +2,6 @@ "no-days-selected": "No days selected.", "added-x-entries": "Entries added: {{0}}", "deleted-x-entries": "Entries deleted: {{0}}", + "openingtime-updated": "Openingtime updated.", "config-saved": "Config successfully saved." } diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json index 3a7e8632..b2beabef 100644 --- a/modules-available/locationinfo/lang/en/template-tags.json +++ b/modules-available/locationinfo/lang/en/template-tags.json @@ -26,6 +26,11 @@ "lang_shortFriday": "Fri", "lang_shortSaturday": "Sat", "lang_shortSunday": "Sun", + "lang_shortMonTilFr": "Mon - Fri", + "lang_monTilFr": "Monday - Friday", + "lang_saturday": "Saturday", + "lang_sunday": "Sunday", + "lang_expertMode": "Expert mode", "lang_language": "Language", "lang_languageEn": "en", diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index 717e3b0b..b05153b0 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -17,8 +17,10 @@ class Page_LocationInfo extends Page } $this->action = Request::post('action'); - if ($this->action === 'updateOpeningTime') { - $this->updateOpeningTime(); + if ($this->action === 'updateOpeningTimeExpert') { + $this->updateOpeningTimeExpert(); + } elseif($this->action === 'updateOpeningTimeEasy') { + $this->updateOpeningTimeEasy(); } elseif ($this->action === 'updateConfig') { $this->updateConfig(); } @@ -49,6 +51,7 @@ class Page_LocationInfo extends Page $this->toggleHidden($roomId, $hiddenValue); Util::redirect('?do=locationinfo&action=infoscreen#row' . $roomId); } + } private function updateConfig() @@ -75,13 +78,14 @@ class Page_LocationInfo extends Page Util::redirect('?do=locationinfo'); } - private function updateOpeningTime() + private function updateOpeningTimeExpert() { - $existingDays = Request::post('existingdays'); + //$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'); $closingtime = Request::post('closingtime'); + $easyMode = Request::post('easyMode'); $delete = Request::post('delete'); $dontadd = Request::post('dontadd'); $count = 0; @@ -89,29 +93,31 @@ class Page_LocationInfo extends Page $resulttmp = array(); $deleteCounter = 0; - $dbquery = Database::simpleQuery("SELECT openingtime FROM `location_info` WHERE locationid = :id", array('id' => $locationid)); - while($dbdata=$dbquery->fetch(PDO::FETCH_ASSOC)) { - $resulttmp = json_decode($dbdata['openingtime'], true); - } + if (!$easyMode) { + $dbquery = Database::simpleQuery("SELECT openingtime FROM `location_info` WHERE locationid = :id", array('id' => $locationid)); + while($dbdata=$dbquery->fetch(PDO::FETCH_ASSOC)) { + $resulttmp = json_decode($dbdata['openingtime'], true); + } - $index = 0; + $index = 0; - foreach ($resulttmp as $day) { - $skip = false; - foreach ($delete as $del) { - if ($del == $index) { - $skip = true; - break; + foreach ($resulttmp as $day) { + $skip = false; + foreach ($delete as $del) { + if ($del == $index) { + $skip = true; + break; + } } - } - if ($skip == true) { + if ($skip == true) { + $index++; + $deleteCounter++; + continue; + } + + $result[] = $day; $index++; - $deleteCounter++; - continue; } - - $result[] = $day; - $index++; } if (!empty($days) && !is_array($days)) { @@ -157,6 +163,34 @@ class Page_LocationInfo extends Page Util::redirect('?do=locationinfo'); } + private function updateOpeningTimeEasy() { + $locationid = Request::post('id', 0, 'int'); + $openingtime = Request::post('openingtime'); + $closingtime = Request::post('closingtime'); + $result = array(); + + $opt0['days'] = array ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday"); + $opt0['openingtime'] = $openingtime[0]; + $opt0['closingtime'] = $closingtime[0]; + $result[] = $opt0; + + $opt1['days'] = array ("Saturday"); + $opt1['openingtime'] = $openingtime[1]; + $opt1['closingtime'] = $closingtime[1]; + $result[] = $opt1; + + $opt2['days'] = array ("Sunday"); + $opt2['openingtime'] = $openingtime[2]; + $opt2['closingtime'] = $closingtime[2]; + $result[] = $opt2; + + Database::exec("INSERT INTO `location_info` VALUES (:id, :hidden, :openingtime, '', '') ON DUPLICATE KEY UPDATE openingtime=:openingtime", + array('id' => $locationid, 'hidden' => false, 'openingtime' => json_encode($result, true))); + + Message::addSuccess('openingtime-updated'); + Util::redirect('?do=locationinfo'); + } + protected function toggleHidden($id, $val) { Database::exec("INSERT INTO `location_info` VALUES (:id, :hidden, '', '', '') ON DUPLICATE KEY UPDATE hidden=:hidden", array('id' => $id, 'hidden' => $val)); @@ -194,12 +228,10 @@ class Page_LocationInfo extends Page FROM `location` AS l LEFT JOIN `location_info` AS li ON l.locationid=li.locationid WHERE parentlocationid = :parentId;", array('parentId' => $parent)); $amountofzero = 0; - $amountofone = 0; $amountofnull = 0; while($dbd=$dbq->fetch(PDO::FETCH_ASSOC)) { $amountofzero = (int)$dbd['0']; - $amountofone = (int)$dbd['1']; $amountofnull = (int)$dbd['NULL']; } @@ -257,13 +289,6 @@ class Page_LocationInfo extends Page )); } - protected function updateInfoscreenDb() { - $dbquery = Database::simpleQuery("SELECT DISTINCT locationid FROM `machine` WHERE locationid IS NOT NULL"); - while($roominfo=$dbquery->fetch(PDO::FETCH_ASSOC)) { - $this->updatePcInfos($roominfo['locationid']); - } - } - private function getInUseStatus($logintime, $lastseen) { if ($logintime == 0) { return 0; @@ -273,6 +298,7 @@ class Page_LocationInfo extends Page } elseif ($lastseen > 610) { return 2; } + return -1; } /** @@ -309,7 +335,6 @@ class Page_LocationInfo extends Page $pc['ip'] = $dbdata['clientip']; $pc['inUse'] = $this->getInUseStatus($dbdata['logintime'], $dbdata['lastseen']); - $position = array(); $position = json_decode($dbdata['position'], true); $pc['x'] = $position['gridRow']; $pc['y'] = $position['gridCol']; @@ -325,26 +350,51 @@ class Page_LocationInfo extends Page private function ajaxTimeTable($id) { $array = array(); $dbquery = Database::simpleQuery("SELECT openingtime FROM `location_info` WHERE locationid = :id", array('id' => $id)); + $dbresult = array(); while($dbdata=$dbquery->fetch(PDO::FETCH_ASSOC)) { - $db = array(); - $db = json_decode($dbdata['openingtime'], true); - $index = 0; - foreach ($db as $key) { - $str = "| "; - foreach ($key['days'] as $val) { - $str .= $val; - $str .= " | "; + $dbresult[] = json_decode($dbdata['openingtime'], true); + } + if($this->isEasyMode($dbresult)) { + echo Render::parse('timetable', array('id' => $id, 'openingtime0' => $dbresult[0][0]['openingtime'], + 'closingtime0' => $dbresult[0][0]['closingtime'], 'openingtime1' => $dbresult[0][1]['openingtime'], + 'closingtime1' => $dbresult[0][1]['closingtime'], 'openingtime2' => $dbresult[0][2]['openingtime'], + 'closingtime2' => $dbresult[0][2]['closingtime'], 'easyMode' => true, 'expertMode' => false)); + + } else{ + foreach($dbresult as $db) { + $index = 0; + foreach ($db as $key) { + $str = "| "; + foreach ($key['days'] as $val) { + $str .= $val; + $str .= " | "; + } + $ar = array(); + $ar['days'] = $str; + $ar['openingtime'] = $key['openingtime']; + $ar['closingtime'] = $key['closingtime']; + $ar['index'] = $index; + $array[] = $ar; + $index++; } - $ar = array(); - $ar['days'] = $str; - $ar['openingtime'] = $key['openingtime']; - $ar['closingtime'] = $key['closingtime']; - $ar['index'] = $index; - $array[] = $ar; - $index++; } + echo Render::parse('timetable', array('id' => $id, 'openingtimes' => array_values($array), 'easyMode' => false, 'expertMode' => true)); + } + } + + private function isEasyMode($array) { + if(count($array[0]) == 3) { + if ($array[0][0]['days'] == array ("Monday","Tuesday","Wednesday","Thursday","Friday") + && $array[0][1]['days'] == array ("Saturday") && $array[0][2]['days'] == array ("Sunday")) { + return true; + } else { + return false; + } + } elseif ($array[0] == 0) { + return true; + } else { + return false; } - echo Render::parse('timetable', array('id' => $id, 'openingtimes' => array_values($array))); } private function ajaxConfig($id) { diff --git a/modules-available/locationinfo/templates/config.html b/modules-available/locationinfo/templates/config.html index 6df69cdc..06240e66 100644 --- a/modules-available/locationinfo/templates/config.html +++ b/modules-available/locationinfo/templates/config.html @@ -29,7 +29,7 @@

- - - - - - - - - - - - {{#openingtimes}} - - - - - - {{/openingtimes}} - - -
{{lang_day}}{{lang_openingTime}}{{lang_closingTime}}{{lang_delete}}
{{days}}{{openingtime}}{{closingtime}} - -
- -
- {{lang_openingTime}} - -
-
- - - + +
+ + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{lang_day}}{{lang_openingTime}}{{lang_closingTime}}
{{lang_monTilFr}} +
+ + + + +
+ 		+
+ + + + +
+
{{lang_saturday}} +
+ + + + +
+ 		+
+ + + + +
+
{{lang_sunday}} +
+ + + + +
+ 		+
+ + + + +
+
+ +
+
+
+ +
+
+
+ +
+
+ + + + + + + + + + + + + + + {{#openingtimes}} + + + + + + + + {{/openingtimes}} + + +
{{lang_day}}{{lang_openingTime}}{{lang_closingTime}}{{lang_delete}}
{{days}}{{openingtime}}{{closingtime}}
+ +
+ {{lang_openingTime}} + +
+
+ +
+
+
-- cgit v1.2.3-55-g7522