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

Fixed encoding problems and default label color

This commit is contained in:
Arturo Gonzalez 2017-11-06 08:35:42 +01:00
parent 2bca9c92fa
commit 4a6c7f1783
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -120,7 +120,7 @@ $border_width = (int)get_parameter('border_width', 0);
$border_color = get_parameter('border_color', '');
$fill_color = get_parameter('fill_color', '');
$percentile_color = get_parameter('percentile_color', '');
$percentile_label = get_parameter('percentile_label', '');
$percentile_label = io_safe_output(get_parameter('percentile_label', ''));
$percentile_label_color = get_parameter('percentile_label_color', '');
$width_box = (int)get_parameter('width_box', 0);
$height_box = (int)get_parameter('height_box', 0);

14
pandora_console/include/functions_visual_map.php
View File

@ -1834,7 +1834,7 @@ function visual_map_print_item($mode = "read", $layoutData,
}
}
else{
$img = d3_progress_bar($id, $percentile, $width, 50, $border_color, $unit_text, $label, $fill_color);
$img = d3_progress_bar($id, $percentile, $width, 50, $border_color, $unit_text, io_safe_output($label), $fill_color);
}
echo $img;
@ -1873,10 +1873,10 @@ function visual_map_print_item($mode = "read", $layoutData,
}
else{
if($width == 0){
$img = d3_progress_bubble($id, $percentile, 200,200, $border_color, $unit_text, $label, $fill_color);
$img = d3_progress_bubble($id, $percentile, 200,200, $border_color, $unit_text, io_safe_output($label), $fill_color);
}
else{
$img = d3_progress_bubble($id, $percentile, $width, $width, $border_color, $unit_text, $label, $fill_color);
$img = d3_progress_bubble($id, $percentile, $width, $width, $border_color, $unit_text, io_safe_output($label), $fill_color);
}
}
@ -1916,10 +1916,10 @@ function visual_map_print_item($mode = "read", $layoutData,
}
if($width == 0){
$img = progress_circular_bar($id, $percentile, 200,200, $border_color, $unit_text, $label, $fill_color);
$img = progress_circular_bar($id, $percentile, 200,200, $border_color, $unit_text, io_safe_output($label), $fill_color);
}
else{
$img = progress_circular_bar($id, $percentile, $width, $width, $border_color, $unit_text, $label, $fill_color);
$img = progress_circular_bar($id, $percentile, $width, $width, $border_color, $unit_text, io_safe_output($label), $fill_color);
}
}
@ -1959,11 +1959,11 @@ function visual_map_print_item($mode = "read", $layoutData,
}
if($width == 0){
$img = progress_circular_bar_interior($id, $percentile, 200,200, $border_color, $unit_text, $label, $fill_color);
$img = progress_circular_bar_interior($id, $percentile, 200,200, $border_color, $unit_text, io_safe_output($label), $fill_color);
}
else{
$img = progress_circular_bar_interior($id, $percentile, $width, $width, $border_color, $unit_text, $label, $fill_color);
$img = progress_circular_bar_interior($id, $percentile, $width, $width, $border_color, $unit_text, io_safe_output($label), $fill_color);
}
}

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

@ -1782,7 +1782,7 @@ function print_circular_progress_bar (recipient, percentile, width, height, colo
.attr('dy', yPosText);
var numberText = circle.append("text")
.attr('fill', '#000000')
.attr('fill', label_color)
.style("font-family", "arial")
.style("font-weight", "bold")
.style("font-size", numberSize)
@ -1790,7 +1790,7 @@ function print_circular_progress_bar (recipient, percentile, width, height, colo
.attr('dy', yPosNumber);
var percentText = circle.append("text")
.attr('fill', '#000000')
.attr('fill', label_color)
.style("font-family", "arial")
.style("font-weight", "bold")
.style("font-size", unitSize)
@ -1936,7 +1936,7 @@ function print_interior_circular_progress_bar (recipient, percentile, width, hei
.attr('dy', yPosText);
var numberText = circle.append("text")
.attr('fill', '#000000')
.attr('fill', label_color)
.style("font-family", "arial")
.style("font-weight", "bold")
.style("font-size", numberSize)
@ -1944,7 +1944,7 @@ function print_interior_circular_progress_bar (recipient, percentile, width, hei
.attr('dy', yPosNumber);
var percentText = circle.append("text")
.attr('fill', '#000000')
.attr('fill', label_color)
.style("font-family", "arial")
.style("font-weight", "bold")
.style("font-size", unitSize)