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

Device Sorting Fix

Browse Source
This commit is contained in:
GamerClassN7 2020-11-18 21:40:13 +01:00
parent 5ad11cbb10
commit 0e3f571a0d
4 changed files with 77 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Routes.php
View File

@ -19,6 +19,7 @@ $router->any('/logout', 'Logout');
$router->any('/automation', 'Automation'); $router->any('/automation', 'Automation');
$router->any('/setting', 'Setting'); $router->any('/setting', 'Setting');
$router->any('/device', 'Device'); $router->any('/device', 'Device');
$router->get('/device/{sortBy}/{sortType}', 'Device');
$router->any('/plugins', 'Plugins'); $router->any('/plugins', 'Plugins');
$router->any('/ajax', 'Ajax'); $router->any('/ajax', 'Ajax');
$router->any('/oauth', 'Oauth'); $router->any('/oauth', 'Oauth');

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

@ -3,10 +3,12 @@ class DeviceManager{
public static $devices; public static $devices;
static function getAllDevices () { static function getAllDevices () {
return Db::loadAll ("SELECT devices.* FROM devices return Db::loadAll ("SELECT * FROM devices
WHERE approved != ?", Array(2)); WHERE approved != ?", Array(2));
} }
static function getAllDevicesInRoom ($roomId = "") { static function getAllDevicesInRoom ($roomId = "") {
return Db::loadAll ("SELECT * FROM devices WHERE room_id = ? AND approved != ?", Array($roomId, 2)); return Db::loadAll ("SELECT * FROM devices WHERE room_id = ? AND approved != ?", Array($roomId, 2));
} }

107
app/views/Device.php
View File

@ -3,7 +3,8 @@
class Device extends Template class Device extends Template
{ {
function __construct () { function __construct($sortBy = null, $sortType = null)
{
$userManager = new UserManager(); $userManager = new UserManager();
$deviceManager = new DeviceManager(); $deviceManager = new DeviceManager();
$subDeviceManager = new SubDeviceManager(); $subDeviceManager = new SubDeviceManager();
@ -18,74 +19,51 @@ class Device extends Template
$template = new Template('device'); $template = new Template('device');
$template->prepare('title', $langMng->get("m_devices")); $template->prepare('title', $langMng->get("m_devices"));
if (!empty ($_GET['sort']) && !empty ($_SESSION['sort']) && $_SESSION['sort'] != $_GET['sort']) { $sortWordBook = [
unset($_SESSION['sort']); "id" => "device_id",
header('Location: device?sort=' . $_GET["sort"] . "&sortType=ASC"); "name" => "name",
die(); "room" => "room_id",
} "ip" => "ip_address",
"mac" => "mac",
"token" => "token",
"signal" => "signal",
"firmware" => "firmware_hash",
"icon" => "icon"
];
if (isset ($_GET['sortType'])) { $sortIcons = [
switch ($_GET['sortType']) { "ASC" => "&#xf0de",
case "DESC": "DESC" => "&#xf0dd",
$sortType = ""; ];
$sortIcon = "&#xf0dd";
break; $nextSort = [
case "ASC": "ASC" => "DESC",
$sortType = "DESC"; "DESC" => "ASC",
$sortIcon = "&#xf0de"; ];
break;
case "":
unset($_GET["sort"]);
unset($_GET["sortType"]);
header('Location: device');
die();
break;
}
} else {
$sortType = "ASC";
}
if (!empty ($_GET['sort']) && !empty ($_GET['sortType'])) {
$template->prepare ('sortIcon', array ($_GET['sort'] => $sortIcon));
$actualSort = "devices.device_id";
switch ($_GET['sort']) {
case "name":
$actualSort = "devices.name";
break;
case "room":
$actualSort = "rooms.name";
break;
case "ip":
$actualSort = "devices.ip_address";
break;
case "mac":
$actualSort = "devices.mac";
break;
case "token":
$actualSort = "devices.token";
break;
}
$devices = $deviceManager->getAllDevicesSorted ($actualSort, $_GET['sortType']);
} else {
$devices = $deviceManager->getAllDevices(); $devices = $deviceManager->getAllDevices();
if (empty($sortBy) && empty($sortType)) {
$sortBy = "id";
$sortType = "DESC";
} }
if (!empty ($_GET['sort'])) { $template->prepare('sortIcon', [$sortBy => $sortIcons[$sortType]]);
$_SESSION['sort'] = $_GET['sort'];
}
foreach ($devices as $key => $device) { foreach ($devices as $key => $device) {
//Signal Stenght
$subdevice = $subDeviceManager->getSubDeviceByMasterAndType($device['device_id'], "wifi"); $subdevice = $subDeviceManager->getSubDeviceByMasterAndType($device['device_id'], "wifi");
$devices[$key]['signal'] = "";
if (!empty($subdevice['subdevice_id'])) { if (!empty($subdevice['subdevice_id'])) {
$record = $recordManager->getLastRecord($subdevice['subdevice_id']); $record = $recordManager->getLastRecord($subdevice['subdevice_id']);
if (!empty($record)) { if (!empty($record)) {
$devices[$key]['signal'] = $record['value'] . " " . $subdevice['unit']; $devices[$key]['signal'] = $record['value'] . " " . $subdevice['unit'];
} }
} }
if (empty ($devices[$key]['signal'])) {
$devices[$key]['signal'] = ""; //Firmware Status
}
$localBinary = "../updater/" . str_replace(':', '', $device['mac']) . ".bin"; $localBinary = "../updater/" . str_replace(':', '', $device['mac']) . ".bin";
$devices[$key]['firmware_hash'] = "";
if (file_exists($localBinary)) { if (file_exists($localBinary)) {
$hash = md5_file($localBinary); $hash = md5_file($localBinary);
if ($hash == $device['firmware_hash']) { if ($hash == $device['firmware_hash']) {
@ -96,32 +74,19 @@ class Device extends Template
} else { } else {
$devices[$key]['firmware_hash'] = "false"; $devices[$key]['firmware_hash'] = "false";
} }
if (empty ($device['mac'])) {
$devices[$key]['firmware_hash'] = "";
}
} }
if (!empty ($_GET['sort']) && !empty ($_GET['sortType']) && $_GET['sort'] == "firmware") { $devices = Utilities::sortArrayByKey($devices, $sortWordBook[$sortBy], strtolower($sortType));
if ($_GET['sortType'] == "DESC") {
return Utilities::sortArrayByKey($devices, 'firmware_hash', "desc");
} else if ($_GET['sortType'] == "ASC") {
return Utilities::sortArrayByKey($devices, 'firmware_hash', "asc");
}
} else if (!empty ($_GET['sort']) && !empty ($_GET['sortType']) && $_GET['sort'] == "signal") {
if ($_GET['sortType'] == "DESC") {
return Utilities::sortArrayByKey($devices, 'signal', "desc");
} else if ($_GET['sortType'] == "ASC") {
return Utilities::sortArrayByKey($devices, 'signal', "asc");
}
}
$rooms = $roomManager->getAllRooms(); $rooms = $roomManager->getAllRooms();
$template->prepare('baseUrl', BASEURL);
$template->prepare('baseDir', BASEDIR); $template->prepare('baseDir', BASEDIR);
$template->prepare('debugMod', DEBUGMOD); $template->prepare('debugMod', DEBUGMOD);
$template->prepare('logToLiveTime', LOGTIMOUT); $template->prepare('logToLiveTime', LOGTIMOUT);
$template->prepare('rooms', $rooms); $template->prepare('rooms', $rooms);
$template->prepare ('sortType', $sortType); $template->prepare('sortType', $nextSort[$sortType]);
$template->prepare('devices', $devices); $template->prepare('devices', $devices);
$template->prepare('langMng', $langMng); $template->prepare('langMng', $langMng);

21
app/views/templates/device.phtml
View File

@ -5,6 +5,7 @@
<?php <?php
$partial = new Partial('head'); $partial = new Partial('head');
$partial->prepare('baseDir', $BASEDIR); $partial->prepare('baseDir', $BASEDIR);
$partial->prepare('baseUrl', $BASEURL);
$partial->render(); $partial->render();
?> ?>
<title><?php echo $TITLE ?></title> <title><?php echo $TITLE ?></title>
@ -25,15 +26,15 @@
<div class="col-md-9 main-body"> <div class="col-md-9 main-body">
<table class="table is-fluid"> <table class="table is-fluid">
<tr> <tr>
<th><a href="device">#</a></th> <th><a href="device/icon/<?php echo $SORTTYPE; ?>">#</a><i class="fa"><?php echo (!empty($SORTICON['icon']) ? $SORTICON['icon'] : ""); ?></i></th>
<th><a href="device?sort=name&sortType=<?php echo $SORTTYPE; ?>">Name</a><i class="fa"><?php echo (!empty($SORTICON['name']) ? $SORTICON['name'] : ""); ?></i></th> <th><a href="device/name/<?php echo $SORTTYPE; ?>">Name</a><i class="fa"><?php echo (!empty($SORTICON['name']) ? $SORTICON['name'] : ""); ?></i></th>
<th><a href="device?sort=room&sortType=<?php echo $SORTTYPE; ?>">Room</a><i class="fa"><?php echo (!empty($SORTICON['room']) ? $SORTICON['room'] : ""); ?></i></th> <th><a href="device/room/<?php echo $SORTTYPE; ?>">Room</a><i class="fa"><?php echo (!empty($SORTICON['room']) ? $SORTICON['room'] : ""); ?></i></th>
<th><a href="device?sort=signal&sortType=<?php echo $SORTTYPE; ?>">Signal</a><i class="fa"><?php echo (!empty($SORTICON['signal']) ? $SORTICON['signal'] : ""); ?></i></th> <th><a href="device/signal/<?php echo $SORTTYPE; ?>">Signal</a><i class="fa"><?php echo (!empty($SORTICON['signal']) ? $SORTICON['signal'] : ""); ?></i></th>
<th><a href="device?sort=firmware&sortType=<?php echo $SORTTYPE; ?>">Firmware</a><i class="fa"><?php echo (!empty($SORTICON['firmware']) ? $SORTICON['firmware'] : ""); ?></i></th> <th><a href="device/firmware/<?php echo $SORTTYPE; ?>">Firmware</a><i class="fa"><?php echo (!empty($SORTICON['firmware']) ? $SORTICON['firmware'] : ""); ?></i></th>
<th> <th>
<a href="device?sort=ip&sortType=<?php echo $SORTTYPE; ?>">IP Address</a><i class="fa"><?php echo (!empty($SORTICON['ip']) ? $SORTICON['ip'] : ""); ?></i><br> <a href="/device/ip/<?php echo $SORTTYPE; ?>">IP Address</a><i class="fa"><?php echo (!empty($SORTICON['ip']) ? $SORTICON['ip'] : ""); ?></i><br>
<a href="device?sort=mac&sortType=<?php echo $SORTTYPE; ?>">(Mac)</a><i class="fa"><?php echo (!empty($SORTICON['mac']) ? $SORTICON['mac'] : ""); ?></i><br> <a href="/device/mac/<?php echo $SORTTYPE; ?>">(Mac)</a><i class="fa"><?php echo (!empty($SORTICON['mac']) ? $SORTICON['mac'] : ""); ?></i><br>
<a href="device?sort=token&sortType=<?php echo $SORTTYPE; ?>">Token</a><i class="fa"><?php echo (!empty($SORTICON['token']) ? $SORTICON['token'] : ""); ?></i> <a href="/device/token/<?php echo $SORTTYPE; ?>">Token</a><i class="fa"><?php echo (!empty($SORTICON['token']) ? $SORTICON['token'] : ""); ?></i>
</th> </th>
<th>Action <th>Action
<form method="post" action=""> <form method="post" action="">
@ -45,7 +46,7 @@
<?php if (!empty($DEVICES)) : ?> <?php if (!empty($DEVICES)) : ?>
<?php foreach ($DEVICES as $device) : ?> <?php foreach ($DEVICES as $device) : ?>
<tr> <tr>
<td><i class="fa">&#x<?php echo (!empty($device['icon']) ? $device['icon'] : ""); ?></i></td> <td><i class="fa <?php echo (!empty($device['icon']) ? $device['icon'] : ""); ?>"></i></td>
<td> <td>
<form method="post" action=""> <form method="post" action="">
<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>"> <input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
@ -87,12 +88,12 @@
?> ?>
<i class="fa <?php echo $icon; ?>" style="color: <?php echo $color; ?>;"></i> <i class="fa <?php echo $icon; ?>" style="color: <?php echo $color; ?>;"></i>
<?php echo $device['firmware_hash'] ?>
<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware-<?php echo $device['device_id'] ?>').click();">&#xf0ee;</button> <button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware-<?php echo $device['device_id'] ?>').click();">&#xf0ee;</button>
<form style="display: none;" method="POST" action="" enctype="multipart/form-data"> <form style="display: none;" method="POST" action="" enctype="multipart/form-data">
<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>"> <input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
<input type="file" onchange="this.form.submit();" name="deviceFirmware" id="deviceFirmware-<?php echo $device['device_id'] ?>" value=""> <input type="file" onchange="this.form.submit();" name="deviceFirmware" id="deviceFirmware-<?php echo $device['device_id'] ?>" value="">
</form> </form>
<!--<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware-<?php //echo $device['device_id'] ?>').click();">&#xf1f8;</button>-->
<?php endif; ?> <?php endif; ?>
<div type="float: clear;"></div> <div type="float: clear;"></div>
</td> </td>