diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 9c328336e6..3918da045e 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -3072,7 +3072,7 @@ function series_type_graph_array($data, $show_elements_graph){ ) . ' ' . $str; } - if($show_elements_graph['compare'] == 'overlapped'){ + if($show_elements_graph['compare'] == 'overlapped' && $key == 'sum2'){ $data_return['color'][$key] = $color_series['overlapped']; } else{ diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index efa479df62..c32d1c90c8 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1044,7 +1044,7 @@ function grafico_modulo_sparse ($params) { $legend, $series_type, $color, - $date_array, + $date_array_prev, $data_module_graph, $params, $water_mark, diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 40d1f6cf6f..21624165f4 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -1632,6 +1632,8 @@ function pandoraFlotArea( axisLabelFontFamily: font+'Font', axisLabelPadding: 0, mode: "time", + timezone: "browser", + localTimezone: true, //tickFormatter: xFormatter, tickSize: [maxticks, 'hour'] }], @@ -1733,6 +1735,8 @@ if (vconsole) { axisLabelFontFamily: font+'Font', axisLabelPadding: 0, mode: "time", + timezone: "browser", + localTimezone: true, //tickFormatter: xFormatter, tickSize: [maxticks, 'hour'] }], @@ -1804,6 +1808,8 @@ if (vconsole) { axisLabelFontFamily: font+'Font', axisLabelPadding: 0, mode: "time", + timezone: "browser", + localTimezone: true, //tickFormatter: xFormatter, tickSize: [maxticks_zoom, 'hour'] }], @@ -1843,6 +1849,8 @@ if (vconsole) { axisLabelFontFamily: font+'Font', axisLabelPadding: 0, mode: "time", + timezone: "browser", + localTimezone: true, //tickFormatter: xFormatter, tickSize: [maxticks_zoom, 'hour'] }],