Automation and api fixes

api.php

@@ -41,7 +41,7 @@ if (isset($obj['user']) && $obj['user'] != ''){
 }
 
 //automationExecution
-//AutomationManager::executeAll();
+AutomationManager::executeAll();
 
 //Record Cleaning
 RecordManager::clean(RECORDTIMOUT);

class/AutomationManager.php

@@ -16,8 +16,8 @@ class AutomationManager{
 		$scene = array (
 			'name' => $name,
 			'on_days' => $onDays,
-			'if_something' => $doCode,
+			'if_something' => $ifCode,
-			'do_something' => $ifCode,
+			'do_something' => $doCode,
 		);
 		try {
 			Db::add ('automation', $scene);
@@ -33,11 +33,12 @@ class AutomationManager{
 	}
 
 	public function executeAll(){
-		global $dateTimeOffset;
+		$dateTimeOffset;
 		$automations = Db::loadAll ("SELECT * FROM automation");
 		$dayNameNow = strtolower (date('D', time()));
+
 		foreach ($automations as $automation) {
-			$onValue = $automation['if_something'];
+			$onValue = json_decode($automation['if_something'], true);
 			$sceneDoJson = $automation['do_something'];
 			$actionDays = json_decode($automation['on_days'], true);
 			$value = time();
@@ -46,18 +47,25 @@ class AutomationManager{
 
 			if ($automation['active'] != 0){
 				if (in_array($dayNameNow, $actionDays)){
-					if (in_array($onValue, ['sunSet','time','now'])) {
+					if (in_array($onValue['type'], ['sunSet','time','now'])) {
-						if ($onValue == 'sunSet') {
+
+						if ($onValue['type'] == 'sunSet') {
 							$value = date_sunset($value, SUNFUNCS_RET_TIMESTAMP, 50.0755381 , 14.4378005, 90, $dateTimeOffset);
-						} else if ($onValue == 'sunRise') {
+						} else if ($onValue['type'] == 'sunRise') {
 							$value = date_sunrise($value, SUNFUNCS_RET_TIMESTAMP, 50.0755381 , 14.4378005, 90, $dateTimeOffset);
-						} else if ($onValue == 'time') {
+						} else if ($onValue['type'] == 'time') {
-							$onValue = explode(':',$onValue);
+							$onValue = explode(':',$onValue['value']);
 							$today = date_create('now');
 							$onValue = $today->setTime($onValue[0], $onValue[1]);
 							$value = $today->getTimestamp();
 						}
 
+						/*
+						Echo "Spouštění Automatizace";
+						echo "Aktual" . date( "HH:mm", strtotime(time()));
+						echo "Run At" . date( "HH:mm", strtotime($value));
+						*/
+
 						if (time() > $value){
 							if ($automation['executed'] == 0){
 								$run = true;
@@ -89,3 +97,4 @@ class AutomationManager{
 			}
 		}
 	}
+}

controls/automation.php

@@ -1,8 +1,11 @@
 <?php
 if (isset($_POST) && !empty($_POST)){
 	if (isset($_POST['modalFinal']) && $_POST['modalFinal'] == "Next") {
-		$ifCode = json_encode($_POST['device'], JSON_PRETTY_PRINT);
+		$doCode = json_encode($_POST['device'], JSON_PRETTY_PRINT);
-		$doCode = $_POST['atSelector'];
+		$ifCode = json_encode([
+			"type" => $_POST['atSelector'],
+			"value" => $_POST['atSelectorValue'],
+		], JSON_PRETTY_PRINT);
 		$onDays = $_POST['atDays'];
 
 		AutomationManager::create('name', $onDays, $doCode, $ifCode);

controls/home.php

@@ -13,13 +13,16 @@ if (isset($_POST) && !empty($_POST)){
 
 
 		$deviceOwnerUserId = $_POST['deviceOwnerUserId'];
+		$deviceOwnerRoomId = $_POST['deviceOwnerId'];
+
 		try {
 			$args = array(
 				'owner' => $deviceOwnerUserId,
 				'name' => $deviceName,
 				'icon' => $deviceIcon,
 				'permission' => $permissionsInJson,
-				'sleep_time' => $sleepTime
+				'sleep_time' => $sleepTime,
+				'room_id' => $deviceOwnerRoomId,
 			);
 			DeviceManager::edit($deviceId, $args);
 		} catch (\Exception $e) {

templates/automation.phtml

@@ -52,7 +52,6 @@
 		</div>
 	</div>
 	<?php 
-	ECHO $_POST['modalNext'];
 	if (isset($_POST['modalNext'])) {
 		$partial = new Partial('automationCreateFinal');
 		$partial->prepare('lang',$LANG);

templates/js/post.js

@@ -1,3 +1,22 @@
+function ajaxPostSimple(path, params, reload = false) {
+    navigator.vibrate([200]);
+    $.ajax({
+        url: path,
+        type: 'POST',
+        data: params,
+        success: function(msg){
+            console.log(msg);
+            if (reload){
+                location.reload();
+            }
+        },
+        error: function (request, status, error) {
+            console.log('0');
+        }
+    });
+    return false;
+}
+
 function ajaxPost(path, params, self, reload = false) {
     navigator.vibrate([200]);
     $.ajax({
@@ -14,7 +33,7 @@ function ajaxPost(path, params, self, reload = false) {
             }
             console.log(msg);
             if (reload){
-                location.reload();
+                //location.reload();
             }
         },
         error: function (request, status, error) {

templates/js/script.js

@@ -10,15 +10,21 @@ if ('serviceWorker' in navigator) {
     });
 }
 
-$('#valueSelector').change(function() {
+
+$('select').change(function(e) {
     console.log($(this).val());
     if( $(this).val() == 'time') {
+        
         $('#atTime').prop( "disabled", false );
+        
+        $('#atDeviceValue').prop( "disabled", true );
+        $('#atDeviceValueInt').prop( "disabled", true );
     } else if( $(this).val() == 'atDeviceValue') {
+        
         $('#atDeviceValue').prop( "disabled", false );
         $('#atDeviceValueInt').prop( "disabled", false );
-    } else {
+        
-        $('#atDeviceValue').prop( "disabled", true );
+        $('#atTime').prop( "disabled", true );
     }
 });
 
@@ -30,14 +36,32 @@ $("div.square-content").on('touchend', function (e){
 });
 
 $("div.square-content").on('touchstart', function (eTarget) {
-    var id = $(this).attr('id').replace('device-', '');
+    navigator.vibrate([500]);
+    var id = '';
+    
+    var windowLoc = $(location).attr('pathname');
+    windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
+    console.log(windowLoc);
+    if (windowLoc == "/") {    
+        id = $(this).attr('id').replace('device-', '');
+    } else if (windowLoc == "/scene") {
+        id = $(this).attr('id').replace('scene-', '');
+    } else if (windowLoc == "/automation") {
+        id = $(this).attr('id').replace('automation-', '');
+    }
+    
     var subId = $(this).attr('data-sub-device-id');
     
     touch++;
     if(touch == 2 && touchSubId == subId){
         console.log("Detail");
+        if (windowLoc == "/") {    
             $("#modal-detail-"+subId).removeClass('modal-container-hiden').show();
             ajaxChart(subId);
+        } else if (windowLoc == "/scene") {
+            
+        } else if (windowLoc == "/automation") {
+        }
         touch = 0;
         touchSubId = "";
         return;
@@ -47,6 +71,7 @@ $("div.square-content").on('touchstart', function (eTarget) {
     pressTimer = window.setTimeout(function (e) {
         console.log("Setting");
         $("#modal-setting-"+id).removeClass('modal-container-hiden').show();
+        touch = 0;
     }, 500);
 });
 
@@ -60,6 +85,8 @@ $("div.square-content").mousedown(function(e) {
             id = $(this).attr('id').replace('device-', '');
         } else if (windowLoc == "/scene") {
             id = $(this).attr('id').replace('scene-', '');
+        } else if (windowLoc == "/automation") {
+            id = $(this).attr('id').replace('automation-', '');
         }
         $("#modal-setting-"+id).removeClass('modal-container-hiden').show();
         console.log("Setting");
@@ -155,7 +182,11 @@ $( '[name="room"]' ).change(function (e) {
 });  
 
 
-var autoUpdate = setInterval(function(){
+var windowLoc = $(location).attr('pathname');
+windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
+console.log();
+if (windowLoc == "/") {
+    var autoUpdate = setInterval(function(){
         $.ajax({
             url: 'ajax',
             type: 'POST',
@@ -179,7 +210,8 @@ var autoUpdate = setInterval(function(){
                 console.log("ERROR ajaxChart():", request, error);
             }
         });
-},2000);
+    },2000);
+}
 
 
 
@@ -191,6 +223,22 @@ $('.graph-period').on('click', function (e) {
     ajaxChart(subId, period, groupBy);
 });
 
+$( "button[name=remove]" ).click(function(e) {
+    if (confirm('Are you shure ?')) {
+        var windowLoc = $(location).attr('pathname');
+        windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
+        console.log(windowLoc);
+        var id = null;
+        if (windowLoc == "/scene") {
+            id = $(this).data('scene-id');
+            $("#scene-"+id+"-content").remove();
+        } else if (windowLoc == "/automation") {
+            id = $(this).data('automation-id');
+            $("#automation-"+id+"-content").remove();
+        }
+    }
+});
+
 
 
 
@@ -219,8 +267,6 @@ $('.graph-period').on('click', function (e) {
 
 
 
-
-
 
 
 

templates/part/automationCreate.phtml

@@ -29,7 +29,7 @@
                     <select class="input" name="devices[]" multiple>
                         <?php foreach ($SUBDEVICES as $subDeviceKey => $subDeviceValue){ 
                             if ($subDeviceValue['type'] != 'on/off') continue;?>
-                            <option value="<?php echo $subDeviceKey; ?>"><?php echo $subDeviceValue['name']; ?></option>
+                            <option value="<?php echo $subDeviceValue['masterDevice']; ?>"><?php echo $subDeviceValue['name']; ?></option>
                         <?php } ?>
                     </select>
                     

templates/part/automationCreateFinal.phtml

@@ -4,7 +4,8 @@
         <h4 class="mb-4"><?php echo $LANG['t_createAutomation']?></h4>
         <form method="post">
             <div class="field">
-                <input type="hidden" name="atSelector" value="<?php if (isset($_POST['atTime'])) {
+                <input type="hidden" name="atSelector" value="<?php echo $_POST['atSelector']; ?>" required/>
+                <input type="hidden" name="atSelectorValue" value="<?php if (isset($_POST['atTime'])) {
                     echo $_POST['atTime'];
                 } else if (isset($_POST['atDeviceValue'])) {
                     $subDeviceId = $_POST['atDeviceValue'];

templates/part/automationEdit.phtml

@@ -91,7 +91,8 @@
                 </div>
             </div>
             <input type="submit" class="button" name="modalFinal" value="<?php echo $LANG['b_edit'];?>"/>	
-            <input type="submit" class="button is-danger"  onClick="ajaxPost('ajax',{automation_id:'<?php echo $AUTOMATIONID ?>', 'action':'delete'}, this, true);"  name="remove" value="<?php echo $LANG['b_remove'];?>"/>
+            <input type="submit" class="button is-danger"  onClick="ajaxPostSimple('ajax',{automation_id:  '<?php echo $AUTOMATIONID ?>', action:'delete'}, true);"  name="remove" value="<?php echo $LANG['b_remove'];?>"/>
         </form>
+
     </div>
 </div>

templates/part/deviceButton.phtml

@@ -8,7 +8,7 @@ if ($SUBDEVICE['type'] == 'on/off') {
 
 <div class="device-button col-4 col-sm-3 col-xl-2 square-wrap" <?php echo $action; ?> data-room-id="<?php echo $ROOMID; ?>">
 	<div class="square">
-		<div class="square-content <?php echo ($SUBDEVICE['comError'] ? "is-inactive" : "") ;?>" id="device-<?php echo $DEVICEID ?>" data-sub-device-id="<?php echo $SUBDEVICEID;?>">
+		<div class="square-content <?php echo (($SUBDEVICE['comError'] == 1 || $DEVICE['approved'] == 0) ? "is-inactive" : "") ;?>" id="device-<?php echo $DEVICEID ?>" data-sub-device-id="<?php echo $SUBDEVICEID;?>">
 			<div class="content">
 				<div class="row">
 					<div class="col">

views/Ajax.php

@@ -41,7 +41,11 @@ class Ajax extends Template
 
 		}  else if (isset($_POST['automation_id'])){
 			$automationId = $_POST['automation_id'];
+			if (isset($_POST['action']) && $_POST['action'] == 'delete') {
+				AutomationManager::remove($automationId);
+			}else {
 				AutomationManager::deactive($automationId);
+			}
 		} else if (isset($_POST['subDevice']) && isset($_POST['action']) && $_POST['action'] == "chart") {
 			//TODO lepe rozstrukturovat
 			$subDeviceId = $_POST['subDevice'];
@@ -154,8 +158,12 @@ class Ajax extends Template
 			die();
 		} else if (isset($_POST['scene_id'])) {
 			$sceneId = $_POST['scene_id'];
+			if (isset($_POST['action']) && $_POST['action'] == 'delete') {
+				SceneManager::delete($sceneId);
+			}else {
 				echo SceneManager::execScene($sceneId);
 			}
+		}
 
 		die();
 

views/Automation.php

@@ -19,11 +19,19 @@ class Automation extends Template
 		$automations = [];
 		$automationsData = AutomationManager::getAll();
 		foreach ($automationsData as $automationKey => $automationData) {
+			$doSomething = [];
+			foreach (json_decode($automationData['do_something']) as $subdeviceId => $subDeviceState) {
+				$subDeviceMasterDeviceData = SubDeviceManager::getSubDeviceMaster($subdeviceId);
+				$doSomething[$subdeviceId] = [
+					'name' => $subDeviceMasterDeviceData['name'],
+					'state' => $subDeviceState,
+				];
+			}
 			$automations[$automationData['automation_id']] = [
 				'name' => '',
-				'onDays' => implode(', ',json_decode($automationData['on_days'])),
+				'onDays' => json_decode($automationData['on_days']),
 				'ifSomething' => $automationData['if_something'],
-				'doSomething' => $automationData['do_something'],
+				'doSomething' => $doSomething,
 				'active' => $automationData['active'],
 			];
 		}
@@ -37,6 +45,7 @@ class Automation extends Template
 				$approvedSubDevices[$subDeviceValue['subdevice_id']] = [
 					'name' => $allDevicesData[$deviceKey]['name'],
 					'type' => $subDeviceValue['type'],
+					'masterDevice' => $subDeviceValue['device_id'],
 				];
 			}
 		}