diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 46a9556e4b..0cc786a418 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -2946,7 +2946,11 @@ function ui_print_agent_autocomplete_input($parameters) { if (isset($parameters['from_ux'])) { $from_ux_transaction = $parameters['from_ux']; } - + + $from_wux_transaction = ''; //Default value + if (isset($parameters['from_wux'])) { + $from_wux_transaction = $parameters['from_wux']; + } $metaconsole_enabled = false; //Default value if (isset($parameters['metaconsole_enabled'])) { @@ -3064,6 +3068,36 @@ function ui_print_agent_autocomplete_input($parameters) { } '; } + elseif ($from_wux_transaction != "") { + $javascript_code_function_select = ' + function function_select_' . $input_name . '(agent_name) { + console.log(agent_name); + $("#' . $selectbox_id . '").empty(); + + var inputs = []; + inputs.push ("id_agent=" + $("#' . $hidden_input_idagent_id . '").val()); + inputs.push ("get_agent_transactions=1"); + inputs.push ("page=enterprise/include/ajax/wux_transaction.ajax"); + + jQuery.ajax ({ + data: inputs.join ("&"), + type: "POST", + url: action="' . $javascript_ajax_page . '", + dataType: "json", + success: function (data) { + if (data) { + $("#' . $selectbox_id . '").append ($("")); + jQuery.each (data, function (id, value) { + $("#' . $selectbox_id . '").append ($("")); + }); + } + } + }); + + return false; + } + '; + } else { $javascript_code_function_select = ' function function_select_' . $input_name . '(agent_name) { diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 1d5cfe749a..40a72f93fe 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -132,7 +132,7 @@ function pandoraFlotPieCustom(graph_id, values, labels, width, var color = null; for (var i = 0; i < data.length; i++) { if (colors != '') { - color = colors_data[i]; + color = colors[i]; } var datos = data[i]; data[i] = { label: labels[i], data: parseFloat(data[i]), color: color }; @@ -609,14 +609,15 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, $('#' + graph_id).css("margin-left","auto"); $('#' + graph_id).css("margin-right","auto"); //~ $('#' + graph_id).find('div.legend-tooltip').tooltip({ track: true }); - - $('#'+graph_id+' .xAxis .tickLabel') - .css('transform', 'rotate(-45deg)') - .css('max-width','100px') - .find('div') - .css('position', 'relative') - .css('top', '+10px') - .css('left', '-30px'); + /* + $('#'+graph_id+' .xAxis .tickLabel') + .css('transform', 'rotate(-45deg)') + .css('max-width','100px') + .find('div') + .css('position', 'relative') + .css('top', '+10px') + .css('left', '-30px'); + */ if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) $('#'+graph_id+' .xAxis .tickLabel') .find('div') @@ -637,7 +638,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, } format.push([i, - '
' + '
' + label + '
']); } diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index f569f67587..2f775d803a 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -1331,8 +1331,8 @@ function Gauge(placeholderName, configuration, font) function print_phases_donut (recipient, phases) { var svg = d3.select(recipient) .append("svg") - .attr("width", 600) - .attr("height", 300) + .attr("width", 700) + .attr("height", 330) .append("g"); svg.append("g") @@ -1424,7 +1424,7 @@ function print_phases_donut (recipient, phases) { return d.data.label; }) .style("font-family", "Verdana") - .style("font-size", "10px") + .style("font-size", "15px") .append("tspan") .attr("dy", "1.4em") .attr("dx", "-6em") @@ -1432,7 +1432,7 @@ function print_phases_donut (recipient, phases) { return d.data.label2 + "ms"; }) .style("font-family", "Verdana") - .style("font-size", "10px"); + .style("font-size", "15px"); function midAngle(d){ return d.startAngle + (d.endAngle - d.startAngle)/2;