tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed other bug of simple value. Tiquet: #2952

Browse Source 
(cherry picked from commit a1366299294a5135eef7a1bd7c3a4b266ffb4356)
This commit is contained in:
m-lopez-f 2015-11-05 13:48:01 +01:00
parent 7246af5db7
commit 76be952702
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,8 +216,8 @@ function update_button_palette_callback() {
break; break;
case 'simple_value': case 'simple_value':
$("#text_" + idItem).html(values['label']); $("#text_" + idItem).html(values['label']);
$("#simplevalue_" + idItem) //$("#simplevalue_" + idItem)
.html($('<img></img>').attr('src', "images/spinner.gif")); //.html($('<img></img>').attr('src', "images/spinner.gif"));
setModuleValue(idItem,values['process_simple_value'], values['period']); setModuleValue(idItem,values['process_simple_value'], values['period']);
break; break;
case 'label': case 'label':
@ -1303,7 +1303,9 @@ function setModuleValue(id_data, process_simple_value, period) {
dataType: 'json', dataType: 'json',
success: function (data) success: function (data)
{ {
$("#simplevalue_" + id_data).text(data.value); text_value = $("#text_" + idItem).html();
text_value = text_value.replace(/_VALUE_/gi,data.value);
$("#text_" + id_data).html(text_value);
} }
}); });
} }
@ -1607,8 +1609,7 @@ function createItem(type, values, id_data) {
sizeStyle = ''; sizeStyle = '';
imageSize = ''; imageSize = '';
item = $('<div id="' + id_data + '" class="item simple_value" style="text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' + item = $('<div id="' + id_data + '" class="item simple_value" style="text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
'<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' + '<span id="simplevalue_' + id_data + '"></span>'+ '<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' + '</div>'
'</div>'
); );
setModuleValue(id_data,values.process_simple_value,values.period); setModuleValue(id_data,values.process_simple_value,values.period);
break; break;
@ -1806,12 +1807,13 @@ function updateDB_visual(type, idElement , values, event, top, left) {
case 'icon': case 'icon':
case 'module_graph': case 'module_graph':
/*
if (type == 'module_graph') { if (type == 'simple_value') {
$("#image_" + idElement).attr("src", "images/spinner.gif"); setModuleValue(idElement,
setModuleGraph(idElement); values.process_simple_value,
values.period);
} }
*/
if ((typeof(values['mov_left']) != 'undefined') && if ((typeof(values['mov_left']) != 'undefined') &&
(typeof(values['mov_top']) != 'undefined')) { (typeof(values['mov_top']) != 'undefined')) {
@ -1850,7 +1852,7 @@ function updateDB_visual(type, idElement , values, event, top, left) {
} }
}); });
if (typeof(values['parent']) != 'undefined') { if (typeof(values['parent']) != 'undefined' && values['parent'] > 0 ) {
if (!found) { if (!found) {
set_color_line_status(lines, line, idElement, values); set_color_line_status(lines, line, idElement, values);
} }

10
pandora_console/include/functions_visual_map.php
View File

@ -939,7 +939,6 @@ function visual_map_print_item($mode = "read", $layoutData,
case SIMPLE_VALUE_MIN: case SIMPLE_VALUE_MIN:
case SIMPLE_VALUE_AVG: case SIMPLE_VALUE_AVG:
$io_safe_output_text = io_safe_output($text); $io_safe_output_text = io_safe_output($text);
echo $io_safe_output_text;
//Metaconsole db connection //Metaconsole db connection
if ($layoutData['id_metaconsole'] != 0) { if ($layoutData['id_metaconsole'] != 0) {
@ -966,11 +965,10 @@ function visual_map_print_item($mode = "read", $layoutData,
if (!is_string($value)) { if (!is_string($value)) {
$value = format_for_graph($value, 2); $value = format_for_graph($value, 2);
} }
/*
if (!empty($unit_text)) $io_safe_output_text = str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
$value .= " " . $unit_text;
*/ echo $io_safe_output_text;
echo ' <span id="simplevalue_' . $id . '" style="font-weight:bold;">' . $value . '</span>';
//Restore db connection //Restore db connection