From 3de0e38c2dbf7d13da6d6bb3a9d1683c908447ab Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Wed, 8 Nov 2017 10:21:09 +0100 Subject: [PATCH] Added color to resume data --- .../reporting/visual_console_builder.editor.js | 10 ++++++++++ .../include/ajax/visual_console_builder.ajax.php | 8 ++++++++ pandora_console/include/functions_visual_map.php | 4 ++-- .../include/functions_visual_map_editor.php | 13 +++++++++++++ pandora_console/include/graphs/functions_d3.php | 4 ++-- pandora_console/include/graphs/pandora.d3.js | 5 +++-- 6 files changed, 38 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 8f18cd95af..f557647f8d 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -835,6 +835,7 @@ function readFields() { values['height_box'] = parseInt( $("input[name='height_box']").val()); values['border_color'] = $("input[name='border_color']").val(); + values['resume_color'] = $("input[name='resume_color']").val(); values['border_width'] = parseInt( $("input[name='border_width']").val()); values['fill_color'] = $("input[name='fill_color']").val(); @@ -1539,6 +1540,11 @@ function loadFieldsFromDB(item) { $("#border_color_row .ColorPickerDivSample") .css('background-color', val); } + if (key == 'resume_color') { + $("input[name='resume_color']").val(val); + $("#resume_color_row .ColorPickerDivSample") + .css('background-color', val); + } if (key == 'border_width') $("input[name='border_width']").val(val); if (key == 'fill_color') { @@ -1783,6 +1789,9 @@ function hiddenFields(item) { $("#border_color_row").css('display', 'none'); $("#border_color_row." + item).css('display', ''); + $("#resume_color_row").css('display', 'none'); + $("#resume_color_row." + item).css('display', ''); + $("#border_width_row").css('display', 'none'); $("#border_width_row." + item).css('display', ''); @@ -1835,6 +1844,7 @@ function cleanFields(item) { $("input[name='width_box']").val(300); $("input[name='height_box']").val(180); $("input[name='border_color']").val('#000000'); + $("input[name='resume_color']").val('#000000'); $("input[name='border_width']").val(3); $("input[name='fill_color']").val('#ffffff'); $("input[name='line_width']").val(3); diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index fd34e3aff1..9e199d92e5 100755 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -118,6 +118,7 @@ $id_group = (int)get_parameter('id_group', 0); $id_custom_graph = get_parameter('id_custom_graph', null); $border_width = (int)get_parameter('border_width', 0); $border_color = get_parameter('border_color', ''); +$resume_color = get_parameter('resume_color', ''); $fill_color = get_parameter('fill_color', ''); $percentile_color = get_parameter('percentile_color', ''); $percentile_label = io_safe_output(get_parameter('percentile_label', '')); @@ -607,6 +608,7 @@ switch ($action) { $values['width'] = $width_percentile; $values['height'] = $width_percentile; } + $values['border_color'] = $resume_color; $values['type'] = DONUT_GRAPH; break; @@ -739,6 +741,10 @@ switch ($action) { unset($values['image']); unset($values['type_graph']); break; + case 'donut_graph': + unset($values['border_color']); + unset($values['width']); + break; case 'box_item': unset($values['border_width']); unset($values['border_color']); @@ -882,6 +888,7 @@ switch ($action) { break; case 'donut_graph': $elementFields['width_percentile'] = $elementFields['width']; + $elementFields['resume_color'] = $elementFields['border_color']; break; case 'module_graph': @@ -1000,6 +1007,7 @@ switch ($action) { $values['type'] = DONUT_GRAPH; $values['width'] = $width; $values['height'] = $height; + $values['border_color'] = $resume_color; break; case 'module_graph': $values['type'] = MODULE_GRAPH; diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 855501de7a..3c43771dce 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1436,10 +1436,10 @@ function visual_map_print_item($mode = "read", $layoutData, } else { if ($width == 0) { - $img = d3_donut_graph ($layoutData['id'], 400, 400, $donut_data); + $img = d3_donut_graph ($layoutData['id'], 400, 400, $donut_data, $layoutData['border_color']); } else{ - $img = d3_donut_graph ($layoutData['id'], $width, $width, $donut_data); + $img = d3_donut_graph ($layoutData['id'], $width, $width, $donut_data, $layoutData['border_color']); } } } diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index c3e368a5d6..5bb5328fe5 100755 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -319,6 +319,18 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { html_print_select(array(), 'module', '', '', __('Any'), 0, true) . ' '; + $form_items['resume_color_row'] = array(); + $form_items['resume_color_row']['items'] = array('donut_graph'); + $form_items['resume_color_row']['html'] = + '' . + __('Resume data color') . + '' . + '' . + html_print_input_text_extended ('resume_color', + '#000000', 'text-resume_color', '', 7, 7, false, + '', 'class="resume_color"', true) . + ''; + $event_times = array(86400 => __('24h'), 28800 => __('8h'), 7200 => __('2h'), @@ -645,6 +657,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { $(".line_color").attachColorPicker(); $(".percentile_color").attachColorPicker(); $(".percentile_label_color").attachColorPicker(); + $(".resume_color").attachColorPicker(); $("input[name=radio_choice]").change(function(){ $('#count_items').html(1); diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php index e4e53f2f1d..3a1cf73bbd 100644 --- a/pandora_console/include/graphs/functions_d3.php +++ b/pandora_console/include/graphs/functions_d3.php @@ -384,7 +384,7 @@ function progress_circular_bar_interior ($id, $percentile, $width, $height, $col return $output; } -function d3_donut_graph ($id, $width, $height, $module_data) { +function d3_donut_graph ($id, $width, $height, $module_data, $resume_color) { global $config; $module_data = json_encode($module_data); @@ -402,7 +402,7 @@ function d3_donut_graph ($id, $width, $height, $module_data) { "; $output .= ""; return $output; diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 1c2ab88b59..e60baa90d6 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -1972,7 +1972,7 @@ function print_interior_circular_progress_bar (recipient, percentile, width, hei })(); } -function print_donut_graph (recipient, width, height, module_data) { +function print_donut_graph (recipient, width, height, module_data, resume_color) { var svg = d3.select(recipient) .append("svg") .attr("width", width) @@ -2041,10 +2041,11 @@ function print_donut_graph (recipient, width, height, module_data) { .value(function(d) { return parseFloat(d.percent); }); - +console.log(resume_color); jQuery.each(module_data, function (key, m_d) { svg.append("g") .append("text") + .attr('fill', resume_color) .attr("transform", "translate(" + (((width / 2) - (radius + decrement_x_padding))) + "," + (((height / 2) - radius) - increment_y) + ")") .text(m_d.tag_name) .style("font-family", "Verdana")