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

Automation Fix

Browse Source
This commit is contained in:
GamerClassN7 2021-02-24 17:20:49 +01:00
parent c6f57a3661
commit 9d9304d30e
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/api/AutomationsApi.php
View File

@ -26,8 +26,18 @@ class AutomationsApi extends ApiController
$this->requireAuth();
$obj = $this->input;
if (
empty($obj['name']) ||
!isset($obj['name']) ||
!isset($obj['conditions']) ||
!isset($obj['tasks']) ||
!isset($obj['days'])
) {
throw new Exception("Invalid request payload", 400);
}
$response = [];
$response = AutomationManager::create($obj['name'],$obj['days'], $obj['tasks'], $obj['conditions']);
$response = AutomationManager::create($obj['name'],json_encode($obj['days']), json_encode($obj['tasks']), json_encode($obj['conditions']));
$this->response(['value'=>'OK']);
}

8
app/models/managers/AutomationManager.php
View File

@ -17,14 +17,14 @@ class AutomationManager{
return Db::command ('UPDATE automation SET executed = 0 WHERE automation_id=?', array ($automationId));
}
public static function create ($name, $onDays, $doCode, $ifCode, $automationId = "") {
$userId = UserManager::getUserData('user_id');
public static function create ($name, $onDays, $doCode, $ifCode, $userId = 1, $automationId = "") {
$userId = UserManager::getUserData('user_id', $userId);
$scene = array (
'name' => $name,
'owner_id' => $userId,
'on_days' => $onDays,
'if_something' => $ifCode,
'do_something' => $doCode,
'conditions' => $ifCode,
'tasks' => $doCode,
);
try {
if ($automationId == "") {

4
app/models/managers/SettingsManager.php
View File

@ -14,7 +14,7 @@ class SettingsManager{
}
public static function create ($name, $value, $type = '') {
//if (!self::getByName($name)){
if (!self::getByName($name)){
$setting = array (
'name' => $name,
'value' => $value,
@ -26,7 +26,7 @@ class SettingsManager{
echo $error->getMessage();
die();
}
//}
}
}
public static function update ($name, $value, $type = '') {