tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-02-21 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* 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



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7697 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-21 15:59:13 +00:00
parent 70a1554a35
commit 51654d991e
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2013-02-21 Sergio Martin <sergio.martin@artica.es>
* 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 <sergio.martin@artica.es> 2013-02-21 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql * pandoradb_data.sql

2
pandora_console/include/functions_events.php
View File

@ -754,7 +754,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
$table->head[5] = __('Timestamp'); $table->head[5] = __('Timestamp');
$table->headclass[5] = "datos3 f9"; $table->headclass[5] = "datos3 f9";
$table->align[5] = "right"; $table->align[5] = "left";
foreach ($result as $event) { foreach ($result as $event) {
if (! check_acl ($config["id_user"], $event["id_grupo"], "ER")) { if (! check_acl ($config["id_user"], $event["id_grupo"], "ER")) {

4
pandora_console/include/graphs/pChart/pPie.class.php
View File

@ -518,7 +518,7 @@
if ( $SecondPass ) if ( $SecondPass )
{ {
$Step = 360 / (2 * PI * $Radius); $Step = 360 / (2 * PI * $Radius);
$Offset = 360; $ID = count($Values)-1; $Offset = 360; $ID = 0;
foreach($Values as $Key => $Value) foreach($Values as $Key => $Value)
{ {
$FirstPoint = TRUE; $FirstPoint = TRUE;
@ -556,7 +556,7 @@
} }
$this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
$Offset = $i - $DataGapAngle; $ID--; $Offset = $i - $DataGapAngle; $ID++;
} }
} }

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

@ -361,21 +361,6 @@ echo "</form>"; //This is the filter div
echo "</div>"; echo "</div>";
$params = array();
$params['position'] = 'right';
$params['icon_closed'] = 'images/setup.png';
$params['body_text'] = '<b>' . __('Events graph by agent') . '</b>';
$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); $event_table = events_get_events_table($meta, $history);
if ($group_rep == 0) { if ($group_rep == 0) {
@ -411,6 +396,23 @@ else {
$result = events_get_events_grouped($sql_post, $offset, $pagination, $meta, $history); $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'] = '<b>' . __('Events graph by agent') . '</b>';
$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 // Delete rnum field generated by oracle_recode_query() function
if (($config['dbtype'] == 'oracle') && ($result !== false)) { if (($config['dbtype'] == 'oracle') && ($result !== false)) {
for ($i=0; $i < count($result); $i++) { for ($i=0; $i < count($result); $i++) {