tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

#12153 Fix graph

Browse Source
This commit is contained in:
miguel angel rasteu 2023-10-05 09:45:17 +02:00
parent 09cae778c5
commit 87aa79b176
1 changed files with 82 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
pandora_console/include/functions_events.php
View File

@ -6207,17 +6207,48 @@ function event_get_counter_extraId(array $event, ?array $filters)
function event_print_graph(
$filter,
$graph_height=100,
$graph_height=400,
) {
global $config;
$show_all_data = false;
$events = events_get_all(['te.id_evento', 'te.timestamp', 'te.utimestamp'], $filter, null, null, 'te.utimestamp', true);
$start_utimestamp = $events[0]['utimestamp'];
$end_utimestamp = $events[array_key_last($events)]['utimestamp'];
$num_data = count($events);
$num_intervals = ($num_data > 75) ? 75 : $num_data;
if (empty($filter['date_from']) === false
&& empty($filter['time_from']) === false
&& empty($filter['date_to']) === false
&& empty($filter['time_to']) === false
) {
$start_utimestamp = strtotime($filter['date_from'].' '.$filter['time_from']);
$end_utimestamp = strtotime($filter['date_to'].' '.$filter['time_to']);
} else if ($filter['event_view_hr'] !== '') {
$start_utimestamp = strtotime('-'.$filter['event_view_hr'].' hours');
$end_utimestamp = strtotime('now');
} else {
$show_all_data = true;
$start_utimestamp = $events[0]['utimestamp'];
$end_utimestamp = $events[array_key_last($events)]['utimestamp'];
}
$data_events = [];
$control_timestamp = $start_utimestamp;
$count = 0;
foreach ($events as $event) {
if ($event['utimestamp'] === $control_timestamp) {
$count++;
} else {
$control_timestamp = $event['utimestamp'];
$count = 1;
}
$data_events[$control_timestamp] = $count;
}
$num_data = count($data_events);
$num_intervals = $num_data;
$period = ($end_utimestamp - $start_utimestamp);
if ($period <= SECONDS_6HOURS) {
$chart_time_format = 'H:i:s';
} else if ($period < SECONDS_1DAY) {
@ -6230,55 +6261,59 @@ function event_print_graph(
$chart_time_format = 'M d H\h';
}
$interval_length = (int) ($period / $num_intervals);
$currentutimestamp = $start_utimestamp;
for ($i = 0; $i < $num_intervals; $i++) {
if ($currentutimestamp === $start_utimestamp) {
$filter['aggs']['messages']['filters']['filters'][$i]['range']['utimestamp'] = [
'gte' => $currentutimestamp,
'lte' => ($currentutimestamp + $interval_length),
];
} else if ($currentutimestamp === $end_utimestamp) {
$filter['aggs']['messages']['filters']['filters'][$i]['range']['utimestamp'] = [
'gt' => $currentutimestamp,
'lte' => $end_utimestamp,
];
} else {
$filter['aggs']['messages']['filters']['filters'][$i]['range']['utimestamp'] = [
'gt' => $currentutimestamp,
'lte' => ($currentutimestamp + $interval_length),
];
}
$currentutimestamp += $interval_length;
}
$chart = [];
$labels = [];
$color = [];
$count = 0;
$control_timestamp = $start_utimestamp;
$data_events = [];
foreach ($events as $event) {
if ($event['utimestamp'] === $control_timestamp) {
$count++;
} else {
$control_timestamp = $event['utimestamp'];
$count = 1;
if ($show_all_data === true) {
foreach ($events as $event) {
if ($event['utimestamp'] === $control_timestamp) {
$count++;
} else {
$control_timestamp = $event['utimestamp'];
$count = 1;
}
$data_events[$control_timestamp] = $count;
}
$data_events[$control_timestamp] = $count;
}
$data_events = array_reverse($data_events, true);
$data_events = array_reverse($data_events, true);
foreach ($data_events as $utimestamp => $count) {
$labels[] = date($chart_time_format, $utimestamp);
$chart[] = [
'y' => $count,
'x' => date($chart_time_format, $utimestamp),
];
$color[] = '#82b92f';
foreach ($data_events as $utimestamp => $count) {
$labels[] = date($chart_time_format, $utimestamp);
$chart[] = [
'y' => $count,
'x' => date($chart_time_format, $utimestamp),
];
$color[] = '#82b92f';
}
} else {
$interval_length = (int) ($period / $num_intervals);
$intervals = [];
$intervals[0] = $start_utimestamp;
for ($i = 0; $i < $num_intervals; $i++) {
$intervals[($i + 1)] = ($intervals[$i] + $interval_length);
}
$control_data = [];
foreach ($data_events as $utimestamp => $count_event) {
for ($i = 0; $i < $num_intervals; $i++) {
if ((int) $utimestamp > (int) $intervals[$i] && (int) $utimestamp < (int) $intervals[($i + 1)]) {
$control_data[(string) $intervals[$i]] += $count_event;
}
}
}
for ($i = 0; $i < $num_intervals; $i++) {
$labels[] = date($chart_time_format, $intervals[$i]);
$chart[] = [
'y' => $control_data[$intervals[$i]],
'x' => date($chart_time_format, $intervals[$i]),
];
$color[] = '#82b92f';
}
}
$water_mark = [