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-4490-Cambio-de-dato-a-percentil-segun-el-tamano-de-custom-graph-en-consola-visual' into 'develop' 

fixed error labels pie chart

See merge request artica/pandorafms!2679
This commit is contained in:
Alejandro Fraguas 2019-08-27 12:02:27 +02:00
parent cb8278030a 22f125dee0
commit fe088a59d6
2 changed files with 887 additions and 806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1588
pandora_console/include/graphs/flot/jquery.flot.pie.js
View File

File diff suppressed because it is too large Load Diff

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

@ -1,4 +1,5 @@
/* global $ */
/* exported pandoraFlotPie, pandoraFlotPieCustom */
function pandoraFlotPie(
graph_id,
@ -14,7 +15,7 @@ function pandoraFlotPie(
colors,
hide_labels
) {
var labels = labels.split(separator);
labels = labels.split(separator);
var data = values.split(separator);
if (colors != "") {
@ -92,7 +93,7 @@ function pandoraFlotPie(
function pieHover(event, pos, obj) {
if (!obj) return;
index = obj.seriesIndex;
var index = obj.seriesIndex;
legends.css("color", "#3F3F3D");
legends.eq(index).css("color", "");
}
@ -144,21 +145,14 @@ function pandoraFlotPieCustom(
.pop()
.split(".")
.shift();
var labels = labels.split(separator);
var legend = legend.split(separator);
labels = labels.split(separator);
legend = legend.split(separator);
var data = values.split(separator);
var no_data = 0;
if (colors != "") {
colors = colors.split(separator);
}
var colors_data = [
"#e63c52",
"#FFA631",
"#f3b200",
"#5BB6E5",
"#F2919D",
"#82b92e"
];
var color = null;
for (var i = 0; i < data.length; i++) {
if (colors != "") {
@ -174,28 +168,31 @@ function pandoraFlotPieCustom(
if (width <= 450) {
show_legend = false;
label_conf = {
show: false
};
} else {
label_conf = {
show: true,
radius: 0.75,
radius: 5 / 8,
formatter: function(label, series) {
console.log(series);
return (
'<div style="font-size:' +
font_size +
"pt;" +
'text-align:center;padding:2px;color:white;">' +
series.percent.toFixed(2) +
"%</div>"
"pt; font-weight:bolder;" +
"text-align:center;padding:2px;color:rgb(63, 63, 61)" +
'">' +
label +
":<br>" +
series.data[0][1] +
"</div>"
);
},
background: {
opacity: 0.5,
color: ""
opacity: 0.5
}
};
} else {
label_conf = {
show: false
};
}
var conf_pie = {
@ -203,8 +200,8 @@ function pandoraFlotPieCustom(
pie: {
show: true,
radius: 3 / 4,
innerRadius: 0.4
//label: label_conf
innerRadius: 0.4,
label: label_conf
}
},
legend: {
@ -234,7 +231,7 @@ function pandoraFlotPieCustom(
var legends = $("#" + graph_id + " .legendLabel");
var j = 0;
legends.each(function() {
//$(this).css('width', $(this).width());
//$(this).css("width", $(this).width());
$(this).css("font-size", font_size + "pt");
$(this).removeClass("legendLabel");
$(this).addClass(font);
@ -264,19 +261,6 @@ function pandoraFlotPieCustom(
return false;
});
var pielegends = $("#" + graph_id + " .pieLabelBackground");
pielegends.each(function() {
$(this)
.css("transform", "rotate(-35deg)")
.css("color", "black");
});
var labelpielegends = $("#" + graph_id + " .pieLabel");
labelpielegends.each(function() {
$(this)
.css("transform", "rotate(-35deg)")
.css("color", "black");
});
// Events
$("#" + graph_id).bind("plothover", pieHover);
$("#" + graph_id).bind("plotclick", Clickpie);
@ -287,16 +271,17 @@ function pandoraFlotPieCustom(
function pieHover(event, pos, obj) {
if (!obj) return;
index = obj.seriesIndex;
var index = obj.seriesIndex;
legends.css("color", "#3F3F3D");
legends.eq(index).css("color", "");
}
function Clickpie(event, pos, obj) {
if (!obj) return;
percent = parseFloat(obj.series.percent).toFixed(2);
valor = parseFloat(obj.series.data[0][1]);
var percent = parseFloat(obj.series.percent).toFixed(2);
var valor = parseFloat(obj.series.data[0][1]);
var value = "";
if (valor > 1000000) {
value = Math.round((valor / 1000000) * 100) / 100;
value = value + "M";
@ -325,42 +310,6 @@ function pandoraFlotPieCustom(
$("#watermark_image_" + graph_id).attr("src")
);
}
/*
window.onresize = function(event) {
$.plot($('#' + graph_id), data, conf_pie);
if (no_data == data.length) {
$('#'+graph_id+' .overlay').remove();
$('#'+graph_id+' .base').remove();
$('#'+graph_id).prepend("<img style='width:50%;' src='images/no_data_toshow.png' />");
}
var legends = $('#'+graph_id+' .legendLabel');
var j = 0;
legends.each(function () {
//$(this).css('width', $(this).width());
$(this).css('font-size', font_size+'pt');
$(this).removeClass("legendLabel");
$(this).addClass(font);
$(this).text(legend[j]);
j++;
});
if ($('input[name="custom_graph"]').val()) {
$('.legend>div').css('right',($('.legend>div').height()*-1));
$('.legend>table').css('right',($('.legend>div').height()*-1));
}
//$('.legend>table').css('border',"1px solid #E2E2E2");
$('.legend>table').css('background-color',"transparent");
var pielegends = $('#'+graph_id+' .pieLabelBackground');
pielegends.each(function () {
$(this).css('transform', "rotate(-35deg)").css('color', 'black');
});
var labelpielegends = $('#'+graph_id+' .pieLabel');
labelpielegends.each(function () {
$(this).css('transform', "rotate(-35deg)").css('color', 'black');
});
}
*/
}
function pandoraFlotHBars(