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

fixed errors wux

This commit is contained in:
daniel 2017-08-23 17:21:15 +02:00
parent c29d8a4fdb
commit 9c141c9049
3 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pandora_console/include/functions_ui.php
View File

@ -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 ($("<option value=0>None</option>"));
jQuery.each (data, function (id, value) {
$("#' . $selectbox_id . '").append ($("<option value=" + id + ">" + value + "</option>"));
});
}
}
});
return false;
}
';
}
else {
$javascript_code_function_select = '
function function_select_' . $input_name . '(agent_name) {

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

@ -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,
'<div class="'+font+'" title="'+title+'" style="word-break: normal; max-width: 100px;font-size:'+font_size+'pt !important;">'
'<div class="'+font+'" title="'+title+'" style="word-break: normal; transform: rotate(-45deg); position:relative; top:+30px; left:-20px; max-width: 100px;font-size:'+font_size+'pt !important;">'
+ label
+ '</div>']);
}

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

@ -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;