tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed errors in graph min and max warning and critical for edition module

Browse Source
This commit is contained in:
daniel 2018-07-17 11:26:25 +02:00
parent 001861b746
commit f317f3e736
3 changed files with 87 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -303,7 +303,7 @@ if (modules_is_string_type($id_module_type) || $edit) {
$table_simple->data[4][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true, $disabledBecauseInPolicy); $table_simple->data[4][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true, $disabledBecauseInPolicy);
if (!modules_is_string_type($id_module_type) || $edit) { if (!modules_is_string_type($id_module_type) || $edit) {
$table_simple->data[4][2] = '<svg id="svg_dinamic" width="800" height="300"> </svg>'; $table_simple->data[4][2] = '<svg id="svg_dinamic" width="500" height="300"> </svg>';
} }
$table_simple->data[5][0] = __('Critical status').' ' . ui_print_help_icon ('critical_status', true); $table_simple->data[5][0] = __('Critical status').' ' . ui_print_help_icon ('critical_status', true);

2
pandora_console/godmode/modules/manage_network_components_form_common.php
View File

@ -129,7 +129,7 @@ $table->data[4][1] .= html_print_input_text ('str_warning', $str_warning,
$table->data[4][1] .= '<br /><em>'.__('Inverse interval').'</em>'; $table->data[4][1] .= '<br /><em>'.__('Inverse interval').'</em>';
$table->data[4][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true); $table->data[4][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true);
$table->data[4][2] = '<svg id="svg_dinamic" width="800" height="300"> </svg>'; $table->data[4][2] = '<svg id="svg_dinamic" width="500" height="300"> </svg>';
$table->colspan[4][2] = 2; $table->colspan[4][2] = 2;
$table->rowspan[4][2] = 3; $table->rowspan[4][2] = 3;

142
pandora_console/include/javascript/pandora.js
View File

@ -1264,6 +1264,7 @@ function pagination_show_more(params, message){
datatype: "html" datatype: "html"
}); });
} }
/* /*
*function use d3.js for paint graph *function use d3.js for paint graph
*/ */
@ -1344,11 +1345,11 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
//delete elements //delete elements
svg.selectAll("g").remove(); svg.selectAll("g").remove();
width_x = 201; width_x = 101;
height_x = 50; height_x = 50;
svg.append("g") svg.append("g")
.attr("transform", "translate(200, 150)") .attr("transform", "translate(100, 150)")
.call(yAxis); .call(yAxis);
//legend Normal text //legend Normal text
@ -1371,14 +1372,14 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
svg.append("g") svg.append("g")
.append("rect") .append("rect")
.attr("id", "legend_normal") .attr("id", "legend_normal")
.attr("x", width_x + 80) .attr("x", width_x + 80)
.attr("y", height_x - 30) .attr("y", height_x - 30)
.attr("width", 10) .attr("width", 10)
.attr("height", 10) .attr("height", 10)
.style("fill", "#82B92E"); .style("fill", "#82B92E");
//legend Warning text //legend Warning text
svg.append("g") svg.append("g")
.append("text") .append("text")
.attr("x", width_x + 100) .attr("x", width_x + 100)
.attr("y", height_x - 20) .attr("y", height_x - 20)
@ -1393,14 +1394,14 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
svg.append("g") svg.append("g")
.append("rect") .append("rect")
.attr("id", "legend_warning") .attr("id", "legend_warning")
.attr("x", width_x + 185) .attr("x", width_x + 185)
.attr("y", height_x - 30) .attr("y", height_x - 30)
.attr("width", 10) .attr("width", 10)
.attr("height", 10) .attr("height", 10)
.style("fill", "#ffd731"); .style("fill", "#ffd731");
//legend Critical text //legend Critical text
svg.append("g") svg.append("g")
.append("text") .append("text")
.attr("x", width_x + 205) .attr("x", width_x + 205)
.attr("y", height_x - 20) .attr("y", height_x - 20)
@ -1415,11 +1416,11 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
svg.append("g") svg.append("g")
.append("rect") .append("rect")
.attr("id", "legend_critical") .attr("id", "legend_critical")
.attr("x", width_x + 285) .attr("x", width_x + 285)
.attr("y", height_x - 30) .attr("y", height_x - 30)
.attr("width", 10) .attr("width", 10)
.attr("height", 10) .attr("height", 10)
.style("fill", "#fc4444"); .style("fill", "#fc4444");
//styles for number and axes //styles for number and axes
svg.selectAll("g .domain") svg.selectAll("g .domain")
@ -1435,79 +1436,77 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
svg.append("g") svg.append("g")
.append("rect") .append("rect")
.attr("id", "status_rect") .attr("id", "status_rect")
.attr("x", width_x) .attr("x", width_x)
.attr("y", height_x) .attr("y", height_x)
.attr("width", 300) .attr("width", 300)
.attr("height", 200) .attr("height", 200)
.style("fill", "#82B92E"); .style("fill", "#82B92E");
//controls the inverse warning //controls the inverse warning
if(inverse_w == 0){ if(inverse_w == 0){
svg.append("g") svg.append("g")
.append("rect").transition() .append("rect").transition()
.duration(600) .duration(600)
.attr("id", "warning_rect") .attr("id", "warning_rect")
.attr("x", width_x) .attr("x", width_x)
.attr("y", (height_x +(range_max - min_w) * position) - ((max_w - min_w) * position)) .attr("y", (height_x +(range_max - min_w) * position) - ((max_w - min_w) * position))
.attr("width", 300) .attr("width", 300)
.attr("height", ((max_w - min_w) * position)) .attr("height", ((max_w - min_w) * position))
.style("fill", "#ffd731"); .style("fill", "#ffd731");
} }
else { else {
svg.append("g") svg.append("g")
.append("rect").transition() .append("rect").transition()
.duration(600) .duration(600)
.attr("id", "warning_rect") .attr("id", "warning_rect")
.attr("x", width_x) .attr("x", width_x)
.attr("y", height_x + 200 - ((min_w -range_min) * position)) .attr("y", height_x + 200 - ((min_w -range_min) * position))
.attr("width", 300) .attr("width", 300)
.attr("height", (min_w -range_min) * position) .attr("height", (min_w -range_min) * position)
.style("fill", "#ffd731"); .style("fill", "#ffd731");
svg.append("g") svg.append("g")
.append("rect").transition() .append("rect").transition()
.duration(600) .duration(600)
.attr("id", "warning_inverse_rect") .attr("id", "warning_inverse_rect")
.attr("x", width_x) .attr("x", width_x)
.attr("y", height_x) .attr("y", height_x)
.attr("width", 300) .attr("width", 300)
.attr("height", ((range_max - min_w) * position) - ((max_w - min_w) * position)) .attr("height", ((range_max - min_w) * position) - ((max_w - min_w) * position))
.style("fill", "#ffd731"); .style("fill", "#ffd731");
}
} //controls the inverse critical
//controls the inverse critical if(inverse_c == 0){
if(inverse_c == 0){ svg.append("g")
svg.append("g")
.append("rect").transition() .append("rect").transition()
.duration(600) .duration(600)
.attr("id", "critical_rect") .attr("id", "critical_rect")
.attr("x", width_x) .attr("x", width_x)
.attr("y", (height_x + (range_max - min_c) * position) - ((max_c - min_c) * position)) .attr("y", (height_x + (range_max - min_c) * position) - ((max_c - min_c) * position))
.attr("width", 300) .attr("width", 300)
.attr("height", ((max_c - min_c) * position)) .attr("height", ((max_c - min_c) * position))
.style("fill", "#fc4444"); .style("fill", "#fc4444");
} }
else { else {
svg.append("g") svg.append("g")
.append("rect").transition() .append("rect").transition()
.duration(600) .duration(600)
.attr("id", "critical_rect") .attr("id", "critical_rect")
.attr("x", width_x) .attr("x", width_x)
.attr("y", height_x + 200 - ((min_c -range_min) * position)) .attr("y", height_x + 200 - ((min_c -range_min) * position))
.attr("width", 300) .attr("width", 300)
.attr("height", (min_c -range_min) * position) .attr("height", (min_c -range_min) * position)
.style("fill", "#fc4444"); .style("fill", "#fc4444");
svg.append("g") svg.append("g")
.append("rect").transition() .append("rect").transition()
.duration(600) .duration(600)
.attr("id", "critical_inverse_rect") .attr("id", "critical_inverse_rect")
.attr("x", width_x) .attr("x", width_x)
.attr("y", height_x) .attr("y", height_x)
.attr("width", 300) .attr("width", 300)
.attr("height", ((range_max - min_c) * position) - ((max_c - min_c) * position)) .attr("height", ((range_max - min_c) * position) - ((max_c - min_c) * position))
.style("fill", "#fc4444"); .style("fill", "#fc4444");
} }
} }
else { else {
d3.select("#svg_dinamic rect").remove(); d3.select("#svg_dinamic rect").remove();
@ -1515,7 +1514,7 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
var svg = d3.select("#svg_dinamic"); var svg = d3.select("#svg_dinamic");
svg.selectAll("g").remove(); svg.selectAll("g").remove();
width_x = 201; width_x = 10;
height_x = 50; height_x = 50;
//message error warning //message error warning
@ -1548,7 +1547,6 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
.html(message_error_critical) .html(message_error_critical)
.style("text-anchor", "first"); .style("text-anchor", "first");
} }
} }
} }