From 9b81da193b42b9f69847a9888021ae46aadf7b6c Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Wed, 28 Oct 2020 12:50:15 +0100
Subject: [PATCH] fix charts

---
 pandora_console/include/functions_graph.php   | 10 +++-------
 .../include/functions_treeview.php            |  2 +-
 .../include/graphs/functions_flot.php         | 19 ++++++-------------
 pandora_console/include/styles/pandora.css    |  8 +++++++-
 .../operation/agentes/stat_win.php            |  1 +
 5 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 4fd1439f8f..f40b75e3b2 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -2541,13 +2541,9 @@ function graphic_agentaccess(
     } else {
         $options['generals']['pdf']['width'] = 350;
         $options['generals']['pdf']['height'] = 125;
-        if (!empty($data_array)) {
-            $imgbase64 = '<img src="data:image/jpg;base64,';
-            $imgbase64 .= vbar_graph($data_array, $options, 2);
-            $imgbase64 .= '" />';
-        } else {
-            $imgbase64 .= vbar_graph($data_array, $options, 2);
-        }
+        $imgbase64 = '<img src="data:image/jpg;base64,';
+        $imgbase64 .= vbar_graph($data_array, $options, 2);
+        $imgbase64 .= '" />';
 
         return $imgbase64;
     }
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 25e0f67020..67bed22be3 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -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 .= graph_graphic_agentevents(
         $id_agente,
-        '385px;',
+        '340px;margin:0',
         45,
         SECONDS_1DAY,
         '',
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index dc4e556292..81c9cc79cf 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -346,13 +346,7 @@ function menu_graph(
         $threshold = true;
     }
 
-    $return .= "<div id='general_menu_$graph_id' class='menu_graph' style='
-                    width: 20px;
-                    height: 150px;
-                    left:100%;
-                    position: absolute;
-                    top: 0px;
-                    background-color: tranparent;'>";
+    $return .= "<div id='general_menu_$graph_id' class='menu_graph'>";
     $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>";
     if ($threshold) {
@@ -745,13 +739,12 @@ function flot_slicesbar_graph(
 
     // Set some containers to legend, graph, timestamp tooltip, etc.
     $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
     // passing data from php to javascript.
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 6b48ab13ae..d1696d8986 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -3073,6 +3073,12 @@ div#stat-win-module-graph div.nodata_container {
 }
 
 .menu_graph {
+  width: 30px;
+  height: 150px;
+  left: 100%;
+  position: absolute;
+  top: 0px;
+  background-color: transparent;
   -moz-border-top-right-radius: 6px;
   -webkit-border-top-right-radius: 6px;
   border-top-right-radius: 6px;
@@ -5865,7 +5871,7 @@ table.table_modal_alternate tr td:first-child {
 }
 
 .flot-text {
-  width: 101%;
+  width: 100%;
 }
 
 /*Font header feedback*/
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 1d26666b57..d5e22eb06b 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -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_agents.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');
 
 check_login();