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-6132-Pie-chart-no-muestra-leyenda-en-primera-carga-de-la-gráfica' into 'develop' 

fixed errors visual pie charts

See merge request artica/pandorafms!3510
This commit is contained in:
Daniel Rodriguez 2020-11-19 14:53:44 +01:00
parent 1df3c4f595 7d0c31885c
commit 0fca71aa56
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/godmode/events/event_edit_filter.php
View File

@ -138,7 +138,8 @@ if ($update || $create) {
['id_agente_modulo' => $id_agent_module] ['id_agente_modulo' => $id_agent_module]
) )
); );
} }
$pagination = get_parameter('pagination', ''); $pagination = get_parameter('pagination', '');
$event_view_hr = get_parameter('event_view_hr', ''); $event_view_hr = get_parameter('event_view_hr', '');
$id_user_ack = get_parameter('id_user_ack', ''); $id_user_ack = get_parameter('id_user_ack', '');

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

@ -230,21 +230,6 @@ function pandoraFlotPieCustom(
); );
} }
var legends = $("#" + graph_id + " .legendLabel"); 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");
if (background_color == "transparent") { if (background_color == "transparent") {
$(".legend>table").css("background-color", ""); $(".legend>table").css("background-color", "");