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

fix charts

This commit is contained in:
Daniel Barbero Martin 2020-10-28 12:50:15 +01:00
parent 5278a80d4c
commit 9b81da193b
5 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_graph.php
View File

@ -2541,13 +2541,9 @@ function graphic_agentaccess(
} else { } else {
$options['generals']['pdf']['width'] = 350; $options['generals']['pdf']['width'] = 350;
$options['generals']['pdf']['height'] = 125; $options['generals']['pdf']['height'] = 125;
if (!empty($data_array)) { $imgbase64 = '<img src="data:image/jpg;base64,';
$imgbase64 = '<img src="data:image/jpg;base64,'; $imgbase64 .= vbar_graph($data_array, $options, 2);
$imgbase64 .= vbar_graph($data_array, $options, 2); $imgbase64 .= '" />';
$imgbase64 .= '" />';
} else {
$imgbase64 .= vbar_graph($data_array, $options, 2);
}
return $imgbase64; return $imgbase64;
} }

2
pandora_console/include/functions_treeview.php
View File

@ -802,7 +802,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$events_graph = '<div style="width: 100%; height: 90px; display: flex; flex-direction: row; justify-content: center;">'; $events_graph = '<div style="width: 100%; height: 90px; display: flex; flex-direction: row; justify-content: center;">';
$events_graph .= graph_graphic_agentevents( $events_graph .= graph_graphic_agentevents(
$id_agente, $id_agente,
'385px;', '340px;margin:0',
45, 45,
SECONDS_1DAY, SECONDS_1DAY,
'', '',

19
pandora_console/include/graphs/functions_flot.php
View File

@ -346,13 +346,7 @@ function menu_graph(
$threshold = true; $threshold = true;
} }
$return .= "<div id='general_menu_$graph_id' class='menu_graph' style=' $return .= "<div id='general_menu_$graph_id' class='menu_graph'>";
width: 20px;
height: 150px;
left:100%;
position: absolute;
top: 0px;
background-color: tranparent;'>";
$return .= "<div id='menu_$graph_id' "."style='display: none; ".'text-align: center;'.'position: relative;'."border-bottom: 0px;'> $return .= "<div id='menu_$graph_id' "."style='display: none; ".'text-align: center;'.'position: relative;'."border-bottom: 0px;'>
<a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$params['homeurl']."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>"; <a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$params['homeurl']."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
if ($threshold) { if ($threshold) {
@ -745,13 +739,12 @@ function flot_slicesbar_graph(
// Set some containers to legend, graph, timestamp tooltip, etc. // Set some containers to legend, graph, timestamp tooltip, etc.
$height = ((int) $height + 15); $height = ((int) $height + 15);
if ($stat_win) {
$return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'%; height: '.$height."px; display: inline-block;'></div>";
} else {
$return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'%; height: '.$height."px;'></div>";
}
$return .= "<div id='value_$graph_id' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>"; $style = 'width:'.$width.'%;';
$style .= 'height:'.$height.'px;';
$return = "<div id='".$graph_id."' class='noresizevc graph ".$adapt_key."' style='".$style."'></div>";
$return .= "<div id='value_".$graph_id."' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>";
// Set a weird separator to serialize and unserialize // Set a weird separator to serialize and unserialize
// passing data from php to javascript. // passing data from php to javascript.

8
pandora_console/include/styles/pandora.css
View File

@ -3073,6 +3073,12 @@ div#stat-win-module-graph div.nodata_container {
} }
.menu_graph { .menu_graph {
width: 30px;
height: 150px;
left: 100%;
position: absolute;
top: 0px;
background-color: transparent;
-moz-border-top-right-radius: 6px; -moz-border-top-right-radius: 6px;
-webkit-border-top-right-radius: 6px; -webkit-border-top-right-radius: 6px;
border-top-right-radius: 6px; border-top-right-radius: 6px;
@ -5865,7 +5871,7 @@ table.table_modal_alternate tr td:first-child {
} }
.flot-text { .flot-text {
width: 101%; width: 100%;
} }
/*Font header feedback*/ /*Font header feedback*/

1
pandora_console/operation/agentes/stat_win.php
View File

@ -35,6 +35,7 @@ require_once $config['homedir'].'/include/functions_graph.php';
require_once $config['homedir'].'/include/functions_modules.php'; require_once $config['homedir'].'/include/functions_modules.php';
require_once $config['homedir'].'/include/functions_agents.php'; require_once $config['homedir'].'/include/functions_agents.php';
require_once $config['homedir'].'/include/functions_tags.php'; require_once $config['homedir'].'/include/functions_tags.php';
require_once $config['homedir'].'/include/php_to_js_values.php';
enterprise_include_once('include/functions_agents.php'); enterprise_include_once('include/functions_agents.php');
check_login(); check_login();