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

Detail chart

Browse Source
This commit is contained in:
JonatanRek
2020-10-14 14:31:22 +02:00
parent e39b6655e3
commit 3047ead205
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/api/WidgetApi.php
View File

@@ -59,10 +59,11 @@ class WidgetApi extends ApiController{
$labels = []; $labels = [];
$values = []; $values = [];
foreach ($events as $key => $event) { foreach ($events as $key => $event) {
$labels[] = (new DateTime($event['time']))->format('H:i'); $recordDatetime = new DateTime($event['time']);
$labels[] = $recordDatetime->format('H:i');
$values[] = [ $values[] = [
$event['time'], 'y' => $event['value'],
$event['value'], 't' => $recordDatetime->getTimestamp()*1000,
]; ];
} }
@@ -70,11 +71,31 @@ class WidgetApi extends ApiController{
'records'=> $events, 'records'=> $events,
'graph'=> [ 'graph'=> [
'labels' => $labels, 'labels' => $labels,
'values' => $values, 'data' => [
'min' => RANGES[$subDeviceData['type']]['min'], 'dataset' => $values
'max' => RANGES[$subDeviceData['type']]['max'], ],
'scale' => RANGES[$subDeviceData['type']]['scale'], 'scales' => [
'graph' => RANGES[$subDeviceData['type']]['graph'], 'xAxis' => [
'type' => 'time',
'distribution' => 'linear',
],
'yAxes' => [
'ticks' => [
'min' => RANGES[$subDeviceData['type']]['min'],
'max' => RANGES[$subDeviceData['type']]['max'],
'steps' => RANGES[$subDeviceData['type']]['scale'],
]
]
],
'legend' => [
'display' => false
],
'tooltips' => [
'enabled' => true
],
'hover' => [
'mode' => true
],
], ],
'comError' => $connectionError, 'comError' => $connectionError,
'lastConnectionTime' => (empty($niceTime) ? "00:00" : $niceTime), 'lastConnectionTime' => (empty($niceTime) ? "00:00" : $niceTime),