tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1548-problems-with-simple-value-in-visual-console-dev' into 'develop'

Browse Source 
Modified simple value

See merge request artica/pandorafms!1026
This commit is contained in:
vgilc 2017-11-07 11:22:28 +01:00
commit 47171418cd
3 changed files with 117 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -89,7 +89,7 @@ function visual_map_main() {
if($('#process_value').val() != '0'){ if($('#process_value').val() != '0'){
$('#period_row').css('display','table-row'); $('#period_row').css('display','table-row');
} }
} }
else{ else{
$('#data_image_container').css('display','inline'); $('#data_image_container').css('display','inline');
$('#data_image_check').css('display','inline'); $('#data_image_check').css('display','inline');
@ -642,21 +642,19 @@ function update_button_palette_callback() {
break; break;
case 'simple_value': case 'simple_value':
$("#" + idItem).html(values['label']); $("#" + idItem).html(values['label']);
if( (values['label'].replace( /<.*?>/g, '' ) != '_VALUE_')
&& (values['label'].replace( /<.*?>/g, '' ) != '(_VALUE_)') ){ if($("#data_image_check").html() == "On"){
$("#text_" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">'); $("#text_" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">');
$("#" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">'); $("#" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">');
} }
else{ else{
$("#text_" + idItem).html( $("#text_" + idItem).html(
'<table><tbody><tr><td></td></tr><tr><td><span style="" id="text_21" class="text">'+values["label"]+'</span></td></tr><tr><td></td></tr></tbody></table>' '<table><tbody><tr><td></td></tr><tr><td><span style="width:'+values['width_data_image']+'px;" id="text_' + idItem + '" class="text">'+values["label"]+'</span></td></tr><tr><td></td></tr></tbody></table>'
) )
$("#" + idItem).html( $("#" + idItem).html(
'<table><tbody><tr><td></td></tr><tr><td><span style="" id="text_21" class="text">'+values["label"]+'</span></td></tr><tr><td></td></tr></tbody></table>' '<table><tbody><tr><td></td></tr><tr><td><span style="width:'+values['width_data_image']+'px;" id="text_' + idItem + '" class="text">'+values["label"]+'</span></td></tr><tr><td></td></tr></tbody></table>'
) )
} }
setModuleValue(idItem,values['process_simple_value'], values['period'],values['width']);
break; break;
case 'label': case 'label':
$("#text_" + idItem).html(values['label']); $("#text_" + idItem).html(values['label']);
@ -744,7 +742,6 @@ function update_button_palette_callback() {
$("#" + idItem + ' img').css('margin-top',(parseInt($("#" + idItem).css('height'))/2)-(parseInt($("#" + idItem + " img").css('height'))/2)+'px'); $("#" + idItem + ' img').css('margin-top',(parseInt($("#" + idItem).css('height'))/2)-(parseInt($("#" + idItem + " img").css('height'))/2)+'px');
$("#" + idItem + ' > p').remove(); $("#" + idItem + ' > p').remove();
} }
else if(values['label_position']=='down'){ else if(values['label_position']=='down'){
$("#" + idItem + ' table').css('float',''); $("#" + idItem + ' table').css('float','');
$("#" + idItem + ' img').css('float',''); $("#" + idItem + ' img').css('float','');
@ -752,15 +749,16 @@ function update_button_palette_callback() {
$('#' + idItem + ' table').remove(); $('#' + idItem + ' table').remove();
$('#' + idItem).append(tempoimg); $('#' + idItem).append(tempoimg);
$("#" + idItem + ' table').css('height',''); $("#" + idItem + ' table').css('height','');
$("#" + idItem + ' table').css('width','70'); if (selectedItem != 'simple_value') {
$("#" + idItem + ' span').css('width','70'); $("#" + idItem + ' table').css('width','70');
$("#" + idItem + ' span').css('width','70');
}
else {
$("#" + idItem + ' table').css('width','');
$("#" + idItem + ' table').css('text-align','center');
$("#" + idItem + ' span').css('width','');
}
$("#" + idItem + ' img').css('margin-top',''); $("#" + idItem + ' img').css('margin-top','');
//if(parseInt($("#" + idItem).css('width'))-parseInt($("#" + idItem + " img").css('width'))/2 == 0 || values['height'] == 0 || values['width'] == 0){
//$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px');
//}
//else{
//$("#" + idItem + ' img').css('margin-left','');
//}
$("#" + idItem + ' > p').remove(); $("#" + idItem + ' > p').remove();
} }
@ -771,19 +769,19 @@ function update_button_palette_callback() {
$('#' + idItem + ' img').remove(); $('#' + idItem + ' img').remove();
$('#' + idItem).append(tempoimg); $('#' + idItem).append(tempoimg);
$("#" + idItem + ' table').css('height',''); $("#" + idItem + ' table').css('height','');
$("#" + idItem + ' table').css('width','70'); if (selectedItem != 'simple_value') {
$("#" + idItem + ' span').css('width','70'); $("#" + idItem + ' table').css('width','70');
$("#" + idItem + ' span').css('width','70');
}
else {
$("#" + idItem + ' table').css('width','');
$("#" + idItem + ' table').css('text-align','center');
$("#" + idItem + ' span').css('width','');
}
$("#" + idItem + ' img').css('margin-top',''); $("#" + idItem + ' img').css('margin-top','');
//if(parseInt($("#" + idItem).css('width'))-parseInt($("#" + idItem + " img").css('width'))/2 == 0 || values['height'] == 0 || values['width'] == 0){
//$("#" + idItem + ' img').css('margin-left','');
//}
//else{
//$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px');
//}
$("#" + idItem + ' > p').remove(); $("#" + idItem + ' > p').remove();
} }
} }
function readFields() { function readFields() {
@ -2142,7 +2140,7 @@ function setModuleGraph(id_data) {
} }
function setModuleValue(id_data, process_simple_value, period,width_data_image) { function setModuleValue(id_data, process_simple_value, period, width_data_image) {
var parameter = Array(); var parameter = Array();
parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"}); parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
parameter.push ({name: "action", value: "get_module_value"}); parameter.push ({name: "action", value: "get_module_value"});
@ -2160,12 +2158,9 @@ function setModuleValue(id_data, process_simple_value, period,width_data_image)
type: "POST", type: "POST",
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
var currentValue = $("#text_" + id_data).html();
var currentValue = $("#text_" + id_data).html();
//currentValue = currentValue.replace(/_VALUE_/gi, data.value);
$("#text_" + id_data).html(currentValue); $("#text_" + id_data).html(currentValue);
//$("#text_" + id_data).html('Data value');
} }
}); });
} }
@ -2804,7 +2799,7 @@ function createItem(type, values, id_data) {
} }
else if(values['label_position'] == 'down'){ else if(values['label_position'] == 'down'){
if(values['image'] == '' || values['image'] == 'none'){ if(values['image'] == '' || values['image'] == 'none'){
item item
.append('<table style="width:70px"><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>') .append('<table style="width:70px"><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>')
@ -3383,7 +3378,6 @@ function createItem(type, values, id_data) {
item = $('<div id="' + id_data + '" class="item simple_value" style="position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' + item = $('<div id="' + id_data + '" class="item simple_value" style="position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
'<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' + '</div>' '<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' + '</div>'
); );
setModuleValue(id_data,values.process_simple_value,values.period,values.width_data_image);
break; break;
case 'label': case 'label':
item = $('<div id="' + id_data + '" ' + item = $('<div id="' + id_data + '" ' +
@ -3595,12 +3589,6 @@ function updateDB_visual(type, idElement , values, event, top, left) {
case 'bars_graph': case 'bars_graph':
case 'auto_sla_graph': case 'auto_sla_graph':
case 'donut_graph': case 'donut_graph':
if (type == 'simple_value') {
setModuleValue(idElement,
values.process_simple_value,
values.period,values.width_data_image);
}
if ((typeof(values['mov_left']) != 'undefined') && if ((typeof(values['mov_left']) != 'undefined') &&
(typeof(values['mov_top']) != 'undefined')) { (typeof(values['mov_top']) != 'undefined')) {
@ -4170,29 +4158,43 @@ function eventsItems(drag) {
if(selectedItem == 'simple_value'){ if(selectedItem == 'simple_value'){
$('#data_image_width').val(event.currentTarget.clientWidth); $('#data_image_width').val(event.currentTarget.clientWidth);
var found = $('#'+idItem).find("img");
parameter = Array();
if(found.length > 0){ parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
$("#data_image_check").css('display','inline'); parameter.push ({name: "action", value: "get_image_from_module"});
$("#data_image_check_label").css('display','inline'); parameter.push ({name: "id_element", value: idItem});
$('#data_image_container').css('display','inline'); parameter.push ({name: "id_visual_console", value: id_visual_console});
$("#data_image_check").html('On');
$('.block_tinymce').remove(); jQuery.ajax({
$('#label_row').append('<div class="block_tinymce" style="background-color:#fbfbfb;position:absolute;left:0px;height:230px;width:100%;opacity:0.7;z-index:5;"></div>'); url: "ajax.php",
$('#process_value_row').css('display','none'); data: parameter,
$('#period_row').css('display','none'); type: "POST",
} dataType: "json",
else{ success: function(data) {
$("#data_image_check").html('Off'); if(!data['correct']){
$("#data_image_check").css('display','none'); $("#data_image_check").html('Off');
$("#data_image_check_label").css('display','none'); $('#data_image_container').css('display','none');
$('#data_image_container').css('display','none'); $('#data_image_check').css('display','none');
$('.block_tinymce').remove(); $('#data_image_check_label').css('display','none');
$('#process_value_row').css('display','table-row'); $('.block_tinymce').remove();
if($('#process_value').val() != 0){ $('#process_value_row').css('display','table-row');
$('#period_row').css('display','table-row'); if($('#process_value').val() != '0'){
$('#period_row').css('display','table-row');
}
}
else{
$('#data_image_container').css('display','inline');
$('#data_image_check').css('display','inline');
$('#data_image_check_label').css('display','inline');
$("#data_image_check").html('On');
$('#process_value_row').css('display','none');
$('#period_row').css('display','none');
$('#text-label_ifr').contents().find('#tinymce').html('_VALUE_');
$('.block_tinymce').remove();
$('#label_row').append('<div class="block_tinymce" style="background-color:#fbfbfb;position:absolute;left:0px;height:230px;width:100%;opacity:0.7;z-index:5;"></div>');
}
} }
} });
} }
else{ else{
$("#data_image_check").css('display','none'); $("#data_image_check").css('display','none');

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

@ -145,6 +145,24 @@ switch ($action) {
echo json_encode($return); echo json_encode($return);
break; break;
case 'get_image_from_module':
$layoutData = db_get_row_filter('tlayout_data', array('id' => $id_element));
$sql = 'SELECT datos FROM tagente_estado WHERE id_agente_modulo = '.$layoutData['id_agente_modulo'];
ob_clean();
$result = db_get_sql($sql);
$image = strpos($result, 'data:image');
if($image === false){
$return['correct'] = false;
}
else{
$return['correct'] = true;
}
echo json_encode($return);
break;
case 'get_module_type_string': case 'get_module_type_string':
$data = array (); $data = array ();
@ -489,12 +507,6 @@ switch ($action) {
echo (int)$result; echo (int)$result;
break; break;
case 'simple_value': case 'simple_value':
if ($action == 'update') {
$values['type'] = visual_map_get_simple_value_type(
$process_simple_value);
$values['period'] = $period;
$values['width'] = $width;
}
case 'percentile_bar': case 'percentile_bar':
case 'percentile_item': case 'percentile_item':
case 'static_graph': case 'static_graph':
@ -692,6 +704,15 @@ switch ($action) {
if ($height !== null) { if ($height !== null) {
$values['height'] = $height; $values['height'] = $height;
} }
break;
case 'simple_value':
if ($action == 'update') {
$values['type'] = visual_map_get_simple_value_type(
$process_simple_value);
$values['period'] = $period;
$values['width'] = $width;
}
break; break;
default: default:
if (enterprise_installed()) { if (enterprise_installed()) {

54
pandora_console/include/functions_visual_map.php
View File

@ -2045,39 +2045,25 @@ function visual_map_print_item($mode = "read", $layoutData,
global $config; global $config;
if ($type == SIMPLE_VALUE) { $is_image = get_if_module_is_image($layoutData['id_agente_modulo']);
//~ $returnValue_value = explode('&nbsp;', $value); if(get_parameter('action') == 'edit') {
if(!$is_image) {
//~ if ($returnValue_value[1] != "") {
//~ $value = remove_right_zeros(number_format($returnValue_value[0], $config['graph_precision'])) . " " . $returnValue_value[1];
//~ }
//~ else {
//~ $value = remove_right_zeros(number_format($returnValue_value[0], $config['graph_precision']));
//~ }
}
else {
// If the value is a string, dont format it
if (!is_string($value)) {
//~ $value = remove_right_zeros(format_for_graph($value, $config['graph_precision']));
}
}
if(get_parameter('action') == 'edit'){
if( (strip_tags($io_safe_output_text) != '_VALUE_') || (strip_tags($io_safe_output_text) != '(_VALUE_)') ) {
echo $io_safe_output_text; echo $io_safe_output_text;
} }
else { else {
echo "<img style='width:".$layoutData['width']."px;' src='images/console/signes/data_image.png'>"; echo "<img style='width:".$layoutData['width']."px;' src='images/console/signes/data_image.png'>";
} }
} else { }
if(strrpos(strip_tags($io_safe_output_text),'(_VALUE_)') !== false || (strip_tags($io_safe_output_text) == '(_VALUE_)')) { else {
echo str_replace(array("(_VALUE_)","(_value_)"), $value, $io_safe_output_text); if(!$is_image) {
$new_text = str_replace(array("(_VALUE_)","(_value_)"), $value, $io_safe_output_text);
$new_text = str_replace(array('_VALUE_','_value_'), $value, $new_text);
echo $new_text;
} }
elseif(strrpos(strip_tags($io_safe_output_text),'_VALUE_') !== false || (strip_tags($io_safe_output_text) == '_VALUE_')) { else {
echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text); $simple_value_img = str_replace('>', ' style="width:'.$layoutData['width'].'px">', $value);
} else { echo $simple_value_img;
echo str_replace('>', ' style="width:'.$layoutData['width'].'px">',$value);
} }
} }
@ -2167,6 +2153,20 @@ function visual_map_print_item($mode = "read", $layoutData,
} }
} }
function get_if_module_is_image ($id_module) {
$sql = 'SELECT datos FROM tagente_estado WHERE id_agente_modulo = ' . $id_module;
$result = db_get_sql($sql);
$image = strpos($result, 'data:image');
if($image === false){
return false;
}
else{
return true;
}
}
function get_bars_module_data ($id_module) { function get_bars_module_data ($id_module) {
$mod_values = db_get_value_filter('datos', 'tagente_estado', array('id_agente_modulo' => $id_module)); $mod_values = db_get_value_filter('datos', 'tagente_estado', array('id_agente_modulo' => $id_module));