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

Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'

Browse Source 
fixed minor errorstime graphs

See merge request artica/pandorafms!1522
This commit is contained in:
vgilc 2018-06-11 15:39:58 +02:00
commit 5e1c88cd45
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions.php
View File

@ -3072,7 +3072,7 @@ function series_type_graph_array($data, $show_elements_graph){
) . ' ' . $str; ) . ' ' . $str;
} }
if($show_elements_graph['compare'] == 'overlapped'){ if($show_elements_graph['compare'] == 'overlapped' && $key == 'sum2'){
$data_return['color'][$key] = $color_series['overlapped']; $data_return['color'][$key] = $color_series['overlapped'];
} }
else{ else{

2
pandora_console/include/functions_graph.php
View File

@ -1044,7 +1044,7 @@ function grafico_modulo_sparse ($params) {
$legend, $legend,
$series_type, $series_type,
$color, $color,
$date_array, $date_array_prev,
$data_module_graph, $data_module_graph,
$params, $params,
$water_mark, $water_mark,

8
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -1632,6 +1632,8 @@ function pandoraFlotArea(
axisLabelFontFamily: font+'Font', axisLabelFontFamily: font+'Font',
axisLabelPadding: 0, axisLabelPadding: 0,
mode: "time", mode: "time",
timezone: "browser",
localTimezone: true,
//tickFormatter: xFormatter, //tickFormatter: xFormatter,
tickSize: [maxticks, 'hour'] tickSize: [maxticks, 'hour']
}], }],
@ -1733,6 +1735,8 @@ if (vconsole) {
axisLabelFontFamily: font+'Font', axisLabelFontFamily: font+'Font',
axisLabelPadding: 0, axisLabelPadding: 0,
mode: "time", mode: "time",
timezone: "browser",
localTimezone: true,
//tickFormatter: xFormatter, //tickFormatter: xFormatter,
tickSize: [maxticks, 'hour'] tickSize: [maxticks, 'hour']
}], }],
@ -1804,6 +1808,8 @@ if (vconsole) {
axisLabelFontFamily: font+'Font', axisLabelFontFamily: font+'Font',
axisLabelPadding: 0, axisLabelPadding: 0,
mode: "time", mode: "time",
timezone: "browser",
localTimezone: true,
//tickFormatter: xFormatter, //tickFormatter: xFormatter,
tickSize: [maxticks_zoom, 'hour'] tickSize: [maxticks_zoom, 'hour']
}], }],
@ -1843,6 +1849,8 @@ if (vconsole) {
axisLabelFontFamily: font+'Font', axisLabelFontFamily: font+'Font',
axisLabelPadding: 0, axisLabelPadding: 0,
mode: "time", mode: "time",
timezone: "browser",
localTimezone: true,
//tickFormatter: xFormatter, //tickFormatter: xFormatter,
tickSize: [maxticks_zoom, 'hour'] tickSize: [maxticks_zoom, 'hour']
}], }],