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

Widget duplication Fix

Browse Source
This commit is contained in:
Václav Španinger
2020-07-20 12:46:46 +02:00
parent 05bd0dbc64
commit 14a33b83d0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,6 +75,7 @@ class SubDeviceManager
public static function getSubdevicesByRoomIds($roomIds = NULL) { public static function getSubdevicesByRoomIds($roomIds = NULL) {
if(empty($roomIds)) return NULL; if(empty($roomIds)) return NULL;
//TODO: @Patrik Check line 89
$rows = Db::loadAll(" $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.name, sd.type, sd.unit, r.value FROM subdevices sd
JOIN devices d ON sd.device_id = d.device_id JOIN devices d ON sd.device_id = d.device_id
@@ -85,6 +86,7 @@ class SubDeviceManager
FROM records FROM records
GROUP BY subdevice_id GROUP BY subdevice_id
) )
GROUP BY subdevice_id
ORDER BY type DESC ORDER BY type DESC
", $roomIds); ", $roomIds);