tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

performance events view#8800

This commit is contained in:
Daniel Barbero Martin 2022-04-19 09:30:27 +02:00
parent 3f855702b2
commit e46be28765
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -2464,7 +2464,7 @@ $class = 'databox filters';
<td class="bolder"> <td class="bolder">
<?php <?php
echo __('Render definition').ui_print_help_tip( echo __('Render definition').ui_print_help_tip(
__('Be aware because not all CSS inline styles are supported in the pdf library'), __('Please note that not all CSS styles are supported by PDF reports.'),
true true
); );
?> ?>

16
pandora_console/include/functions_events.php
View File

@ -757,7 +757,7 @@ function events_get_all(
if (is_array($fields) === false && $fields === 'count' if (is_array($fields) === false && $fields === 'count'
|| (is_array($fields) === true && $fields[0] === 'count') || (is_array($fields) === true && $fields[0] === 'count')
) { ) {
$fields = ['te.*']; $fields = ['te.id_evento'];
$count = true; $count = true;
} else if (!is_array($fields)) { } else if (!is_array($fields)) {
error_log('[events_get_all] Fields must be an array or "count".'); error_log('[events_get_all] Fields must be an array or "count".');
@ -1406,17 +1406,15 @@ function events_get_all(
case '1': case '1':
// Group by events. // Group by events.
$group_by .= 'te.estado, te.evento, te.id_agente, te.id_agentmodule'; $group_by .= 'te.estado, te.event_type, te.id_agente, te.id_agentmodule';
$group_by .= $extra; $group_by .= $extra;
break; break;
case '2': case '2':
// Group by agents. // Group by agents.
$tagente_join = 'INNER'; $tagente_join = 'INNER';
// $group_by .= 'te.id_agente, te.event_type';
// $group_by .= $extra;
$group_by = ''; $group_by = '';
$order_by = events_get_sql_order('id_agente', 'asc'); $order_by = events_get_sql_order('te.id_agente', 'asc');
if (isset($order, $sort_field)) { if (isset($order, $sort_field)) {
$order_by .= ','.events_get_sql_order( $order_by .= ','.events_get_sql_order(
$sort_field, $sort_field,
@ -1477,13 +1475,13 @@ function events_get_all(
$group_selects = ''; $group_selects = '';
if ($group_by != '') { if ($group_by != '') {
$group_selects = ',COUNT(id_evento) AS event_rep if ($count === false) {
,GROUP_CONCAT(DISTINCT user_comment SEPARATOR "<br>") AS comments, $group_selects = ',COUNT(id_evento) AS event_rep,
GROUP_CONCAT(DISTINCT user_comment SEPARATOR "<br>") AS comments,
MAX(utimestamp) as timestamp_last, MAX(utimestamp) as timestamp_last,
MIN(utimestamp) as timestamp_first, MIN(utimestamp) as timestamp_first,
MAX(id_evento) as max_id_evento'; MAX(id_evento) as max_id_evento';
if ($count === false) {
$idx = array_search('te.user_comment', $fields); $idx = array_search('te.user_comment', $fields);
if ($idx !== false) { if ($idx !== false) {
unset($fields[$idx]); unset($fields[$idx]);
@ -1573,7 +1571,7 @@ function events_get_all(
('.$sql.') tbase'; ('.$sql.') tbase';
} }
if ($count) { if ($count === true) {
$sql = 'SELECT count(*) as nitems FROM ('.$sql.') tt'; $sql = 'SELECT count(*) as nitems FROM ('.$sql.') tt';
} }

1
pandora_console/include/styles/events.css
View File

@ -181,6 +181,7 @@ fieldset {
color: #777; color: #777;
border: none; border: none;
margin-top: -2em; margin-top: -2em;
box-sizing: border-box;
} }
/* Image open dialog in group events by agents*/ /* Image open dialog in group events by agents*/