SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Automation and api fixes

Browse Source
This commit is contained in:
JonatanRek
2019-08-24 13:07:07 +02:00
parent 97e955d382
commit 1ea7e600c2
13 changed files with 152 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
views/Ajax.php
View File

@@ -41,7 +41,11 @@ class Ajax extends Template
} else if (isset($_POST['automation_id'])){
$automationId = $_POST['automation_id'];
AutomationManager::deactive($automationId);
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,7 +158,11 @@ class Ajax extends Template
die();
} else if (isset($_POST['scene_id'])) {
$sceneId = $_POST['scene_id'];
echo SceneManager::execScene($sceneId);
if (isset($_POST['action']) && $_POST['action'] == 'delete') {
SceneManager::delete($sceneId);
}else {
echo SceneManager::execScene($sceneId);
}
}
die();

13
views/Automation.php
View File

@@ -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'],
];
}
}