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

Fixes

This commit is contained in:
Václav Španinger 2021-01-05 13:24:49 +01:00
parent 1415c0cf2d
commit 696ff07987
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/EndpointsApi.php
View File

@ -62,6 +62,7 @@ class EndpointsApi extends ApiController{
} }
$device = DeviceManager::getDeviceByToken($obj['token']); $device = DeviceManager::getDeviceByToken($obj['token']);
DeviceManager::setHeartbeat($device['device_id']);
//Diagnostic //Diagnostic
if (isset($obj['settings'])){ if (isset($obj['settings'])){
@ -110,7 +111,7 @@ class EndpointsApi extends ApiController{
if (!SubDeviceManager::getSubDeviceByMaster($device['device_id'], $key)) { if (!SubDeviceManager::getSubDeviceByMaster($device['device_id'], $key)) {
SubDeviceManager::create($device['device_id'], $key, UNITS[$key]); SubDeviceManager::create($device['device_id'], $key, UNITS[$key]);
} }
$subDeviceLastReordValue[$key] = $value['value']; $subDeviceLastReordValue[$key] = $value['value'];
RecordManager::create($device['device_id'], $key, round($value['value'],3)); RecordManager::create($device['device_id'], $key, round($value['value'],3));
$logManager->write("[API] Device_ID " . $device['device_id'] . " writed value " . $key . ' ' . $value['value'], LogRecordTypes::INFO); $logManager->write("[API] Device_ID " . $device['device_id'] . " writed value " . $key . ' ' . $value['value'], LogRecordTypes::INFO);

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

@ -7,7 +7,9 @@ class DeviceManager{
WHERE approved != ?", Array(2)); WHERE approved != ?", Array(2));
} }
static function setHeartbeat($deviceId){
self::edit($deviceId, ['heartbeat' => date("Y-m-d H:i:s", time())]);
}
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));

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

@ -50,7 +50,7 @@ class SubDeviceManager
} }
//check if dubdevice exist //check if dubdevice exist
//Add History to be set in Creation
public static function create($deviceId, $type, $unit) public static function create($deviceId, $type, $unit)
{ {
$record = array( $record = array(

6
public/css/main.css
View File

@ -2660,19 +2660,19 @@ html {
@font-face { @font-face {
font-family: 'Metropolis'; font-family: 'Metropolis';
src: url("../fonts/Metropolis-Regular.ttf"); /*src: url("../fonts/Metropolis-Regular.ttf");*/
font-weight: 400; font-weight: 400;
} }
@font-face { @font-face {
font-family: 'Metropolis'; font-family: 'Metropolis';
src: url("../fonts/Metropolis-Medium.ttf"); /*src: url("../fonts/Metropolis-Medium.ttf");*/
font-weight: 500; font-weight: 500;
} }
@font-face { @font-face {
font-family: 'Metropolis'; font-family: 'Metropolis';
src: url("../fonts/Metropolis-SemiBold.ttf"); /*src: url("../fonts/Metropolis-SemiBold.ttf");*/
font-weight: 600; font-weight: 600;
} }