merge
This commit is contained in:
commit
c43b751bd3
4
api.php
4
api.php
@ -73,7 +73,11 @@ try {
|
|||||||
AutomationManager::executeAll();
|
AutomationManager::executeAll();
|
||||||
$fallbackManager = new FallbackManager(RANGES);
|
$fallbackManager = new FallbackManager(RANGES);
|
||||||
$fallbackManager->check();
|
$fallbackManager->check();
|
||||||
|
<<<<<<< HEAD
|
||||||
//LogKeeper::purge(LOGTIMOUT);
|
//LogKeeper::purge(LOGTIMOUT);
|
||||||
|
=======
|
||||||
|
LogKeeper::purge(LOGTIMOUT);
|
||||||
|
>>>>>>> 15d95dae1d1766044ec10522238bb848dff548c2
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$logManager->write("[Automation] Something happen during automation execution", LogRecordType::ERROR);
|
$logManager->write("[Automation] Something happen during automation execution", LogRecordType::ERROR);
|
||||||
}
|
}
|
||||||
|
@ -241,7 +241,10 @@ $( '[name="room"]' ).change(function (e) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
/*
|
/*
|
||||||
|
=======
|
||||||
|
>>>>>>> 15d95dae1d1766044ec10522238bb848dff548c2
|
||||||
var windowLoc = $(location).attr('pathname');
|
var windowLoc = $(location).attr('pathname');
|
||||||
windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
|
windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
|
||||||
console.log();
|
console.log();
|
||||||
@ -277,7 +280,13 @@ if (windowLoc == "/") {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
},4000);
|
},4000);
|
||||||
|
<<<<<<< HEAD
|
||||||
}*/
|
}*/
|
||||||
|
=======
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
>>>>>>> 15d95dae1d1766044ec10522238bb848dff548c2
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -149,6 +149,7 @@ class Ajax extends Template
|
|||||||
isset($_POST['action']) &&
|
isset($_POST['action']) &&
|
||||||
$_POST['action'] != ''
|
$_POST['action'] != ''
|
||||||
) {
|
) {
|
||||||
|
<<<<<<< HEAD
|
||||||
$updateData = [];
|
$updateData = [];
|
||||||
$allDevicesData = DeviceManager::getAllDevices();
|
$allDevicesData = DeviceManager::getAllDevices();
|
||||||
foreach ($allDevicesData as $deviceKey => $deviceValue) {
|
foreach ($allDevicesData as $deviceKey => $deviceValue) {
|
||||||
@ -216,6 +217,10 @@ class Ajax extends Template
|
|||||||
|
|
||||||
//TODO: PRO JS VRACET DATA
|
//TODO: PRO JS VRACET DATA
|
||||||
echo json_encode($updateData, JSON_PRETTY_PRINT);
|
echo json_encode($updateData, JSON_PRETTY_PRINT);
|
||||||
|
=======
|
||||||
|
//TODO: PRO JS VRACET DATA
|
||||||
|
ECHO 'test';
|
||||||
|
>>>>>>> 15d95dae1d1766044ec10522238bb848dff548c2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user