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

Minor Tweeks

Browse Source
This commit is contained in:
GamerClassN7
2020-10-31 21:37:29 +01:00
parent f205df36ff
commit 8a00190850
7 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/managers/RecordManager.php
View File

@@ -86,7 +86,7 @@ class RecordManager{
$dateTime = $dateTime->modify($periodLocal);
$dateTime = $dateTime->format('Y-m-d H:i:s');
$groupBy = strtoupper($groupBy).'(time)';
$sql = 'SELECT value, time FROM records
$sql = 'SELECT value, time, execuded FROM records
WHERE
subdevice_id = ?
AND

2
app/models/managers/SubDeviceManager.php
View File

@@ -77,7 +77,7 @@ class SubDeviceManager
//TODO: @Patrik Check line 89
$rows = Db::loadAll("
SELECT d.room_id, sd.subdevice_id, sd.device_id, d.name, sd.type, sd.unit, r.value FROM subdevices sd
SELECT d.room_id, sd.subdevice_id, sd.device_id, d.icon, d.name, sd.type, sd.unit, r.value FROM subdevices sd
JOIN devices d ON sd.device_id = d.device_id
JOIN records r ON r.subdevice_id = sd.subdevice_id
WHERE d.room_id IN (".str_repeat("?,", count($roomIds)-1)."?)