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

Fixed problems with simple value in visual console. Tiquet: #2952 

(cherry picked from commit 0826844290)
This commit is contained in:
m-lopez-f 2015-11-04 10:11:33 +01:00
parent bdaedc25d3
commit 2e93905785
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -721,7 +721,7 @@ function loadFieldsFromDB(item) {
var moduleId = 0;
fill_parent_select(idItem);
jQuery.each(data, function(key, val) {
if (key == 'background')
$("#background_image").val(val);
@ -1295,6 +1295,7 @@ function setModuleValue(id_data, process_simple_value, period) {
if (process_simple_value != undefined) {
parameter.push ({name: "process_simple_value", value: process_simple_value});
}
jQuery.ajax({
url: get_url_ajax(),
data: parameter,
@ -1302,7 +1303,7 @@ function setModuleValue(id_data, process_simple_value, period) {
dataType: 'json',
success: function (data)
{
$("#simplevalue_" + id_data).html(data['value']);
$("#simplevalue_" + id_data).text(data.value);
}
});
}
@ -1605,11 +1606,11 @@ function createItem(type, values, id_data) {
case 'simple_value':
sizeStyle = '';
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;">' +
'<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' +
'<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' + '<span id="simplevalue_' + id_data + '"></span>'+
'</div>'
);
setModuleValue(id_data,values.process_simple_value,values.period);
break;
case 'label':
item = $('<div id="' + id_data + '" ' +
@ -1811,7 +1812,7 @@ function updateDB_visual(type, idElement , values, event, top, left) {
setModuleGraph(idElement);
}
*/
if ((typeof(values['mov_left']) != 'undefined') &&
(typeof(values['mov_top']) != 'undefined')) {
$("#" + idElement).css('top', '0px').css('top', top + 'px');
@ -1848,12 +1849,13 @@ function updateDB_visual(type, idElement , values, event, top, left) {
}
}
});
if (typeof(values['parent']) != 'undefined') {
if (!found) {
set_color_line_status(lines, line, idElement, values);
}
}
break;
case 'background':
if(values['width'] == '0' || values['height'] == '0'){
@ -2003,6 +2005,7 @@ function updateDB(type, idElement , values, event) {
updateDB_visual(type, idElement , values, event, top, left);
}
else {
jQuery.ajax({
url: get_url_ajax(),
data: parameter,

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

@ -585,6 +585,7 @@ switch ($action) {
$result = db_process_sql_update('tlayout_data', $values,
array('id' => $id_element));
echo (int)$result;
break;
}

15
pandora_console/include/functions_visual_map.php
View File

@ -957,20 +957,21 @@ function visual_map_print_item($mode = "read", $layoutData,
$unit_text = trim(io_safe_output($unit_text));
$value = db_get_value ('datos',
'tagente_estado', 'id_agente_modulo', $layoutData['id_agente_modulo']);
//$value = db_get_value ('datos',
//'tagente_estado', 'id_agente_modulo', $layoutData['id_agente_modulo']);
$value = visual_map_get_simple_value($type,
$layoutData['id_agente_modulo'], $period);
// If the value is a string, dont format it
if (!is_string($value)) {
$value = format_for_graph($value, 2);
}
/*
if (!empty($unit_text))
$value .= " " . $unit_text;
if (strstr($io_safe_output_text, "(_VALUE_)") === false) {
echo ' <span id="simplevalue_' . $id . '" style="font-weight:bold;">' . $value . '</span>';
}
*/
echo ' <span id="simplevalue_' . $id . '" style="font-weight:bold;">' . $value . '</span>';
//Restore db connection
if ($layoutData['id_metaconsole'] != 0) {