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

At home indicator

This commit is contained in:
JonatanRek 2019-09-09 21:30:50 +02:00
parent 4c87116f06
commit ad7c192a90
1 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
views/Home.php
View File

@ -25,15 +25,15 @@ class Home extends Template
foreach ($subDevicesData as $subDeviceKey => $subDeviceData) {
$events = RecordManager::getLastRecord($subDeviceData['subdevice_id'], 5);
$lastRecord = RecordManager::getLastRecord($subDeviceData['subdevice_id']);
//TODO: skontrolovat zdali se jedná o poslední (opravdu nejaktuálnější) záznam
$lastRecord = $events[0];
$parsedValue = round($lastRecord['value']);
/*Value Parsing*/
if ($subDeviceData['type'] == "on/off") {
$parsedValue = ($parsedValue == 1 ? 'ON' : 'OFF');
}
if ($subDeviceData['type'] == "door") {
$replacementTrue = 'Closed';
$replacementFalse = 'Opened';
@ -64,18 +64,6 @@ class Home extends Template
}
}
$subDevice = SubDeviceManager::getSubDevice($subDeviceData['subdevice_id']);
$records = RecordManager::getAllRecordForGraph($subDeviceData['subdevice_id']);
$array = array_column($records, 'value');
foreach ($array as $key => $value) {
$array[$key] = $value . $subDevice['unit'];
}
$data = json_encode($array);
$labels = json_encode($array);
$date2 = new DateTime($lastRecord['time']);
$niceTime = $this->ago($date2);
@ -136,29 +124,6 @@ class Home extends Template
];
}
if (isset($_POST['deviceId'])){
$deviceData = DeviceManager::getDeviceById($_POST['deviceId']);
$subDevices = [];
$subDevicesData = SubDeviceManager::getAllSubDevices($_POST['deviceId']);
foreach ($subDevicesData as $subDeviceKey => $subDeviceData) {
$subDevices[$subDeviceData['subdevice_id']] = [
'type' => $subDeviceData['type'],
'unit' => $subDeviceData['unit'],
];
}
$device = [
'id' => $deviceData['device_id'],
'name' => $deviceData['name'],
'token' => $deviceData['token'],
'icon' => $deviceData['icon'],
'subDevices' => $subDevices,
];
$template->prepare('deviceData', $device);
}
$users = UserManager::getUsers();
$template->prepare('users', $users);