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

Repair sort and get value wifi connection

Browse Source
This commit is contained in:
Haitem
2020-09-15 16:38:11 +02:00
parent 20469c65db
commit c75c67d420
3 changed files with 63 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/managers/DeviceManager.php
View File

@@ -3,7 +3,8 @@ class DeviceManager{
public static $devices;
static function getAllDevices () {
return Db::loadAll ("SELECT * FROM devices WHERE approved != ?", Array(2));
return Db::loadAll ("SELECT devices.* FROM devices
WHERE approved != ?", Array(2));
}
static function getAllDevicesInRoom ($roomId = "") {
@@ -27,7 +28,9 @@ class DeviceManager{
}
static function getAllDevicesSorted ($sort, $sortType = "ASC") {
return Db::loadAll ("SELECT devices.* FROM devices LEFT JOIN rooms ON devices.room_id = rooms.room_id WHERE devices.approved != ? ORDER BY $sort $sortType", Array(2));
return Db::loadAll ("SELECT devices.* FROM devices
LEFT JOIN rooms ON (devices.room_id = rooms.room_id)
WHERE devices.approved != ? ORDER BY $sort $sortType", Array(2));
}
public static function create ($name, $token) {