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

merge

This commit is contained in:
unknown 2020-02-18 21:31:37 +01:00
parent 5a06a6c85a 15d95dae1d
commit c43b751bd3
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api.php
View File

@ -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);
} }

9
app/templates/js/script.js
View File

@ -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

5
app/views/Ajax.php
View File

@ -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
} }
} }
} }