Browse Source

Fixes

3.0
Václav Španinger 1 year ago
parent
commit
696ff07987
4 changed files with 9 additions and 6 deletions
  1. +2
    -1
      app/api/EndpointsApi.php
  2. +3
    -1
      app/models/managers/DeviceManager.php
  3. +1
    -1
      app/models/managers/SubDeviceManager.php
  4. +3
    -3
      public/css/main.css

+ 2
- 1
app/api/EndpointsApi.php View File

@ -62,6 +62,7 @@ class EndpointsApi extends ApiController{
}
$device = DeviceManager::getDeviceByToken($obj['token']);
DeviceManager::setHeartbeat($device['device_id']);
//Diagnostic
if (isset($obj['settings'])){
@ -110,7 +111,7 @@ class EndpointsApi extends ApiController{
if (!SubDeviceManager::getSubDeviceByMaster($device['device_id'], $key)) {
SubDeviceManager::create($device['device_id'], $key, UNITS[$key]);
}
$subDeviceLastReordValue[$key] = $value['value'];
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);

+ 3
- 1
app/models/managers/DeviceManager.php View File

@ -7,7 +7,9 @@ class DeviceManager{
WHERE approved != ?", Array(2));
}
static function setHeartbeat($deviceId){
self::edit($deviceId, ['heartbeat' => date("Y-m-d H:i:s", time())]);
}
static function getAllDevicesInRoom ($roomId = "") {
return Db::loadAll ("SELECT * FROM devices WHERE room_id = ? AND approved != ?", Array($roomId, 2));

+ 1
- 1
app/models/managers/SubDeviceManager.php View File

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

+ 3
- 3
public/css/main.css View File

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

Loading…
Cancel
Save