diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f385ce58b7..9d184b315a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2013-02-21 Sergio Martin + + * include/functions_events.php + operation/events/events_list.php: Little fixes + of new layout of events + + * include/graphs/pChart/pPie.class.php: Fixed a + bug of the pChart library of ugly borders in the + 3d pie graphs + 2013-02-21 Sergio Martin * pandoradb_data.sql diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 1a4959cbff..beb2d82d61 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -754,7 +754,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret $table->head[5] = __('Timestamp'); $table->headclass[5] = "datos3 f9"; - $table->align[5] = "right"; + $table->align[5] = "left"; foreach ($result as $event) { if (! check_acl ($config["id_user"], $event["id_grupo"], "ER")) { diff --git a/pandora_console/include/graphs/pChart/pPie.class.php b/pandora_console/include/graphs/pChart/pPie.class.php index 102d289403..fe8dc4cf80 100755 --- a/pandora_console/include/graphs/pChart/pPie.class.php +++ b/pandora_console/include/graphs/pChart/pPie.class.php @@ -518,7 +518,7 @@ if ( $SecondPass ) { $Step = 360 / (2 * PI * $Radius); - $Offset = 360; $ID = count($Values)-1; + $Offset = 360; $ID = 0; foreach($Values as $Key => $Value) { $FirstPoint = TRUE; @@ -556,7 +556,7 @@ } $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); - $Offset = $i - $DataGapAngle; $ID--; + $Offset = $i - $DataGapAngle; $ID++; } } diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 9b2f1dfdf3..f97c5706a6 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -361,21 +361,6 @@ echo ""; //This is the filter div echo ""; -$params = array(); -$params['position'] = 'right'; -$params['icon_closed'] = 'images/setup.png'; -$params['body_text'] = '' . __('Events graph by agent') . ''; -$params['body_text'] .= grafico_eventos_grupo(350, 248, rawurlencode ($sql_post), $meta, $history); -$params['icon_closed'] = '/images/chart_curve'; -$params['icon_open'] = '/images/chart_curve'; -$params['height'] = '250px'; -$params['top'] = 'auto_below'; -$params['autotop'] = 'menu_tab_frame_view'; -$params['icon_width'] = 16; -$params['icon_height'] = 16; - -html_print_side_layer($params); - $event_table = events_get_events_table($meta, $history); if ($group_rep == 0) { @@ -411,6 +396,23 @@ else { $result = events_get_events_grouped($sql_post, $offset, $pagination, $meta, $history); } +if(!empty($result)) { + $params = array(); + $params['position'] = 'right'; + $params['icon_closed'] = 'images/setup.png'; + $params['body_text'] = '' . __('Events graph by agent') . ''; + $params['body_text'] .= grafico_eventos_grupo(350, 248, rawurlencode ($sql_post), $meta, $history); + $params['icon_closed'] = '/images/chart_curve.png'; + $params['icon_open'] = '/images/chart_curve.png'; + $params['height'] = '250px'; + $params['top'] = 'auto_below'; + $params['autotop'] = 'menu_tab_frame_view'; + $params['icon_width'] = 16; + $params['icon_height'] = 16; + + html_print_side_layer($params); +} + // Delete rnum field generated by oracle_recode_query() function if (($config['dbtype'] == 'oracle') && ($result !== false)) { for ($i=0; $i < count($result); $i++) {