From 3479fb9c873aab96b10748c136c300b40d6dfff8 Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Fri, 17 Jan 2020 10:27:51 +0100 Subject: [PATCH] DEBUGMODE in FRONTEND --- app/templates/automation.phtml | 8 ++++++-- app/templates/dashboard.phtml | 9 +++++---- app/templates/home.phtml | 27 +++++++++++++------------ app/templates/log.phtml | 5 +++-- app/templates/part/menu.phtml | 10 ++++++--- app/templates/rooms.phtml | 37 +++++++++++++++++----------------- app/templates/scene.phtml | 19 ++++++++--------- app/templates/setting.phtml | 1 + app/views/Automation.php | 1 + app/views/Dashboard.php | 1 + app/views/Home.php | 1 + app/views/Login.php | 2 ++ app/views/Rooms.php | 1 + app/views/Scene.php | 1 + app/views/Setting.php | 1 + 15 files changed, 73 insertions(+), 51 deletions(-) diff --git a/app/templates/automation.phtml b/app/templates/automation.phtml index f58ac4b..84cd043 100644 --- a/app/templates/automation.phtml +++ b/app/templates/automation.phtml @@ -16,6 +16,7 @@ $partial = new Partial('menu'); $partial->prepare('item','automation'); $partial->prepare('langMng',$LANGMNG); + $partial->prepare('debugMod',$DEBUGMOD); $partial->render(); ?> @@ -29,10 +30,11 @@ $partial->prepare('automationId',$automationId); $partial->prepare('automationData',$automationData); $partial->render(); - + //EDIT $partial = new Partial('automationEdit'); $partial->prepare('langMng',$LANGMNG); + $partial->prepare('userManager',$USERMANAGER); $partial->prepare('automationId',$automationId); $partial->prepare('automation',$automationData); $partial->prepare('subDevices',$SUBDEVICES); @@ -41,15 +43,17 @@ - prepare('langMng',$LANGMNG); + $partial->prepare('userManager',$USERMANAGER); $partial->prepare('subDevices',$SUBDEVICES); $partial->render(); } else { $partial = new Partial('automationCreate'); $partial->prepare('langMng',$LANGMNG); + $partial->prepare('subDevices',$SUBDEVICES); $partial->render(); }?> diff --git a/app/templates/dashboard.phtml b/app/templates/dashboard.phtml index c2faec5..f62dcf6 100644 --- a/app/templates/dashboard.phtml +++ b/app/templates/dashboard.phtml @@ -16,6 +16,7 @@ $partial = new Partial('menu'); $partial->prepare('item', 'dashboard'); $partial->prepare('langMng',$LANGMNG); + $partial->prepare('debugMod',$DEBUGMOD); $partial->render(); ?> @@ -25,13 +26,13 @@ $dashboardItemData) { $partialDeviceButton = new Partial('dashboardButton'); $partialDeviceButton->prepare('dashboardItemData', $dashboardItemData); - + $partialDeviceButton->render(); } ?> - + - + - +
- echo('l_atHome'); - echo ': ' . $USERSATHOME; + echo ': ' . $USERSATHOME; } ?>
@@ -42,8 +43,8 @@
- $room) { ?> - $device) { ?> + $room) { ?> + $device) { ?> $subDevice) { //BUTTON $partialDeviceButton = new Partial('deviceButton'); @@ -52,18 +53,18 @@ $partialDeviceButton->prepare('subdevice',$subDevice); $partialDeviceButton->prepare('deviceid',$deviceId); $partialDeviceButton->prepare('device',$device); - + $partialDeviceButton->render(); - + //DETAIL $partialDetail = new Partial('deviceDetail'); $partialDetail->prepare('subdeviceid',$subDeviceKey); $partialDetail->prepare('subdevice',$subDevice); $partialDetail->prepare('device',$device); $partialDetail->prepare('langMng',$LANGMNG); - + $partialDetail->render(); - + //SETTING $partialEdit = new Partial('deviceEdit'); $partialEdit->prepare('deviceid',$deviceId); @@ -72,9 +73,9 @@ $partialEdit->prepare('users',$USERS); $partialEdit->prepare('rooms',$ROOMS); $partialEdit->prepare('langMng',$LANGMNG); - + $partialEdit->render(); - } + } } } ?>
@@ -85,4 +86,4 @@ $partial->render(); ?> - \ No newline at end of file + diff --git a/app/templates/log.phtml b/app/templates/log.phtml index 3c6a6c5..c747c83 100644 --- a/app/templates/log.phtml +++ b/app/templates/log.phtml @@ -16,6 +16,7 @@ $partial = new Partial('menu'); $partial->prepare('item', 'log'); $partial->prepare('langMng',$LANGMNG); + $partial->prepare('debugMod',$DEBUGMOD); $partial->render(); ?> @@ -33,7 +34,7 @@ - '; @@ -45,7 +46,7 @@ ?> - + render(); diff --git a/app/templates/part/menu.phtml b/app/templates/part/menu.phtml index 4c03072..14b1229 100644 --- a/app/templates/part/menu.phtml +++ b/app/templates/part/menu.phtml @@ -32,7 +32,11 @@ 'path' => 'log', ], ]; - foreach ( $menuItems as $key => $value) { ?> + foreach ( $menuItems as $key => $value) { + if ($DEBUGMOD == 0 && $value['path'] == 'log') { + continue; + } + ?>
@@ -42,5 +46,5 @@
- - \ No newline at end of file + + diff --git a/app/templates/rooms.phtml b/app/templates/rooms.phtml index 9e97574..0d81933 100644 --- a/app/templates/rooms.phtml +++ b/app/templates/rooms.phtml @@ -16,12 +16,13 @@ $partial = new Partial('menu'); $partial->prepare('item', 'rooms'); $partial->prepare('lang',$LANG); + $partial->prepare('debugMod',$DEBUGMOD); $partial->render(); ?> - - - + + +
$room) { ?> @@ -72,26 +73,26 @@ flex: 0 0 100%; height: 100%; } - + .frame { overflow-x: auto; width: 100%; display: flex; height: 100%; } - + body,html{ height: 100%; } - + .frame .single-frame:nth-child(even) { background: red; } - + .frame .single-frame:nth-child(odd) { background: green; } - +
@@ -104,27 +105,27 @@ var id; var current_element var elementWidth = $('.frame').width(); - + $('.frame').scroll(function(){ //console.log('SCROLLING!'); //console.log('scrool'+$('.single-frame').scrollLeft()); var element_width = $('.single-frame').width(); - + var offset = $('.single-frame').offset(); var positive = Math.abs(offset.left) var divided = positive / element_width; var round = Math.round(divided); - + current_element = $('.frame').children().eq(round); id = current_element.attr('id'); - + if (prev_id != id){ prev_id = id; console.log(prev_id); } var scrollTo = $('#'+id).offset().left; console.log('s-f: '+ scrollTo) - + }); $('.frame').on('touchend', function(){ // listen to mouse up console.log('STOPPED SCROLLING!'); @@ -135,19 +136,19 @@ if(a[index].id == id){ $('.frame').animate({ scrollLeft: (index * elementWidth) - }); + }); $('.frame').animate({ scrollLeft: (index * elementWidth) - }); + }); } console.log(a[index]); } - + if (scrollTo > 160) { console.log($('#'+id).left) - + } }); - \ No newline at end of file + diff --git a/app/templates/scene.phtml b/app/templates/scene.phtml index b6ae25c..6adc533 100644 --- a/app/templates/scene.phtml +++ b/app/templates/scene.phtml @@ -16,51 +16,52 @@ $partial = new Partial('menu'); $partial->prepare('item', 'scene'); $partial->prepare('langMng',$LANGMNG); + $partial->prepare('debugMod',$DEBUGMOD); $partial->render(); ?>
echo('t_createScene');?>
- $sceneData) { + $sceneData) { //BUTTON $partialScenButton = new Partial('sceneButton'); $partialScenButton->prepare('langMng', $LANGMNG); $partialScenButton->prepare('sceneId', $sceneId); $partialScenButton->prepare('sceneData', $sceneData); - + $partialScenButton->render(); - + // Edit $partialSceneEdit = new Partial('sceneEdit'); $partialSceneEdit->prepare('langMng',$LANGMNG); $partialSceneEdit->prepare('sceneId',$sceneId); $partialSceneEdit->prepare('scene',$sceneData); - + $partialSceneEdit->render(); ?>
- + prepare('langMng',$LANGMNG); $partial->prepare('setStateFormDevices',$SETSTATEFORMDEVICES ); $partial->prepare('sceneIcon',$SCENEICON ); $partial->prepare('SceneName',$SCENENAME ); - + $partial->render(); } else { $partial = new Partial('sceneCreate'); $partial->prepare('langMng',$LANGMNG); $partial->prepare('subDevices',$SUBDEVICES); - + $partial->render(); - } + } $partial = new Partial('footer'); $partial->render(); ?> - \ No newline at end of file + diff --git a/app/templates/setting.phtml b/app/templates/setting.phtml index 595f6b7..ae5588e 100644 --- a/app/templates/setting.phtml +++ b/app/templates/setting.phtml @@ -16,6 +16,7 @@ $partial = new Partial('menu'); $partial->prepare('item', 'setting'); $partial->prepare('langMng',$LANGMNG); + $partial->prepare('debugMod',$DEBUGMOD); $partial->render(); ?> diff --git a/app/views/Automation.php b/app/views/Automation.php index 4b3186d..844c25c 100644 --- a/app/views/Automation.php +++ b/app/views/Automation.php @@ -52,6 +52,7 @@ class Automation extends Template $template = new Template('automation'); $template->prepare('baseDir', BASEDIR); + $template->prepare('debugMod', DEBUGMOD); $template->prepare('title', 'Automation'); $template->prepare('langMng', $langMng); $template->prepare('userManager', $userManager); diff --git a/app/views/Dashboard.php b/app/views/Dashboard.php index e33b43d..399ffd3 100644 --- a/app/views/Dashboard.php +++ b/app/views/Dashboard.php @@ -81,6 +81,7 @@ class Dashboard extends Template } $template->prepare('baseDir', BASEDIR); + $template->prepare('debugMod', DEBUGMOD); $template->prepare('title', 'Nástěnka'); $template->prepare('langMng', $langMng); $template->prepare('dashboard', $dashboard); diff --git a/app/views/Home.php b/app/views/Home.php index cff6783..b9b2f4d 100644 --- a/app/views/Home.php +++ b/app/views/Home.php @@ -177,6 +177,7 @@ class Home extends Template $rooms = RoomManager::getAllRooms(); $template->prepare('baseDir', BASEDIR); + $template->prepare('debugMod', DEBUGMOD); $template->prepare('title', 'Home'); $template->prepare('rooms', $rooms); $template->prepare('langMng', $langMng); diff --git a/app/views/Login.php b/app/views/Login.php index cf56820..074a14d 100644 --- a/app/views/Login.php +++ b/app/views/Login.php @@ -15,6 +15,8 @@ class Login extends Template $template->prepare('title', 'Home'); $template->prepare('lang', $lang); + + $template->render(); } } diff --git a/app/views/Rooms.php b/app/views/Rooms.php index 1686514..8169b65 100644 --- a/app/views/Rooms.php +++ b/app/views/Rooms.php @@ -15,6 +15,7 @@ class Rooms extends Template $template = new Template('rooms'); $template->prepare('baseDir', BASEDIR); + $template->prepare('debugMod', DEBUGMOD); $template->prepare('title', 'Rooms'); $template->prepare('lang', $lang); diff --git a/app/views/Scene.php b/app/views/Scene.php index 1a979da..8a0a5d7 100644 --- a/app/views/Scene.php +++ b/app/views/Scene.php @@ -12,6 +12,7 @@ class Scene extends Template $template = new Template('scene'); $template->prepare('baseDir', BASEDIR); + $template->prepare('debugMod', DEBUGMOD); $template->prepare('title', 'Scény'); $template->prepare('langMng', $langMng); diff --git a/app/views/Setting.php b/app/views/Setting.php index 2e10e0a..cde136c 100644 --- a/app/views/Setting.php +++ b/app/views/Setting.php @@ -24,6 +24,7 @@ class Setting extends Template $template = new Template('setting'); $template->prepare('baseDir', BASEDIR); + $template->prepare('debugMod', DEBUGMOD); $template->prepare('title', 'Automation'); $template->prepare('langMng', $langMng); $template->prepare('automations', $automations);