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

Merge branch 'ent-11282-dashboard-widget-de-grafica-simple-no-funciona-en-un-sistema-anterior-a-la-771-es-decir' into 'develop' 

Ent 11282 dashboard widget de grafica simple no funciona en un sistema anterior a la 771 es decir

See merge request artica/pandorafms!5929
This commit is contained in:
Rafael Ameijeiras 2023-05-31 11:16:50 +00:00
parent cd01584ce9 466e44681d
commit 108c72357a
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1975,25 +1975,27 @@ function pandoraFlotArea(
!(type == 1 && /percentil/.test(index) == true) &&
!(type == 3 && /percentil/.test(index) == true)
) {
data_base.push({
id: "serie_" + i,
data: value.data,
label: index,
color: color[index]["color"],
lines: {
show: line_show,
fill: filled,
lineWidth: lineWidth,
steps: steps_chart
},
points: {
show: points_show,
radius: radius,
fillColor: fill_points,
fill: filled
},
legend: legend.index
});
if (color[index] !== null) {
data_base.push({
id: "serie_" + i,
data: value.data,
label: index,
color: color[index]["color"],
lines: {
show: line_show,
fill: filled,
lineWidth: lineWidth,
steps: steps_chart
},
points: {
show: points_show,
radius: radius,
fillColor: fill_points,
fill: filled
},
legend: legend.index
});
}
}
}
i++;