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

Merge branch '2722-Labels-en-visual-console' into 'develop' 

fixed labels not showing for percentile item in visual console builder

See merge request artica/pandorafms!2019
This commit is contained in:
vgilc 2018-11-30 13:27:15 +01:00
parent 0014c4df9e 1cdc9c0d7f
commit 111ae09928
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -741,6 +741,10 @@ function readFields() {
values['label'] = $("input[name=label]").val();
var text = tinymce.get('text-label').getContent();
values['label'] = text;
if ($("input[name=percentile_label]").val().length > 0)
values['label'] = $("input[name=percentile_label]").val();
values['line-height'] = $("#text-label_ifr").contents().find("p").css('line-height');
values['type_graph'] = $("select[name=type_graph]").val();
values['image'] = $("select[name=image]").val();

4
pandora_console/include/functions_visual_map.php
View File

@ -1867,6 +1867,7 @@ function visual_map_print_item($mode = "read", $layoutData,
}
echo $img;
echo io_safe_output($text);
break;
case PERCENTILE_BUBBLE:
@ -1910,6 +1911,7 @@ function visual_map_print_item($mode = "read", $layoutData,
}
echo $img;
echo io_safe_output($text);
break;
case CIRCULAR_PROGRESS_BAR:
@ -1953,6 +1955,7 @@ function visual_map_print_item($mode = "read", $layoutData,
}
echo $img;
echo io_safe_output($text);
break;
case CIRCULAR_INTERIOR_PROGRESS_BAR:
@ -1997,6 +2000,7 @@ function visual_map_print_item($mode = "read", $layoutData,
}
echo $img;
echo io_safe_output($text);
break;
case MODULE_GRAPH: