SchultesDev/pi-control
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Korrekturen

Browse Source 
URLs angepasst
Statistik Einheit automatisch ändern (MB -> GB)
This commit is contained in:
Gregor Schulte
2022-04-16 20:56:12 +02:00
parent 1e60371abe
commit 57608f3b2f
10 changed files with 230 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
api/v1/statistic.php
View File

@@ -1,22 +1,20 @@
<?php
const PICONTROL = true;
(include_once realpath(dirname(__FILE__)).'/../../resources/init.php') or die('Error: 0x0000');
(include_once LIBRARY_PATH.'main/main.function.php') or die('Error: 0x0001');
(include_once LIBRARY_PATH.'statistic/statistic.class.php') or die('Error: 0x0002');
(include_once LIBRARY_PATH.'statistic/statistic.function.php') or die('Error: 0x0003');
(include_once LIBRARY_PATH.'api/api.class.php') or die('Error: 0x0004');
(include_once LIBRARY_PATH.'plugin/plugin.function.php') or die('Error: 0x0005');
(include_once realpath(dirname(__FILE__)) . '/../../resources/init.php') or die('Error: 0x0000');
(include_once LIBRARY_PATH . 'main/main.function.php') or die('Error: 0x0001');
(include_once LIBRARY_PATH . 'statistic/statistic.class.php') or die('Error: 0x0002');
(include_once LIBRARY_PATH . 'statistic/statistic.function.php') or die('Error: 0x0003');
(include_once LIBRARY_PATH . 'api/api.class.php') or die('Error: 0x0004');
(include_once LIBRARY_PATH . 'plugin/plugin.function.php') or die('Error: 0x0005');
$api = new API;
if (isset($_POST['id']))
{
if (isset($_POST['id'])) {
$controller = new StatisticController();
$controller->loadStatistics();
if (($name = $controller->getStatisticName($_POST['id'])) !== false)
{
if (($name = $controller->getStatisticName($_POST['id'])) !== false) {
if (isset($_POST['plugin']) && trim($_POST['plugin']) != '')
pluginLanguage(trim($_POST['plugin']));
@@ -25,29 +23,28 @@ if (isset($_POST['id']))
$statistic = $builder->getArray();
$log = new LogStatistic();
$log->setFile(LOG_PATH.$statistic['raw'].'.csv');
$log->setFile(LOG_PATH . $statistic['raw'] . '.csv');
$logData = $log->getAll();
$arr = $info = array();
foreach ($statistic['columns'] as $column)
foreach ($statistic['columns'] as $column) {
$arr['cols'][] = array('id' => '', 'label' => _t($column['label']), 'type' => $column['type']);
}
getRowsFromLog($arr, $info, $log->getAll(), $statistic['columns'], $statistic['cycle']);
getRowsFromLog($arr, $info, $logData, $statistic['columns'], $statistic['cycle']);
if (isset($arr['rows']))
{
if (isset($arr['rows'])) {
if (isset($_POST['type']) && $_POST['type'] == 'googleChart')
$arr['rows'] = convertForGoogleChart($arr['rows']);
$arr['rows'] = array_slice($arr['rows'], -2016);
$arr['periods'] = $info['periods'];
foreach (array('min', 'max') as $type)
{
foreach (array('min', 'max') as $type) {
if ($statistic['limits'][$type]['use'] == 'multiply')
$arr[$type] = round($info[$type] * $statistic['limits'][$type]['value']);
elseif ($statistic['limits'][$type]['use'] == 'fix')
{
elseif ($statistic['limits'][$type]['use'] == 'fix') {
if ($statistic['limits'][$type]['fix'] == true)
$arr[$type] = $statistic['limits'][$type]['value'];
else
@@ -56,23 +53,18 @@ if (isset($_POST['id']))
}
$api->addData('statistic', $arr);
}
else
} else
$api->setError('error', 'Empty data.');
}
else
} else
$api->setError('error', 'Data not found.');
}
else
{
} else {
$statistics = array();
$hiddenStatistics = unserialize(htmlspecialchars_decode(getConfig('main:statistic.hidden', 'a:0:{}')));
$controller = new StatisticController();
$controller->loadStatistics();
foreach ($controller->getStatistics() as $statistic)
{
foreach ($controller->getStatistics() as $statistic) {
$builder = new StatisticBuilder();
$builder->loadFromFile($statistic);