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

Better Graphs #4

Browse Source
This commit is contained in:
JonatanRek 2019-09-29 09:23:42 +02:00
parent 7e047ee0a3
commit fdf94f8b8d
3 changed files with 121 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/class/ChartManager.php
View File

@ -1,4 +1,10 @@
<?php <?php
class ChartScale{
const HOUR = 'info';
const DAY = 'warning';
const MONTH = 'warning';
const YEAR = 'error';
}
class ChartManager{ class ChartManager{
function generateChart($data, $min = 0, $max = 100) function generateChart($data, $min = 0, $max = 100)
{ {

2
app/templates/part/head.phtml
View File

@ -18,7 +18,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="./app/templates/css/main.css"> <link rel="stylesheet" href="./app/templates/css/main.css?v2">
<link rel="stylesheet" href="./app/templates/css/font-awesome.min.css"> <link rel="stylesheet" href="./app/templates/css/font-awesome.min.css">
<link rel="stylesheet" href="./app/templates/css/modal.css"> <link rel="stylesheet" href="./app/templates/css/modal.css">
<link rel="stylesheet" href="./app/templates/css/pre.css"> <link rel="stylesheet" href="./app/templates/css/pre.css">

110
app/views/Ajax.php
View File

@ -50,34 +50,29 @@ class Ajax extends Template
} else if (isset($_POST['subDevice']) && isset($_POST['action']) && $_POST['action'] == "chart") { } else if (isset($_POST['subDevice']) && isset($_POST['action']) && $_POST['action'] == "chart") {
//TODO lepe rozstrukturovat //TODO lepe rozstrukturovat
$subDeviceId = $_POST['subDevice']; $subDeviceId = $_POST['subDevice'];
$period = $_POST['period'];
$groupBy = $_POST['group'];
$subDevice = SubDeviceManager::getSubDevice($subDeviceId); $subDevice = SubDeviceManager::getSubDevice($subDeviceId);
$records = RecordManager::getAllRecordForGraph($subDeviceId); $records = RecordManager::getAllRecordForGraph($subDeviceId, $period, $groupBy);
$array = array_column($records, 'value'); $array = array_column($records, 'value');
$arrayTime = array_column($records, 'time'); $arrayTime = array_column($records, 'time');
$output = []; $output = [];
foreach ($array as $key => $value) { foreach ($array as $key => $value) {
/*if ($value == 1 || $value == 0)
{
$output[$key]['y'] = $value; $output[$key]['y'] = $value;
} if ($subDevice['type'] == 'light'){
if ($value > 810){ if ($value > 810){
$output[$key]['y'] = 1; $output[$key]['y'] = 1;
} else { } else {
$output[$key]['y'] = 0; $output[$key]['y'] = 0;
}*/ }
$output[$key]['y'] = $value; }
$timeStamp = new DateTime($arrayTime[$key]); $timeStamp = new DateTime($arrayTime[$key]);
$output[$key]['t'] = $timeStamp->format("Y-m-d") . 'T' . $timeStamp->format("H:i:s") . 'Z'; $output[$key]['t'] = $timeStamp->format("Y-m-d") . 'T' . $timeStamp->format("H:i:s") . 'Z';
} }
$data = json_encode($output); $data = json_encode($output);
$arrayTimeStamps = array_column($records, 'time'); $arrayTimeStamps = array_column($records, 'time');
@ -87,49 +82,13 @@ foreach ($arrayTimeStamps as $key => $value) {
$labels = json_encode($arrayTimeStamps); $labels = json_encode($arrayTimeStamps);
$range = RANGES[$subDevice['type']]; $range = RANGES[$subDevice['type']];
$graphType = $range['graph'];
header('Content-Type: application/json'); header('Content-Type: application/json');
/*$JSON = '{
"type": "line",
"data": {
"labels": ' . $data . ',
"datasets": [{
"data": ' . $data . ',
"backgroundColor": "#7522bf",
"lineTension": 0,
"radius": 5
}]
},
"options": {
"legend": {
"display": false
},
"scales": {
"xAxes": [{
"type": "time",
"time": {
"unit": "hour"
}
}],
"yAxes": [{
"ticks": {
"min": ' . $range['min'] . ',
"max": ' . $range['max'] . ',
"steps": ' . $range['scale'] . '
}
}]
},
"tooltips": {
"enabled": false
},
"hover": {
"mode": null
}
}
}';*/
$JSON = ' $JSON = '
{ {
"type": "bar", "type": "' . $graphType . '",
"data": { "data": {
"datasets": [{ "datasets": [{
"data": ' . $data . ' "data": ' . $data . '
@ -159,17 +118,7 @@ $JSON = '
"mode": true "mode": true
} }
} }
} }';
';
/*
*/
echo $JSON; echo $JSON;
die(); die();
} else if (isset($_POST['action']) && $_POST['action'] == "getState") { } else if (isset($_POST['action']) && $_POST['action'] == "getState") {
@ -226,3 +175,42 @@ die();
} }
} }
/*$JSON = '{
"type": "line",
"data": {
"labels": ' . $data . ',
"datasets": [{
"data": ' . $data . ',
"backgroundColor": "#7522bf",
"lineTension": 0,
"radius": 5
}]
},
"options": {
"legend": {
"display": false
},
"scales": {
"xAxes": [{
"type": "time",
"time": {
"unit": "hour"
}
}],
"yAxes": [{
"ticks": {
"min": ' . $range['min'] . ',
"max": ' . $range['max'] . ',
"steps": ' . $range['scale'] . '
}
}]
},
"tooltips": {
"enabled": false
},
"hover": {
"mode": null
}
}
}';*/