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

Revert "Added data precision to events table. Ticket #288" 

This reverts commit f6f5d64d32.
This commit is contained in:
Arturo Gonzalez 2017-02-17 13:15:28 +01:00
parent f02827d235
commit 294cb5a14f
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/include/functions_events.php
View File

@ -4076,17 +4076,7 @@ function events_list_events_grouped_agents($sql) {
return html_print_table($table,true);
}
function get_data_formated_in_event_name ($event_name) {
if (preg_match('/\(\d+\.\d+\)/', $event_name)) {
$event_name_parts = explode(" (", $event_name);
$data = explode(")", $event_name_parts[1]);
$data_event = (int)$data[0];
$data_event = remove_right_zeros(number_format($data_event, $config['graph_precision']));
return $event_name_parts[0] . " (" . $data_event . ")";
}
else {
return $event_name;
}
}
?>

4
pandora_console/operation/events/events.build_table.php
View File

@ -407,14 +407,12 @@ else {
}
if (in_array('evento', $show_fields)) {
$event_with_formated_data = get_data_formated_in_event_name(io_safe_output($event["evento"]));
// Event description
$data[$i] = '<span title="'.$event["evento"].'" class="f9">';
if($allow_action) {
$data[$i] .= '<a href="javascript:" onclick="show_event_dialog(' . $event["id_evento"] . ', '.$group_rep.');">';
}
$data[$i] .= '<span class="'.$myclass.'" style="font-size: 7.5pt;">' . ui_print_truncate_text ($event_with_formated_data, 160) . '</span>';
$data[$i] .= '<span class="'.$myclass.'" style="font-size: 7.5pt;">' . ui_print_truncate_text (io_safe_output($event["evento"]), 160) . '</span>';
if($allow_action) {
$data[$i] .= '</a>';
}