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

Draw pie with filter results and changed label, tiquet: #2076

This commit is contained in:
m-lopez-f 2015-04-13 15:50:49 +02:00
parent cc03dcd127
commit 85b00c080c
2 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_graph.php
View File

@ -2473,7 +2473,7 @@ function grafico_eventos_agente ($width = 300, $height = 200, $result = false, $
global $graphic_type;
//It was urlencoded, so we urldecode it
$url = html_entity_decode (rawurldecode ($url), ENT_QUOTES);
//$url = html_entity_decode (rawurldecode ($url), ENT_QUOTES);
$data = array ();
$loop = 0;
@ -2525,7 +2525,7 @@ function grafico_eventos_agente ($width = 300, $height = 200, $result = false, $
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $water_mark,
__('Others'), '', $water_mark,
$config['fontpath'], $config['font_size'], 1, 'bottom');
}

53
pandora_console/operation/events/events_list.php
View File

@ -732,10 +732,61 @@ else {
}
if (!empty($result)) {
if ($group_rep == 0) {
$sql = "SELECT COUNT(id_evento)
FROM $event_table
WHERE 1=1 " . $sql_post;
}
else {
$sql = "SELECT COUNT(1)
FROM (SELECT 1
FROM $event_table
WHERE 1=1 " . $sql_post . "
GROUP BY evento, id_agentmodule) AS t";
}
$limit = (int) db_get_sql ($sql);
if ($group_rep == 0) {
switch ($config["dbtype"]) {
case "mysql":
$sql = "SELECT *, 1 event_rep
FROM $event_table
WHERE 1=1 " . $sql_post . "
ORDER BY utimestamp DESC LIMIT 0,".$limit;
break;
case "postgresql":
$sql = "SELECT *, 1 event_rep
FROM $event_table
WHERE 1=1 " . $sql_post . "
ORDER BY utimestamp DESC LIMIT ".$limit." OFFSET 0";
break;
case "oracle":
$set = array();
$set['limit'] = $pagination;
$set['offset'] = $offset;
$sql = "SELECT *, 1 event_rep
FROM $event_table
WHERE 1=1 " . $sql_post . "
ORDER BY utimestamp DESC";
$sql = oracle_recode_query ($sql, $set);
break;
}
//Extract the events by filter (or not) from db
$results_graph = db_get_all_rows_sql ($sql);
}
else {
$results_graph = events_get_events_grouped($sql_post,
0,
$limit,
$meta,
$history);
}
$graph = '<div style="width: 350px; margin: 0 auto;">' .
grafico_eventos_agente(350, 185,
$result, $meta, $history, $tags_acls_condition,$pagination) .
$results_graph, $meta, $history, $tags_acls_condition,$limit) .
'</div>';
html_print_div(array('id' => 'events_graph',
'hidden' => true, 'content' => $graph));