diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php
index bcaf41ad64..b8b3e62e49 100644
--- a/pandora_console/godmode/gis_maps/configure_gis_map.php
+++ b/pandora_console/godmode/gis_maps/configure_gis_map.php
@@ -463,21 +463,12 @@ foreach ($listConnectionTemp as $connectionTemp) {
 }
 
 $table->data[1][0] = __('Add Map connection').$iconError;
-$table->data[1][1] = "<table  class='no-class' border='0' id='map_connection'>
-	<tr>
-		<td >
-			".html_print_select($listConnection, 'map_connection_list', '', '', '', '0', true)."
-		</td>
-		<td >
-			<a href='javascript: addConnectionMap();'>".html_print_image(
+$table->data[1][1] = ".html_print_select($listConnection, 'map_connection_list', '', '', '', '0', true)."
+        < / td > < td > < a href = 'javascript: addConnectionMap();' > ".html_print_image(
     'images/add.png',
     true,
     ['class' => 'invert_filter']
-)."</a>
-			<input type='hidden' name='map_connection_list' value='' id='map_connection_list' />
-			<input type='hidden' name='layer_list' value='' id='layer_list' />
-		</td>
-	</tr> ".gis_add_conection_maps_in_form($map_connection_list).'
+)." < / a > < input type = 'hidden' name = 'map_connection_list' value = '' id = 'map_connection_list' / > < input type = 'hidden' name = 'layer_list' value = '' id = 'layer_list' / > < / td > < / tr > (".gis_add_conection_maps_in_form($map_connection_list).'
 </table>';
 $own_info = get_user_info($config['id_user']);
 
@@ -553,9 +544,9 @@ $table->data = [];
 $table->data[0][0] = '<h4>'.__('List of layers').'</h4>';
 $table->data[0][1] = '<div class="right">'.html_print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add "', true).'</div>';
 
-$table->data[1][0] = '<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_layers"></table>';
-$table->data[1][1] = '<div id="form_layer" class="invisible">
-		<table id="form_layer_table" class="" border="0" cellpadding="4" cellspacing="4">
+$table->data[1][0] = '<table class="databox' border='0' cellpadding='4' cellspacing='4' id='list_layers"></table>';
+$table->data[1][1] = '<div id="form_layer' class='invisible'>
+		<table id='form_layer_table' class="" border='0' cellpadding='4' cellspacing='4">
 			<tr>
 				<td>'.__('Layer name').':</td>
 				<td>'.html_print_input_text('layer_name_form', '', '', 20, 40, true).'</td>
@@ -598,7 +589,7 @@ $table->data[1][1] .= '</td>
 			<tr>
 				<td colspan="4">
 					<h4>'.__('List of Agents to be shown in the layer').'</h4>
-					<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_agents">
+					<table class="databox' border='0' cellpadding='4' cellspacing='4' id='list_agents">
 					</table>
 				</td>
 			</tr>';
@@ -632,18 +623,18 @@ $table->data[1][1] .= '<tr><td colspan="4"><hr /></td></tr>
 				<td colspan="3">'.$agent_for_group_input.'</td>
 			</tr>
 			<tr>
-				<td colspan="4" align="right">'.$add_group_btn.'</td>
+				<td colspan="4' align='right">'.$add_group_btn.'</td>
 			</tr>
 			<tr>
 				<td colspan="4">
 					<h4>'.__('List of groups to be shown in the layer').'</h4>
-					<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_groups">
+					<table class="databox' border='0' cellpadding='4' cellspacing='4' id='list_groups">
 					</table>
 				</td>
 			</tr>';
 
 $table->data[1][1] .= '<tr>
-				<td align="right" colspan="4">'.html_print_button(__('Save Layer'), 'save_layer', false, 'javascript:saveNewLayer();', 'class="sub wand"', true).'
+				<td align="right' colspan='4">'.html_print_button(__('Save Layer'), 'save_layer', false, 'javascript:saveNewLayer();', 'class="sub wand"', true).'
 					'.html_print_input_hidden('current_edit_layer_id', '', true).'
 				</td>
 			</tr>
@@ -653,7 +644,7 @@ $table->data[1][1] .= '<tr>
 html_print_table($table);
 
 
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
+echo '<div class="action - buttons' style=')width: '.$table->width.'">';
 switch ($action) {
     case 'save_new':
     case 'edit_map':
@@ -678,12 +669,12 @@ echo '</form>';
 // -------------------------INI CHUNKS---------------------------------------
 ?>
 
-<table style="visibility: hidden;">
-    <tbody id="chunk_map_connection">
-        <tr class="row_0">
+<table style="visibility: hidden;('>
+    <tbody id='chunk_map_connection'>
+        <tr class='row_0">
             <td><?php html_print_input_text('map_connection_name', $map_name, '', 20, 40, false, true); ?></td>
             <td><?php html_print_radio_button_extended('map_connection_default', '', '', true, false, 'changeDefaultConection(this.value)', ''); ?></td>
-            <td><a id="delete_row" href="none">
+            <td><a id="delete_row' href='none">
             <?php
             html_print_image(
                 'images/cross.png',
@@ -706,36 +697,43 @@ ui_require_jquery_file('cluetip');
 ui_require_jquery_file('pandora.controls');
 ui_require_jquery_file('json');
 ?>
-<script type="text/javascript">
+<script type="text / javascript'>
 
 function active_button_add_agent() {
-    $("#button-add_agent").prop("disabled", false);
+    $(')
+// button-add_agent").prop("disabled", false);
 }
 
-function addAgentClick (event) {
-    var $layerFormAgentIdInput = $("#hidden-agent_id");
-    var $layerFormAgentAliasInput = $("#text-agent_alias");
-    
+
+function addAgentClick(event)
+{
+    var $layerFormAgentIdInput = $('#hidden-agent_id');
+    var $layerFormAgentAliasInput = $('#text-agent_alias');
+
     var agentId = Number.parseInt($layerFormAgentIdInput.val());
     var agentAlias = $layerFormAgentAliasInput.val();
-    var layerId = $("input#hidden-current_edit_layer_id").val();
-    
-    if (Number.isNaN(agentId) || agentId === 0 || agentAlias.length === 0) return;
-    
-    addAgentRow(layerId, agentId, agentAlias);
-    
-    // Clear agent inputs
-    $layerFormAgentIdInput.val("");
-    $layerFormAgentAliasInput.val("");
+    var layerId = $('input#hidden-current_edit_layer_id').val();
 
-    $("#button-add_agent").prop("disabled", true);
+    if (Number.isNaN(agentId) || agentId === 0 || agentAlias.length === 0) {
+        return;
+    }
+
+    addAgentRow(layerId, agentId, agentAlias);
+
+    // Clear agent inputs
+    $layerFormAgentIdInput.val('');
+    $layerFormAgentAliasInput.val('');
+
+    $('#button-add_agent').prop('disabled', true);
 }
 
-function toggleAddGroupBtn () {
-    var groupId = Number.parseInt($("select#layer_group_id").val());
+
+function toggleAddGroupBtn()
+{
+    var groupId = Number.parseInt($('select#layer_group_id').val());
     var existGroupId = $("table#list_groups tr.groups_list_item[data-group-id='" + groupId + "']").length > 0;
-    var agentId = Number.parseInt($("input#hidden-agent_id_for_data").val());
-    var agentAlias = $("input#text-agent_alias_for_data").val();
+    var agentId = Number.parseInt($('input#hidden-agent_id_for_data').val());
+    var agentAlias = $('input#text-agent_alias_for_data').val();
 
     var enabled = (
         !existGroupId
@@ -745,18 +743,20 @@ function toggleAddGroupBtn () {
         && agentId > 0
         && agentAlias.length > 0
     );
-    
-    $("#button-add_group").prop("disabled", !enabled);
+
+    $('#button-add_group').prop('disabled', !enabled);
 }
 
-function addGroupClick (event) {
-    var $layerFormGroupIdInput = $("select#layer_group_id");
-    var $layerFormAgentIdInput = $("input#hidden-agent_id_for_data");
-    var $layerFormAgentAliasInput = $("input#text-agent_alias_for_data");
-    
-    var layerId = $("input#hidden-current_edit_layer_id").val();
+
+function addGroupClick(event)
+{
+    var $layerFormGroupIdInput = $('select#layer_group_id');
+    var $layerFormAgentIdInput = $('input#hidden-agent_id_for_data');
+    var $layerFormAgentAliasInput = $('input#text-agent_alias_for_data');
+
+    var layerId = $('input#hidden-current_edit_layer_id').val();
     var groupId = Number.parseInt($layerFormGroupIdInput.val());
-    var groupName = $layerFormGroupIdInput.find(":selected").text();
+    var groupName = $layerFormGroupIdInput.find(':selected').text();
     var agentId = Number.parseInt($layerFormAgentIdInput.val());
     var agentAlias = $layerFormAgentAliasInput.val();
 
@@ -768,51 +768,66 @@ function addGroupClick (event) {
         && agentId > 0
         && agentAlias.length > 0
     );
-    
-    if (!valid) return;
-    
+
+    if (!valid) {
+        return;
+    }
+
     addGroupRow(layerId, groupId, groupName, agentId, agentAlias);
-    
+
     // Clear inputs
     // $layerFormGroupIdInput.val(0);
-    $layerFormAgentIdInput.val("");
-    $layerFormAgentAliasInput.val("");
+    $layerFormAgentIdInput.val('');
+    $layerFormAgentAliasInput.val('');
 
-    $("#button-add_group").prop("disabled", true);
+    $('#button-add_group').prop('disabled', true);
 }
 
-function moveLayerRowUpOnClick (event) {
+
+function moveLayerRowUpOnClick(event)
+{
     var $row = $(event.currentTarget).parent().parent();
     $row.insertBefore($row.prev());
 }
 
-function moveLayerRowDownOnClick (event) {
+
+function moveLayerRowDownOnClick(event)
+{
     var $row = $(event.currentTarget).parent().parent();
     $row.insertAfter($row.next());
 }
 
-function removeLayerRowOnClick (event) {
+
+function removeLayerRowOnClick(event)
+{
     var $layerRow = $(event.currentTarget).parent().parent();
-    var layerRowId = $layerRow.find("input.layer_id").val();
-    var layerEditorId = $("input#hidden-current_edit_layer_id").val();
-    if (layerRowId == layerEditorId) hideLayerEditor();
+    var layerRowId = $layerRow.find('input.layer_id').val();
+    var layerEditorId = $('input#hidden-current_edit_layer_id').val();
+    if (layerRowId == layerEditorId) {
+        hideLayerEditor();
+    }
+
     // Remove row
     $(event.currentTarget).parent().parent().remove();
 }
 
-function hideLayerEditor () {
+
+function hideLayerEditor()
+{
     // Clean editor
     cleanLayerEditor();
     // Hide editor
-    $("div#form_layer").hide();
+    $('div#form_layer').hide();
 }
 
-function showLayerEditor (layerId) {
-    var $layerSaveBtn = $("input#button-save_layer");
+
+function showLayerEditor(layerId)
+{
+    var $layerSaveBtn = $('input#button-save_layer');
 
     // Clean editor
     cleanLayerEditor();
-    
+
     if (layerId) {
         // Hide save layer button
         $layerSaveBtn.hide();
@@ -832,33 +847,39 @@ function showLayerEditor (layerId) {
     }
 
     // Show editor (if hidden)
-    $("div#form_layer").show();
+    $('div#form_layer').show();
 }
 
-function getLayerData (layerId) {
-    var $layerRow = $("tr#layer_row_" + layerId);
-    var layerName = $layerRow.find("input.layer_name").val();
-    var layerVisible = $layerRow.find("input.layer_visible").val() == 1;
-    var layerAgentsFromGroup = $layerRow.find("input.layer_agents_from_group").val();
-    var layerAgents = $layerRow.find("input.layer_agent_alias").map(function () {
-        return {
-            "id": $(this).data("agent-id"),
-            "alias": $(this).val()
-        };
-    }).get();
-    var layerGroups = $layerRow.find("input.layer_group_id").map(function () {
-        var groupId = $(this).val();
-        var groupName = $(this).siblings("input.layer_group_name[data-group-id='" + groupId + "']").val();
-        var agentId = $(this).siblings("input.layer_agent_id_for_data[data-group-id='" + groupId + "']").val();
-        var agentAlias = $(this).siblings("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']").val();
-        
-        return {
-            "id": groupId,
-            "name": groupName,
-            "agentId": agentId,
-            "agentAlias": agentAlias
-        };
-    }).get();
+
+function getLayerData(layerId)
+{
+    var $layerRow = $('tr#layer_row_' + layerId);
+    var layerName = $layerRow.find('input.layer_name').val();
+    var layerVisible = $layerRow.find('input.layer_visible').val() == 1;
+    var layerAgentsFromGroup = $layerRow.find('input.layer_agents_from_group').val();
+    var layerAgents = $layerRow.find('input.layer_agent_alias').map(
+        function () {
+            return {
+            'id': $(this).data('agent-id'),
+            'alias': $(this).val()
+            };
+        }
+    ).get();
+    var layerGroups = $layerRow.find('input.layer_group_id').map(
+        function () {
+            var groupId = $(this).val();
+            var groupName = $(this).siblings(("input.layer_group_name[data-group-id='" + groupId + "']")).val();
+            var agentId = $(this).siblings(("input.layer_agent_id_for_data[data-group-id='" + groupId + "']")).val();
+            var agentAlias = $(this).siblings(("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']")).val();
+
+            return {
+            'id': groupId,
+            'name': groupName,
+            'agentId': agentId,
+            'agentAlias': agentAlias
+            };
+        }
+    ).get();
 
     return {
         id: layerId,
@@ -870,361 +891,431 @@ function getLayerData (layerId) {
     }
 }
 
-function setLayerEditorData (data) {
-    if (data == null) data = {};
+
+function setLayerEditorData(data)
+{
+    if (data == null) {
+        data = {};
+    }
+
     // Set defaults
     data = {
         id: data.id || 0,
-        name: data.name || "",
+        name: data.name || '',
         visible: data.visible != null ? !!data.visible : true,
         agentsFromGroup: data.agentsFromGroup || -1,
         agents: data.agents || [],
         groups: data.groups || []
     }
 
-    var $layerFormIdInput = $("input#hidden-current_edit_layer_id");
-    var $layerFormNameInput = $("input#text-layer_name_form");
-    var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
-    var $layerFormAgentsFromGroupSelect = $("#layer_group_form");
-    var $layerFormAgentInput = $("input#text-agent_alias");
-    var $layerFormAgentButton = $("input#button-add_agent");
-    var $layerFormAgentsListItems = $("tr.agents_list_item");
-    var $layerFormGroupsListItems = $("tr.groups_list_item");
+    var $layerFormIdInput = $('input#hidden-current_edit_layer_id');
+    var $layerFormNameInput = $('input#text-layer_name_form');
+    var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
+    var $layerFormAgentsFromGroupSelect = $('#layer_group_form');
+    var $layerFormAgentInput = $('input#text-agent_alias');
+    var $layerFormAgentButton = $('input#button-add_agent');
+    var $layerFormAgentsListItems = $('tr.agents_list_item');
+    var $layerFormGroupsListItems = $('tr.groups_list_item');
 
     $layerFormIdInput.val(data.id);
     $layerFormNameInput.val(data.name);
-    $layerFormVisibleCheckbox.prop("checked", data.visible);
-    $(`#layer_group_form option[value=${data.agentsFromGroup}]`).attr('selected', 'selected');
+    $layerFormVisibleCheckbox.prop('checked', data.visible);
+    $(`#layer_group_form option[value=${data.agentsFromGroup
+}]`).attr('selected', 'selected');
+
+
     $(`#layer_group_form`).trigger('change');
-    $layerFormAgentInput.val("");
-    $layerFormAgentButton.prop("disabled", true);
+    $layerFormAgentInput.val('');
+    $layerFormAgentButton.prop('disabled', true);
     $layerFormAgentsListItems.remove();
     $layerFormGroupsListItems.remove();
 
-    var $tableAgents = $("table#list_agents");
-    data.agents.forEach(function (agent) {
+    var $tableAgents = $('table#list_agents');
+    data.agents.foreach (function (agent) {
         addAgentRow(data.id, agent.id, agent.alias);
-    });
+    }) {
+    }
 
-    var $tableGroups = $("table#list_groups");
-    data.groups.forEach(function (group) {
+    var $tableGroups = $('table#list_groups');
+    data.groups.foreach (function (group) {
         addGroupRow(data.id, group.id, group.name, group.agentId, group.agentAlias);
-    });
-}
-
-function newLayer () {
-    showLayerEditor(null);
-}
-
-function saveNewLayer () {
-    var $layerFormNameInput = $("input#text-layer_name_form");
-    var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
-    var $layerFormAgentsFromGroupSelect = $("select#layer_group_form");
-    var $layerFormAgentsListItems = $("tr.agents_list_item > td > span.agent_alias");
-    var $layerFormGroupsListItems = $("tr.groups_list_item");
-    var newLayerId = "new_" + ($("tr.layer_row").length + 1);
-
-    addLayerRow(newLayerId, {
-        id: newLayerId,
-        name: $layerFormNameInput.val(),
-        visible: $layerFormVisibleCheckbox.prop("checked"),
-        agentsFromGroup: $layerFormAgentsFromGroupSelect.val(),
-        agents: $layerFormAgentsListItems.map(function () {
-            return {
-                "id": $(this).data("agent-id"),
-                "alias": $(this).text()
-            };
-        }).get(),
-        groups: $layerFormGroupsListItems.map(function () {
-            return {
-                "id": $(this).data("group-id"),
-                "name": $(this).data("group-name"),
-                "agentId": $(this).data("agent-id"),
-                "agentAlias": $(this).data("agent-alias")
-            };
-        }).get()
-    });
-}
-
-function cleanLayerEditor () {
-    // Clear editor events
-    unbindLayerEditorEvents();
-    // Add default data to the editor
-    setLayerEditorData();
-}
-
-function bindLayerEditorEvents (layerId) {
-    var $layerFormNameInput = $("input#text-layer_name_form");
-    var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
-    var $layerFormAgentsFromGroupSelect = $("select#layer_group_form");
-
-    var $layerRow = $("tr#layer_row_" + layerId);
-
-    if ($layerRow.length === 0) return;
-
-    $layerFormNameInput.bind("change", function (event) {
-        var name = event.currentTarget.value;
-        $layerRow.find("span.layer_name").html(name);
-        $layerRow.find("input.layer_name").val(name);
-    });
-    $layerFormVisibleCheckbox.bind("click", function (event) {
-        var visible = $(event.currentTarget).prop("checked");
-        $layerRow.find("input.layer_visible").val(visible ? 1 : 0);
-    });
-    $layerFormAgentsFromGroupSelect.bind("change", function (event) {
-        var group = event.currentTarget.value;
-        $layerRow.find("input.layer_agents_from_group").val(group);
-    });
-}
-
-function unbindLayerEditorEvents () {
-    var $layerFormNameInput = $("input#text-layer_name_form");
-    var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
-    var $layerFormAgentsFromGroupSelect = $("select#layer_group_form");
-
-    $layerFormNameInput.unbind("change");
-    $layerFormVisibleCheckbox.unbind("click");
-    $layerFormAgentsFromGroupSelect.val('-1');
-}
-
-function getAgentRow (layerId, agentId, agentAlias) {
-    var $row = $("<tr class=\"agents_list_item\" />");
-    var $nameCol = $("<td />");
-    var $deleteCol = $("<td />");
-
-    var $agentAlias = $("<span class=\"agent_alias\" data-agent-id=\"" + agentId + "\">" + agentAlias + "</span>");
-    var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/cross.png', false, ['class' => 'invert_filter']); ?> </a>');
-
-    $removeBtn.click(function (event) {
-        var $layerRow = $("tr#layer_row_" + layerId);
-
-        if ($layerRow.length > 0) {
-            $layerRow.find("input.layer_agent_id[data-agent-id='" + agentId + "']").remove();
-            $layerRow.find("input.layer_agent_alias[data-agent-id='" + agentId + "']").remove();
-        }
-
-        var $agentListItemRow = $(event.currentTarget).parent().parent();
-        $agentListItemRow.remove();
-    });
-
-    $nameCol.append($agentAlias);
-    $deleteCol.append($removeBtn);
-
-    $row.append($nameCol).append($deleteCol);
-
-    return $row;
-}
-
-function addAgentRow (layerId, agentId, agentAlias) {
-    if (agentId == null || agentId == 0 || agentAlias.length === 0) return;
-
-    var $layerRow = $("tr#layer_row_" + layerId);
-    if ($layerRow && $layerRow.find("input.layer_agent_id[value='" + agentId + "']").length === 0) {
-        $layerRow
-            .find("td:first-child")
-                .append(getLayerAgentIdInput(layerId, agentId))
-                .append(getLayerAgentAliasInput(layerId, agentId, agentAlias));
+    }) {
     }
 
-    $("table#list_agents").append(getAgentRow(layerId, agentId, agentAlias));
-}
+    }
 
-function getLayerAgentIdInput (layerId, agentId) {
-    return $("<input class=\"layer_agent_id\" type=\"hidden\" data-agent-id=\"" + agentId + "\" name=\"layers[" + layerId + "][agents][" + agentId + "][id]\" value=\"" + agentId + "\">");
-}
 
-function getLayerAgentAliasInput (layerId, agentId, agentAlias) {
-    return $("<input class=\"layer_agent_alias\" type=\"hidden\" data-agent-id=\"" + agentId + "\" name=\"layers[" + layerId + "][agents][" + agentId + "][alias]\" value=\"" + agentAlias + "\">");
-}
+    function newLayer()
+    {
+        showLayerEditor(null);
+    }
 
-function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
-    var $row = $("<tr class=\"groups_list_item\" data-group-id=\"" + groupId + "\" data-group-name=\"" + groupName + "\" data-agent-id=\"" + agentId + "\" data-agent-alias=\"" + agentAlias + "\" />");
-    var $nameCol = $("<td />");
-    var $deleteCol = $("<td />");
 
-    var $groupName = $("<span class=\"group_desc\">"
+    function saveNewLayer()
+    {
+        var $layerFormNameInput = $('input#text-layer_name_form');
+        var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
+        var $layerFormAgentsFromGroupSelect = $('select#layer_group_form');
+        var $layerFormAgentsListItems = $('tr.agents_list_item > td > span.agent_alias');
+        var $layerFormGroupsListItems = $('tr.groups_list_item');
+        var newLayerId = ('new_' + ($('tr.layer_row').length + 1));
+
+        addLayerRow(
+            newLayerId,
+            {
+            id: newLayerId,
+            name: $layerFormNameInput.val(),
+            visible: $layerFormVisibleCheckbox.prop('checked'),
+            agentsFromGroup: $layerFormAgentsFromGroupSelect.val(),
+            agents: $layerFormAgentsListItems.map(
+                function () {
+                    return {
+                    'id': $(this).data('agent-id'),
+                    'alias': $(this).text()
+                    };
+                }
+            ).get(),
+            groups: $layerFormGroupsListItems.map(
+                function () {
+                    return {
+                    'id': $(this).data('group-id'),
+                    'name': $(this).data('group-name'),
+                    'agentId': $(this).data('agent-id'),
+                    'agentAlias': $(this).data('agent-alias')
+                    };
+                }
+            ).get()
+            }
+        );
+    }
+
+
+    function cleanLayerEditor()
+    {
+        // Clear editor events
+        unbindLayerEditorEvents();
+        // Add default data to the editor
+        setLayerEditorData();
+    }
+
+
+    function bindLayerEditorEvents(layerId)
+    {
+        var $layerFormNameInput = $('input#text-layer_name_form');
+        var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
+        var $layerFormAgentsFromGroupSelect = $('select#layer_group_form');
+
+        var $layerRow = $('tr#layer_row_' + layerId);
+
+        if ($layerRow.length === 0) {
+            return;
+        }
+
+        $layerFormNameInput.bind(
+            'change',
+            function (event) {
+                var name = event.currentTarget.value;
+                $layerRow.find('span.layer_name').html(name);
+                $layerRow.find('input.layer_name').val(name);
+            }
+        );
+        $layerFormVisibleCheckbox.bind(
+            'click',
+            function (event) {
+                var visible = $(event.currentTarget).prop('checked');
+                $layerRow.find('input.layer_visible').val(visible ? 1 : 0);
+            }
+        );
+        $layerFormAgentsFromGroupSelect.bind(
+            'change',
+            function (event) {
+                var group = event.currentTarget.value;
+                $layerRow.find('input.layer_agents_from_group').val(group);
+            }
+        );
+    }
+
+
+    function unbindLayerEditorEvents()
+    {
+        var $layerFormNameInput = $('input#text-layer_name_form');
+        var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
+        var $layerFormAgentsFromGroupSelect = $('select#layer_group_form');
+
+        $layerFormNameInput.unbind('change');
+        $layerFormVisibleCheckbox.unbind('click');
+        $layerFormAgentsFromGroupSelect.val('-1');
+    }
+
+
+    function getAgentRow(layerId, agentId, agentAlias)
+    {
+        var $row = $('<tr class="agents_list_item" />');
+        var $nameCol = $('<td />');
+        var $deleteCol = $('<td />');
+
+        var $agentAlias = $('<span class="agent_alias" data-agent-id="' + agentId + '">' + agentAlias + '</span>');
+        var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images / cross.png', false, ['class' => 'invert_filter']); ?> </a>');
+
+        $removeBtn.click(
+            function (event) {
+                var $layerRow = $('tr#layer_row_' + layerId);
+
+                if ($layerRow.length > 0) {
+                    $layerRow.find(("input.layer_agent_id[data-agent-id='" + agentId + "']")).remove();
+                    $layerRow.find(("input.layer_agent_alias[data-agent-id='" + agentId + "']")).remove();
+                }
+
+                var $agentListItemRow = $(event.currentTarget).parent().parent();
+                $agentListItemRow.remove();
+            }
+        );
+
+        $nameCol.append($agentAlias);
+        $deleteCol.append($removeBtn);
+
+        $row.append($nameCol).append($deleteCol);
+
+        return $row;
+    }
+
+
+    function addAgentRow(layerId, agentId, agentAlias)
+    {
+        if (agentId == null || agentId == 0 || agentAlias.length === 0) {
+            return;
+        }
+
+        var $layerRow = $('tr#layer_row_' + layerId);
+        if ($layerRow && $layerRow.find(("input.layer_agent_id[value='" + agentId + "']")).length === 0) {
+            $layerRow.find('td:first-child').append(getLayerAgentIdInput(layerId, agentId)).append(getLayerAgentAliasInput(layerId, agentId, agentAlias));
+        }
+
+        $('table#list_agents').append(getAgentRow(layerId, agentId, agentAlias));
+    }
+
+
+    function getLayerAgentIdInput(layerId, agentId)
+    {
+        return $('<input class="layer_agent_id" type="hidden" data-agent-id="' + agentId + '" name="layers[' + layerId + '][agents][' + agentId + '][id]" value="' + agentId + '">');
+    }
+
+
+    function getLayerAgentAliasInput(layerId, agentId, agentAlias)
+    {
+        return $('<input class="layer_agent_alias" type="hidden" data-agent-id="' + agentId + '" name="layers[' + layerId + '][agents][' + agentId + '][alias]" value="' + agentAlias + '">');
+    }
+
+
+    function getGroupRow(layerId, groupId, groupName, agentId, agentAlias)
+    {
+        var $row = $('<tr class="groups_list_item" data-group-id="' + groupId + '" data-group-name="' + groupName + '" data-agent-id="' + agentId + '" data-agent-alias="' + agentAlias + '" />');
+        var $nameCol = $('<td />');
+        var $deleteCol = $('<td />');
+
+        var $groupName = $('<span class="group_desc">'
         + groupName
-        + " ("
+        + ' ('
         + "<?php echo __('Using data from'); ?> "
-        + "<i>" + agentAlias + "</i>"
-        + ")"
-        + "</span>");
-    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>');
+        + '<i>' + agentAlias + '</i>'
+        + ')'
+        + '</span>');
+        var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images / cross.png', true, ['class' => 'invert_filter']); ?></a>');
 
-    $removeBtn.click(function (event) {
-        var $layerRow = $("tr#layer_row_" + layerId);
+        $removeBtn.click(
+            function (event) {
+                var $layerRow = $('tr#layer_row_' + layerId);
 
-        if ($layerRow.length > 0) {
-            $layerRow.find("input.layer_group_id[data-group-id='" + groupId + "']").remove();
-            $layerRow.find("input.layer_group_name[data-group-id='" + groupId + "']").remove();
-            $layerRow.find("input.layer_agent_id_for_data[data-group-id='" + groupId + "']").remove();
-            $layerRow.find("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']").remove();
+                if ($layerRow.length > 0) {
+                    $layerRow.find(("input.layer_group_id[data-group-id='" + groupId + "']")).remove();
+                    $layerRow.find(("input.layer_group_name[data-group-id='" + groupId + "']")).remove();
+                    $layerRow.find(("input.layer_agent_id_for_data[data-group-id='" + groupId + "']")).remove();
+                    $layerRow.find(("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']")).remove();
+                }
+
+                var $groupListItemRow = $(event.currentTarget).parent().parent();
+                $groupListItemRow.remove();
+            }
+        );
+
+        $nameCol.append($groupName);
+        $deleteCol.append($removeBtn);
+
+        $row.append($nameCol).append($deleteCol);
+
+        return $row;
+    }
+
+
+    function addGroupRow(layerId, groupId, groupName, agentId, agentAlias)
+    {
+        if (groupId == null
+            || groupId == 0
+            || groupName.length === 0
+            || agentId == null
+            || agentId == 0
+            || agentAlias.length === 0
+        ) {
+            return;
         }
 
-        var $groupListItemRow = $(event.currentTarget).parent().parent();
-        $groupListItemRow.remove();
-    });
-
-    $nameCol.append($groupName);
-    $deleteCol.append($removeBtn);
-
-    $row.append($nameCol).append($deleteCol);
-
-    return $row;
-}
-
-function addGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
-    if (
-        groupId == null ||
-        groupId == 0 ||
-        groupName.length === 0 ||
-        agentId == null ||
-        agentId == 0 ||
-        agentAlias.length === 0
-    ) return;
-
-    var $layerRow = $("tr#layer_row_" + layerId);
-    if ($layerRow && $layerRow.find("input.layer_group_id[value='" + groupId + "']").length === 0) {
-        $layerRow
-            .find("td:first-child")
-                .append(getLayerGroupIdInput(layerId, groupId))
-                .append(getLayerGroupNameInput(layerId, groupId, groupName))
-                .append(getLayerAgentIdForDataInput(layerId, groupId, agentId))
-                .append(getLayerAgentAliasForDataInput(layerId, groupId, agentAlias));
-    }
-
-    $("table#list_groups").append(getGroupRow(layerId, groupId, groupName, agentId, agentAlias));
-}
-
-function getLayerGroupIdInput (layerId, groupId) {
-    return $("<input class=\"layer_group_id\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][id]\" value=\"" + groupId + "\">");
-}
-
-function getLayerGroupNameInput (layerId, groupId, groupName) {
-    return $("<input class=\"layer_group_name\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][name]\" value=\"" + groupName + "\">");
-}
-
-function getLayerAgentIdForDataInput (layerId, groupId, agentId) {
-    return $("<input class=\"layer_agent_id_for_data\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][agent_id]\" value=\"" + agentId + "\">");
-}
-
-function getLayerAgentAliasForDataInput (layerId, groupId, agentAlias) {
-    return $("<input class=\"layer_agent_alias_for_data\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][agent_alias]\" value=\"" + agentAlias + "\">");
-}
-
-function getLayerRow (layerId, layerData) {
-    var $row = $("<tr id=\"layer_row_" + layerId + "\" class=\"layer_row\" />");
-    var $nameCol = $("<td />");
-    var $sortCol = $("<td />");
-    var $editCol = $("<td />");
-    var $deleteCol = $("<td />");
-
-    var $layerIdInput = $("<input class=\"layer_id\" type=\"hidden\" name=\"layer_ids[]\" value=\"" + layerId + "\">");
-    var $layerNameInput = $("<input class=\"layer_name\" type=\"hidden\" name=\"layers[" + layerId + "][name]\" value=\"" + layerData.name + "\">");
-    var $layerVisibleInput = $("<input class=\"layer_visible\" type=\"hidden\" name=\"layers[" + layerId + "][visible]\" value=\"" + (layerData.visible ? 1 : 0) + "\">");
-    var $layerAgentsFromGroupInput = $("<input class=\"layer_agents_from_group\" type=\"hidden\" name=\"layers[" + layerId + "][agents_from_group]\" value=\"" + layerData.agentsFromGroup + "\">");
-
-    var $layerName = $("<span class=\"layer_name\">" + layerData.name + "</span>");
-    var $sortUpBtn = $("<a class=\"up_arrow\" href=\"javascript:;\" />");
-    var $sortDownBtn = $("<a class=\"down_arrow\" href=\"javascript:;\" />");
-    var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/config.png', true, ['class' => 'invert_filter']); ?></a>');
-    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>');
-
-    $sortUpBtn.click(moveLayerRowUpOnClick);
-    $sortDownBtn.click(moveLayerRowDownOnClick);
-    $editBtn.click(function () { showLayerEditor(layerId); });
-    $removeBtn.click(removeLayerRowOnClick);
-
-    $nameCol
-        .append($layerName)
-        .append($layerIdInput)
-        .append($layerNameInput)
-        .append($layerVisibleInput)
-        .append($layerAgentsFromGroupInput);
-    
-    if (layerData.agents && layerData.agents.length > 0) {
-        layerData.agents.forEach(function (agent) {
-            $nameCol.append(getLayerAgentIdInput(layerId, agent.id));
-            $nameCol.append(getLayerAgentAliasInput(layerId, agent.id, agent.alias));
-        });
-    }
-
-    if (layerData.groups && layerData.groups.length > 0) {
-        layerData.groups.forEach(function (group) {
-            $nameCol.append(getLayerGroupIdInput(layerId, group.id));
-            $nameCol.append(getLayerGroupNameInput(layerId, group.id, group.name));
-            $nameCol.append(getLayerAgentIdForDataInput(layerId, group.id, group.agentId));
-            $nameCol.append(getLayerAgentAliasForDataInput(layerId, group.id, group.agentAlias));
-        });
-    }
-
-    $sortCol
-        .append($sortUpBtn)
-        .append($sortDownBtn);
-    $editCol
-        .append($editBtn);
-    $deleteCol
-        .append($removeBtn);
-
-    $row
-        .append($nameCol)
-        .append($sortCol)
-        .append($editCol)
-        .append($deleteCol);
-
-    return $row;
-}
-
-function addLayerRow (layerId, layerData) {
-    $("table#list_layers").append(getLayerRow(layerId, layerData));
-    showLayerEditor(layerId);
-}
-
-function hightlightRow (layerId) {
-    var highlightColor = "#E9F3D2";
-    $("tr.layer_row").css("background", "");
-    $("tr#layer_row_" + layerId).css("background", highlightColor);
-}
-
-function existInvalidLayerNames () {
-    var exist = false;
-    $("table#list_layers input.layer_name").each(function () {
-        if ($(this).val().trim().length === 0) {
-            exist = true;
-            return false; // Break jQuery object each
+        var $layerRow = $('tr#layer_row_' + layerId);
+        if ($layerRow && $layerRow.find(("input.layer_group_id[value='" + groupId + "']")).length === 0) {
+            $layerRow.find('td:first-child').append(getLayerGroupIdInput(layerId, groupId)).append(getLayerGroupNameInput(layerId, groupId, groupName)).append(getLayerAgentIdForDataInput(layerId, groupId, agentId)).append(getLayerAgentAliasForDataInput(layerId, groupId, agentAlias));
         }
-    });
-    
-    return exist;
-}
 
-function onFormSubmit (event) {
-    // Validate layer names
-    if (existInvalidLayerNames()) {
-        event.preventDefault();
-        event.stopPropagation();
-        alert("<?php echo __('Empty layer names are not supported'); ?>");
-        return false;
+        $('table#list_groups').append(getGroupRow(layerId, groupId, groupName, agentId, agentAlias));
     }
-    // Save connection list
-    $('#map_connection_list').val(connectionMaps.toString());
-}
 
-function onLayerGroupIdChange (event) {
-    // Clear agent inputs
-    $("input#hidden-agent_id_for_data").val(0);
-    $("input#text-agent_alias_for_data").val("");
-    toggleAddGroupBtn();
-}
 
-// Bind events
-$("form#form_setup").submit(onFormSubmit);
-$("input#button-add_agent").click(addAgentClick);
-$("select#layer_group_id").change(onLayerGroupIdChange);
-$("input#button-add_group").click(addGroupClick);
+    function getLayerGroupIdInput(layerId, groupId)
+    {
+        return $('<input class="layer_group_id" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][id]" value="' + groupId + '">');
+    }
 
-// Populate layer list
-var layers = <?php echo json_encode($layer_list); ?>;
+
+    function getLayerGroupNameInput(layerId, groupId, groupName)
+    {
+        return $('<input class="layer_group_name" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][name]" value="' + groupName + '">');
+    }
+
+
+    function getLayerAgentIdForDataInput(layerId, groupId, agentId)
+    {
+        return $('<input class="layer_agent_id_for_data" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][agent_id]" value="' + agentId + '">');
+    }
+
+
+    function getLayerAgentAliasForDataInput(layerId, groupId, agentAlias)
+    {
+        return $('<input class="layer_agent_alias_for_data" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][agent_alias]" value="' + agentAlias + '">');
+    }
+
+
+    function getLayerRow(layerId, layerData)
+    {
+        var $row = $('<tr id="layer_row_' + layerId + '" class="layer_row" />');
+        var $nameCol = $('<td />');
+        var $sortCol = $('<td />');
+        var $editCol = $('<td />');
+        var $deleteCol = $('<td />');
+
+        var $layerIdInput = $('<input class="layer_id" type="hidden" name="layer_ids[]" value="' + layerId + '">');
+        var $layerNameInput = $('<input class="layer_name" type="hidden" name="layers[' + layerId + '][name]" value="' + layerData.name + '">');
+        var $layerVisibleInput = $('<input class="layer_visible" type="hidden" name="layers[' + layerId + '][visible]" value="' + (layerData.visible ? 1 : 0) + '">');
+        var $layerAgentsFromGroupInput = $('<input class="layer_agents_from_group" type="hidden" name="layers[' + layerId + '][agents_from_group]" value="' + layerData.agentsFromGroup + '">');
+
+        var $layerName = $('<span class="layer_name">' + layerData.name + '</span>');
+        var $sortUpBtn = $('<a class="up_arrow" href="javascript:;" />');
+        var $sortDownBtn = $('<a class="down_arrow" href="javascript:;" />');
+        var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images / config.png', true, ['class' => 'invert_filter']); ?></a>');
+        var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images / cross.png', true, ['class' => 'invert_filter']); ?></a>');
+
+        $sortUpBtn.click(moveLayerRowUpOnClick);
+        $sortDownBtn.click(moveLayerRowDownOnClick);
+        $editBtn.click(
+            function () {
+                showLayerEditor(layerId);
+            }
+        );
+        $removeBtn.click(removeLayerRowOnClick);
+
+        $nameCol.append($layerName).append($layerIdInput).append($layerNameInput).append($layerVisibleInput).append($layerAgentsFromGroupInput);
+
+        if (layerData.agents && layerData.agents.length > 0) {
+            layerData.agents.foreach (function (agent) {
+                $nameCol.append(getLayerAgentIdInput(layerId, agent.id));
+                $nameCol.append(getLayerAgentAliasInput(layerId, agent.id, agent.alias));
+            }) {
+            }
+        }
+
+        if (layerData.groups && layerData.groups.length > 0) {
+            layerData.groups.foreach (function (group) {
+                $nameCol.append(getLayerGroupIdInput(layerId, group.id));
+                $nameCol.append(getLayerGroupNameInput(layerId, group.id, group.name));
+                $nameCol.append(getLayerAgentIdForDataInput(layerId, group.id, group.agentId));
+                $nameCol.append(getLayerAgentAliasForDataInput(layerId, group.id, group.agentAlias));
+            }) {
+            }
+        }
+
+        $sortCol.append($sortUpBtn).append($sortDownBtn);
+        $editCol.append($editBtn);
+        $deleteCol.append($removeBtn);
+
+        $row.append($nameCol).append($sortCol).append($editCol).append($deleteCol);
+
+        return $row;
+    }
+
+
+    function addLayerRow(layerId, layerData)
+    {
+        $('table#list_layers').append(getLayerRow(layerId, layerData));
+        showLayerEditor(layerId);
+    }
+
+
+    function hightlightRow(layerId)
+    {
+        var highlightColor = '#E9F3D2';
+        $('tr.layer_row').css('background', '');
+        $('tr#layer_row_' + layerId).css('background', highlightColor);
+    }
+
+
+    function existInvalidLayerNames()
+    {
+        var exist = false;
+        $('table#list_layers input.layer_name').each(
+            function () {
+                if ($(this).val().trim().length === 0) {
+                    exist = true;
+                    return false;
+                    // Break jQuery object each
+                }
+            }
+        );
+
+        return exist;
+    }
+
+
+    function onFormSubmit(event)
+    {
+        // Validate layer names
+        if (existInvalidLayerNames()) {
+            event.preventDefault();
+            event.stopPropagation();
+            alert("<?php echo __('Empty layer names are not supported'); ?>");
+            return false;
+        }
+
+        // Save connection list
+        $('#map_connection_list').val(connectionMaps.toString());
+    }
+
+
+    function onLayerGroupIdChange(event)
+    {
+        // Clear agent inputs
+        $('input#hidden-agent_id_for_data').val(0);
+        $('input#text-agent_alias_for_data').val('');
+        toggleAddGroupBtn();
+    }
+
+
+    // Bind events
+    $('form#form_setup').submit(onFormSubmit);
+    $('input#button-add_agent').click(addAgentClick);
+    $('select#layer_group_id').change(onLayerGroupIdChange);
+    $('input#button-add_group').click(addGroupClick);
+
+    // Populate layer list
+    var layers = < ? php echo json_encode($layer_list);
+    ?>
+    ;
 layers.forEach(function (layer) {
     $("table#list_layers").append(
         getLayerRow(layer["id"], {
diff --git a/pandora_console/images/histograma.png b/pandora_console/images/histograma.png
new file mode 100644
index 0000000000..1cee771613
Binary files /dev/null and b/pandora_console/images/histograma.png differ
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index c34b838ba9..c43da3e146 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1189,14 +1189,25 @@ if (check_login()) {
 
             $data[8] = ' ';
             if ($module['history_data'] == 1) {
+                $tresholds = true;
+                if (empty((float) $module['min_warning']) === true
+                    && empty((float) $module['max_warning']) === true
+                    && empty($module['warning_inverse']) === true
+                    && empty((float) $module['min_critical']) === true
+                    && empty((float) $module['max_critical']) === true
+                    && empty($module['critical_inverse']) === true
+                ) {
+                    $tresholds = false;
+                }
+
                 $nombre_tipo_modulo = modules_get_moduletype_name($module['id_tipo_modulo']);
                 $handle = 'stat'.$nombre_tipo_modulo.'_'.$module['id_agente_modulo'];
                 $url = 'include/procesos.php?agente='.$module['id_agente_modulo'];
                 $win_handle = dechex(crc32($module['id_agente_modulo'].$module['nombre']));
 
-                // Try to display the SNMP module realtime graph
+                // Try to display the SNMP module realtime graph.
                 $rt_button = get_module_realtime_link_graph($module);
-                if (!empty($rt_button)) {
+                if (empty($rt_button) === false) {
                     $data[8] = $rt_button.'&nbsp;&nbsp;';
                 }
 
@@ -1207,6 +1218,19 @@ if (check_login()) {
                     $draw_events = 0;
                 }
 
+                if ($tresholds === true || $graph_type === 'boolean') {
+                    $link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&amp;".'period='.SECONDS_1DAY.'&amp;id='.$module['id_agente_modulo'].'&amp;refresh='.SECONDS_10MINUTES.'&amp;'."histogram=1', 'day_".$win_handle."', 800, 480)";
+                    $data[8] .= '<a href="javascript:'.$link.'">'.html_print_image(
+                        'images/histograma.png',
+                        true,
+                        [
+                            'border' => '0',
+                            'alt'    => '',
+                            'class'  => 'invert_filter',
+                        ]
+                    ).'</a> &nbsp;&nbsp;';
+                }
+
                 $link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&amp;".'period='.SECONDS_1DAY.'&amp;id='.$module['id_agente_modulo'].'&amp;refresh='.SECONDS_10MINUTES.'&amp;'."draw_events=$draw_events', 'day_".$win_handle."', 800, 480)";
                 if (!is_snapshot_data($module['datos'])) {
                     $data[8] .= '<a href="javascript:'.$link.'">'.html_print_image(
@@ -1349,13 +1373,34 @@ if (check_login()) {
             metaconsole_connect($server);
         }
 
-        $output .= grafico_modulo_sparse($params);
-        echo $output;
+        if ($params['histogram'] === true) {
+            $params['id_agent_module'] = $params['agent_module_id'];
+            $params['dinamic_proc'] = 1;
+
+            $output .= '<div class="stat_win_histogram">';
+            if ($params['compare'] === 'separated') {
+                $graph = \reporting_module_histogram_graph(
+                    ['datetime' => ($params['begin_date'] - $params['period'])],
+                    $params
+                );
+                $output .= $graph['chart'];
+            }
+
+            $graph = \reporting_module_histogram_graph(
+                ['datetime' => $params['begin_date']],
+                $params
+            );
+            $output .= $graph['chart'];
+            $output .= '</div>';
+        } else {
+            $output .= grafico_modulo_sparse($params);
+        }
 
         if (is_metaconsole() === true && empty($server_id) === false) {
             metaconsole_restore_db();
         }
 
+        echo $output;
         return;
     }
 
diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index 73e19c0d38..8dd8b97698 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -669,15 +669,20 @@ class Tree
         // HTML of the server type image
         $module['serverTypeHTML'] = servers_show_type($module['server_type']);
 
-        // Link to the Module graph
-        // ACL
+        // Link to the Module graph.
+        // ACL.
         $acl_graphs = false;
         $module['showGraphs'] = 0;
 
-        // Avoid the check on the metaconsole. Too slow to show/hide an icon depending on the permissions
-        if (!empty($group_id) && !is_metaconsole()) {
-            $acl_graphs = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR');
-        } else if (!empty($all_groups)) {
+        // Avoid the check on the metaconsole.
+        // Too slow to show/hide an icon depending on the permissions.
+        if (empty($group_id) === false && is_metaconsole() === false) {
+            $acl_graphs = check_acl_one_of_groups(
+                $config['id_user'],
+                $all_groups,
+                'RR'
+            );
+        } else if (empty($all_groups) === false) {
             $acl_graphs = true;
         }
 
@@ -686,8 +691,24 @@ class Tree
         }
 
         if ($module['showGraphs']) {
+            $tresholds = true;
+            if (empty((float) $module['min_warning']) === true
+                && empty((float) $module['max_warning']) === true
+                && empty($module['warning_inverse']) === true
+                && empty((float) $module['min_critical']) === true
+                && empty((float) $module['max_critical']) === true
+                && empty($module['critical_inverse']) === true
+            ) {
+                $tresholds = false;
+            }
+
             $graphType = return_graphtype($module['id_module_type']);
-            $url = ui_get_full_url('operation/agentes/stat_win.php', false, false, false);
+            $url = ui_get_full_url(
+                'operation/agentes/stat_win.php',
+                false,
+                false,
+                false
+            );
             $winHandle = dechex(crc32($module['id'].$module['name']));
 
             $graph_params = [
@@ -697,20 +718,20 @@ class Tree
                 'refresh' => SECONDS_10MINUTES,
             ];
 
-            if (is_metaconsole()) {
-                // Set the server id
+            if (is_metaconsole() === true) {
+                // Set the server id.
                 $graph_params['server'] = $module['serverID'];
             }
 
             $graph_params_str = http_build_query($graph_params);
-            $moduleGraphURL = "$url?$graph_params_str";
+            $moduleGraphURL = $url.'?'.$graph_params_str;
 
             $module['moduleGraph'] = [
                 'url'    => $moduleGraphURL,
                 'handle' => $winHandle,
             ];
 
-            // Info to be able to open the snapshot image new page
+            // Info to be able to open the snapshot image new page.
             $module['snapshot'] = ui_get_snapshot_link(
                 [
                     'id_module'   => $module['id'],
@@ -720,6 +741,16 @@ class Tree
                 ],
                 true
             );
+
+            if ($tresholds === true || $graphType === 'boolean') {
+                $graph_params['histogram'] = 1;
+                $graph_params_str_th = http_build_query($graph_params);
+                $moduleGraphURLTh = $url.'?'.$graph_params_str_th;
+                $module['histogramGraph'] = [
+                    'url'    => $moduleGraphURLTh,
+                    'handle' => $winHandle,
+                ];
+            }
         }
 
         $module_alerts = alerts_get_alerts_agent_module($module['id']);
diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php
index 2fe2372675..b67c5999b7 100644
--- a/pandora_console/include/functions_groups.php
+++ b/pandora_console/include/functions_groups.php
@@ -982,31 +982,31 @@ function groups_get_agents_counter($group, $agent_filter=[], $module_filter=[],
                 switch ($agent_status) {
                     case AGENT_STATUS_CRITICAL:
                         if ($critical > 0) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
                     case AGENT_STATUS_WARNING:
                         if (($total > 0) && ($critical == 0) && ($warning > 0)) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
                     case AGENT_STATUS_UNKNOWN:
                         if ($critical == 0 && $warning == 0 && $unknown > 0) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
                     case AGENT_STATUS_NOT_INIT:
                         if ($total == 0 || $total == $not_init) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
                     case AGENT_STATUS_NORMAL:
                         if ($critical == 0 && $warning == 0 && $unknown == 0 && $normal > 0) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
@@ -1017,23 +1017,23 @@ function groups_get_agents_counter($group, $agent_filter=[], $module_filter=[],
             } else {
                 if (array_search(AGENT_STATUS_CRITICAL, $agent_status) !== false) {
                     if ($critical > 0) {
-                        $count ++;
+                        $count++;
                     }
                 } else if (array_search(AGENT_STATUS_WARNING, $agent_status) !== false) {
                     if ($total > 0 && $critical = 0 && $warning > 0) {
-                        $count ++;
+                        $count++;
                     }
                 } else if (array_search(AGENT_STATUS_UNKNOWN, $agent_status) !== false) {
                     if ($critical == 0 && $warning == 0 && $unknown > 0) {
-                        $count ++;
+                        $count++;
                     }
                 } else if (array_search(AGENT_STATUS_NOT_INIT, $agent_status) !== false) {
                     if ($total == 0 || $total == $not_init) {
-                        $count ++;
+                        $count++;
                     }
                 } else if (array_search(AGENT_STATUS_NORMAL, $agent_status) !== false) {
                     if ($critical == 0 && $warning == 0 && $unknown == 0 && $normal > 0) {
-                        $count ++;
+                        $count++;
                     }
                 }
                 // Invalid status
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 63e39a652a..d4d26d8777 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -14165,7 +14165,7 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
     if (modules_is_disable_agent($content['id_agent_module'])
         || modules_is_not_init($content['id_agent_module'])
     ) {
-        if ($metaconsole_on) {
+        if ($metaconsole_on && $server_name != '') {
             // Restore db connection.
             metaconsole_restore_db();
         }
@@ -14189,6 +14189,9 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
     if ($modules_is_string === false) {
         if ($agentmodule_info['max_critical'] == 0) {
             $max_value_critical = null;
+            if ((bool) $content['dinamic_proc'] === true) {
+                $max_value_critical = 0.01;
+            }
         } else {
             $max_value_critical = $agentmodule_info['max_critical'];
         }
@@ -14396,28 +14399,37 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
 
     $width_graph  = 100;
     $height_graph = 80;
-    $return['chart'] = flot_slicesbar_graph(
-        $array_result,
-        $time_total,
-        $width_graph,
-        $height_graph,
-        $legend,
-        $colors,
-        $config['fontpath'],
-        $config['round_corner'],
-        $homeurl,
-        '',
-        '',
-        false,
-        0,
-        [],
-        true,
-        $ttl,
-        $content['sizeForTicks'],
-        true
-    );
+    if (empty($array_result) === false) {
+        $return['chart'] = flot_slicesbar_graph(
+            $array_result,
+            $time_total,
+            $width_graph,
+            $height_graph,
+            $legend,
+            $colors,
+            $config['fontpath'],
+            $config['round_corner'],
+            $homeurl,
+            '',
+            '',
+            false,
+            0,
+            [],
+            true,
+            $ttl,
+            $content['sizeForTicks'],
+            true,
+            $report['datetime']
+        );
+    } else {
+        $return['chart'] = graph_nodata_image(
+            $width_graph,
+            $height_graph,
+            'area'
+        );
+    }
 
-    if ($metaconsole_on) {
+    if ($metaconsole_on && $server_name != '') {
         // Restore db connection.
         metaconsole_restore_db();
     }
diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php
index ff0c7401fd..8fc8e6e319 100644
--- a/pandora_console/include/functions_tags.php
+++ b/pandora_console/include/functions_tags.php
@@ -1627,31 +1627,31 @@ function tags_get_agents_counter($id_tag, $groups_and_tags=[], $agent_filter=[],
                 switch ($agent_status) {
                     case AGENT_STATUS_CRITICAL:
                         if ($critical > 0) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
                     case AGENT_STATUS_WARNING:
                         if ($total > 0 && $critical = 0 && $warning > 0) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
                     case AGENT_STATUS_UNKNOWN:
                         if ($critical == 0 && $warning == 0 && $unknown > 0) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
                     case AGENT_STATUS_NOT_INIT:
                         if ($total == 0 || $total == $not_init) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
                     case AGENT_STATUS_NORMAL:
                         if ($critical == 0 && $warning == 0 && $unknown == 0 && $normal > 0) {
-                            $count ++;
+                            $count++;
                         }
                     break;
 
@@ -1662,23 +1662,23 @@ function tags_get_agents_counter($id_tag, $groups_and_tags=[], $agent_filter=[],
             } else {
                 if (array_search(AGENT_STATUS_CRITICAL, $agent_status) !== false) {
                     if ($critical > 0) {
-                        $count ++;
+                        $count++;
                     }
                 } else if (array_search(AGENT_STATUS_WARNING, $agent_status) !== false) {
                     if ($total > 0 && $critical = 0 && $warning > 0) {
-                        $count ++;
+                        $count++;
                     }
                 } else if (array_search(AGENT_STATUS_UNKNOWN, $agent_status) !== false) {
                     if ($critical == 0 && $warning == 0 && $unknown > 0) {
-                        $count ++;
+                        $count++;
                     }
                 } else if (array_search(AGENT_STATUS_NOT_INIT, $agent_status) !== false) {
                     if ($total == 0 || $total == $not_init) {
-                        $count ++;
+                        $count++;
                     }
                 } else if (array_search(AGENT_STATUS_NORMAL, $agent_status) !== false) {
                     if ($critical == 0 && $warning == 0 && $unknown == 0 && $normal > 0) {
-                        $count ++;
+                        $count++;
                     }
                 }
                 // Invalid status.
diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js
index 86cddc0814..7f22c6e9d0 100644
--- a/pandora_console/include/javascript/tree/TreeController.js
+++ b/pandora_console/include/javascript/tree/TreeController.js
@@ -990,6 +990,35 @@ var TreeController = {
                 typeof element.showGraphs != "undefined" &&
                 element.showGraphs != 0
               ) {
+                // Graph histogram pop-up
+                if (typeof element.histogramGraph != "undefined") {
+                  var graphImageHistogram = $(
+                    '<img src="' +
+                      (controller.baseURL.length > 0
+                        ? controller.baseURL
+                        : "") +
+                      'images/histograma.png" /> '
+                  );
+
+                  graphImageHistogram
+                    .addClass("module-graph")
+                    .click(function(e) {
+                      e.stopPropagation();
+                      try {
+                        winopeng_var(
+                          element.histogramGraph.url,
+                          element.histogramGraph.handle,
+                          800,
+                          480
+                        );
+                      } catch (error) {
+                        // console.log(error);
+                      }
+                    });
+
+                  $content.append(graphImageHistogram);
+                }
+
                 // Graph pop-up
                 if (typeof element.moduleGraph != "undefined") {
                   if (element.statusImageHTML.indexOf("data:image") != -1) {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/graph_module_histogram.php b/pandora_console/include/lib/Dashboard/Widgets/graph_module_histogram.php
index 32ca90c3cb..dba9035877 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/graph_module_histogram.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/graph_module_histogram.php
@@ -378,6 +378,8 @@ class GraphModuleHistogramWidget extends Widget
 
         $size = parent::getSize();
 
+        $output = '';
+
         // Desactive scroll bars only this item.
         $id_agent = $this->values['agentId'];
         $id_module = $this->values['moduleId'];
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 5ff90674f4..9a3126270c 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -8435,6 +8435,16 @@ div.stat-win-spinner img {
   font-size: 12px;
 }
 
+.stat_win_histogram {
+  width: 95%;
+  margin: 0 auto;
+  margin-top: 18%;
+}
+
+#stat-win-module-graph .stat_win_histogram div.nodata_container {
+  width: 100%;
+}
+
 /* For backups dt, can be useful for others */
 #backups_list > thead > tr > th:last-child,
 #backups_list > tbody > tr > td:last-child {
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 827ad16e32..782df21b95 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -194,60 +194,7 @@ ui_print_message_dialog(
         $time_compare_separated = get_parameter('time_compare_separated', 0);
         $time_compare_overlapped = get_parameter('time_compare_overlapped', 0);
         $unknown_graph = get_parameter_checkbox('unknown_graph', 1);
-
-        $fullscale_sent = get_parameter('fullscale_sent', 0);
-        if (!$fullscale_sent) {
-            if (isset($config['full_scale_option']) === false
-                || $config['full_scale_option'] == 0
-            ) {
-                $fullscale = 0;
-            } else if ($config['full_scale_option'] == 1) {
-                $fullscale = 1;
-            } else if ($config['full_scale_option'] == 2) {
-                if ($graph_type == 'boolean') {
-                    $fullscale = 1;
-                } else {
-                    $fullscale = 0;
-                }
-            }
-        } else {
-            $fullscale = get_parameter('fullscale', 0);
-        }
-
-        $type_mode_graph = get_parameter_checkbox(
-            'type_mode_graph',
-            ($fullscale === 1) ? 0 : $config['type_mode_graph']
-        );
-
-        $time_compare = false;
-
-        if ($time_compare_separated) {
-            $time_compare = 'separated';
-        } else if ($time_compare_overlapped) {
-            $time_compare = 'overlapped';
-        }
-
-        if ($zoom > 1) {
-            $height = ($height * ($zoom / 2.1));
-            $width = ($width * ($zoom / 1.4));
-        }
-
-        // Build date.
-        $date = strtotime($start_date.' '.$start_time);
-        $now = time();
-
-        if ($date > $now) {
-            $date = $now;
-        }
-
-        $urlImage = ui_get_full_url(false, false, false, false);
-
-        $unit = db_get_value(
-            'unit',
-            'tagente_modulo',
-            'id_agente_modulo',
-            $id
-        );
+        $histogram = (bool) get_parameter('histogram', 0);
 
         // FORM TABLE.
         $table = html_get_predefined_table('transparent', 2);
@@ -258,162 +205,257 @@ ui_print_message_dialog(
         $table->style[2] = 'text-align:left;font-weight: bold;';
         $table->style[3] = 'text-align:left;';
         $table->class = 'table_modal_alternate';
-
         $table->data = [];
-        $table->data[0][0] = __('Refresh time');
-        $table->data[0][1] = html_print_extended_select_for_time(
-            'refresh',
-            $refresh,
-            '',
-            '',
-            0,
-            7,
-            true
-        );
 
-        $table->data[0][2] = __('Show events');
-        $disabled = false;
-        if (isset($config['event_replication']) === true) {
-            if ($config['event_replication']
-                && !$config['show_events_in_local']
-            ) {
-                $disabled = true;
+        $time_compare = false;
+
+        if ($time_compare_separated) {
+            $time_compare = 'separated';
+        } else if ($time_compare_overlapped) {
+            $time_compare = 'overlapped';
+        }
+
+        if ($histogram === false) {
+            $fullscale_sent = get_parameter('fullscale_sent', 0);
+            if (!$fullscale_sent) {
+                if (isset($config['full_scale_option']) === false
+                    || $config['full_scale_option'] == 0
+                ) {
+                    $fullscale = 0;
+                } else if ($config['full_scale_option'] == 1) {
+                    $fullscale = 1;
+                } else if ($config['full_scale_option'] == 2) {
+                    if ($graph_type == 'boolean') {
+                        $fullscale = 1;
+                    } else {
+                        $fullscale = 0;
+                    }
+                }
+            } else {
+                $fullscale = get_parameter('fullscale', 0);
             }
-        }
 
-        $table->data[0][3] = html_print_checkbox_switch(
-            'draw_events',
-            1,
-            (bool) $draw_events,
-            true,
-            $disabled
-        );
-        if ($disabled) {
-            $table->data[1] .= ui_print_help_tip(
-                __("'Show events' is disabled because this %s node is set to event replication.", get_product_name()),
-                true
+            $type_mode_graph = get_parameter_checkbox(
+                'type_mode_graph',
+                ($fullscale === 1) ? 0 : $config['type_mode_graph']
             );
-        }
 
-        $table->data[1][0] = __('Begin date');
-        $table->data[1][1] = html_print_input_text(
-            'start_date',
-            $start_date,
-            '',
-            10,
-            20,
-            true
-        );
+            if ($zoom > 1) {
+                $height = ($height * ($zoom / 2.1));
+                $width = ($width * ($zoom / 1.4));
+            }
 
-        $table->data[1][2] = __('Show alerts');
-        $table->data[1][3] = html_print_checkbox_switch(
-            'draw_alerts',
-            1,
-            (bool) $draw_alerts,
-            true
-        );
+            // Build date.
+            $date = strtotime($start_date.' '.$start_time);
+            $now = time();
 
-        $table->data[2][0] = __('Begin time');
-        $table->data[2][1] = html_print_input_text(
-            'start_time',
-            $start_time,
-            '',
-            10,
-            10,
-            true
-        );
+            if ($date > $now) {
+                $date = $now;
+            }
 
-        $table->data[2][2] = __('Show unknown graph');
-        $table->data[2][3] = html_print_checkbox_switch(
-            'unknown_graph',
-            1,
-            (bool) $unknown_graph,
-            true
-        );
+            $urlImage = ui_get_full_url(false, false, false, false);
 
-        $table->data[3][0] = __('Time range');
-        $table->data[3][1] = html_print_extended_select_for_time(
-            'period',
-            $period,
-            '',
-            '',
-            0,
-            7,
-            true
-        );
+            $unit = db_get_value(
+                'unit',
+                'tagente_modulo',
+                'id_agente_modulo',
+                $id
+            );
 
-        $table->data[3][2] = '';
-        $table->data[3][3] = '';
-
-        if (!modules_is_boolean($id)) {
-            $table->data[4][0] = __('Zoom');
-            $options = [];
-            $options[$zoom] = 'x'.$zoom;
-            $options[1] = 'x1';
-            $options[2] = 'x2';
-            $options[3] = 'x3';
-            $options[4] = 'x4';
-            $options[5] = 'x5';
-            $table->data[4][1] = html_print_select(
-                $options,
-                'zoom',
-                $zoom,
+            $table->data[0][0] = __('Refresh time');
+            $table->data[0][1] = html_print_extended_select_for_time(
+                'refresh',
+                $refresh,
                 '',
                 '',
                 0,
+                7,
+                true
+            );
+
+            $table->data[0][2] = __('Show events');
+            $disabled = false;
+            if (isset($config['event_replication']) === true) {
+                if ($config['event_replication']
+                    && !$config['show_events_in_local']
+                ) {
+                    $disabled = true;
+                }
+            }
+
+            $table->data[0][3] = html_print_checkbox_switch(
+                'draw_events',
+                1,
+                (bool) $draw_events,
+                true,
+                $disabled
+            );
+            if ($disabled) {
+                $table->data[1] .= ui_print_help_tip(
+                    __("'Show events' is disabled because this %s node is set to event replication.", get_product_name()),
+                    true
+                );
+            }
+
+            $table->data[1][0] = __('Begin date');
+            $table->data[1][1] = html_print_input_text(
+                'start_date',
+                $start_date,
+                '',
+                10,
+                20,
+                true
+            );
+
+            $table->data[1][2] = __('Show alerts');
+            $table->data[1][3] = html_print_checkbox_switch(
+                'draw_alerts',
+                1,
+                (bool) $draw_alerts,
+                true
+            );
+
+            $table->data[2][0] = __('Begin time');
+            $table->data[2][1] = html_print_input_text(
+                'start_time',
+                $start_time,
+                '',
+                10,
+                10,
+                true
+            );
+
+            $table->data[2][2] = __('Show unknown graph');
+            $table->data[2][3] = html_print_checkbox_switch(
+                'unknown_graph',
+                1,
+                (bool) $unknown_graph,
+                true
+            );
+
+            $table->data[3][0] = __('Time range');
+            $table->data[3][1] = html_print_extended_select_for_time(
+                'period',
+                $period,
+                '',
+                '',
+                0,
+                7,
+                true
+            );
+
+            $table->data[3][2] = '';
+            $table->data[3][3] = '';
+
+            if (!modules_is_boolean($id)) {
+                $table->data[4][0] = __('Zoom');
+                $options = [];
+                $options[$zoom] = 'x'.$zoom;
+                $options[1] = 'x1';
+                $options[2] = 'x2';
+                $options[3] = 'x3';
+                $options[4] = 'x4';
+                $options[5] = 'x5';
+                $table->data[4][1] = html_print_select(
+                    $options,
+                    'zoom',
+                    $zoom,
+                    '',
+                    '',
+                    0,
+                    true,
+                    false,
+                    false
+                );
+
+                $table->data[4][2] = __('Show percentil');
+                $table->data[4][3] = html_print_checkbox_switch(
+                    'show_percentil',
+                    1,
+                    (bool) $show_percentil,
+                    true
+                );
+            }
+
+            $table->data[5][0] = __('Time compare (Overlapped)');
+            $table->data[5][1] = html_print_checkbox_switch(
+                'time_compare_overlapped',
+                1,
+                (bool) $time_compare_overlapped,
+                true
+            );
+
+            $table->data[5][2] = __('Time compare (Separated)');
+            $table->data[5][3] = html_print_checkbox_switch(
+                'time_compare_separated',
+                1,
+                (bool) $time_compare_separated,
+                true
+            );
+
+
+            $table->data[6][0] = __('Show AVG/MAX/MIN data series in graph');
+            $table->data[6][1] = html_print_checkbox_switch(
+                'type_mode_graph',
+                1,
+                (bool) $type_mode_graph,
                 true,
-                false,
                 false
             );
 
-            $table->data[4][2] = __('Show percentil');
-            $table->data[4][3] = html_print_checkbox_switch(
-                'show_percentil',
+            $table->data[6][2] = __('Show full scale graph (TIP)');
+            $table->data[6][2] .= ui_print_help_tip(
+                __('TIP mode charts do not support average - maximum - minimum series, you can only enable TIP or average, maximum or minimum series'),
+                true
+            );
+            $table->data[6][3] = html_print_checkbox_switch(
+                'fullscale',
                 1,
-                (bool) $show_percentil,
+                (bool) $fullscale,
+                true,
+                false
+            );
+        } else {
+            $table->data[0][0] = __('Begin date');
+            $table->data[0][1] = html_print_input_text(
+                'start_date',
+                $start_date,
+                '',
+                10,
+                20,
+                true
+            );
+
+            $table->data[0][2] = __('Begin time');
+            $table->data[0][3] = html_print_input_text(
+                'start_time',
+                $start_time,
+                '',
+                10,
+                10,
+                true
+            );
+
+            $table->data[1][0] = __('Time range');
+            $table->data[1][1] = html_print_extended_select_for_time(
+                'period',
+                $period,
+                '',
+                '',
+                0,
+                7,
+                true
+            );
+
+            $table->data[1][2] = __('Time compare (Separated)');
+            $table->data[1][3] = html_print_checkbox_switch(
+                'time_compare_separated',
+                1,
+                (bool) $time_compare_separated,
                 true
             );
         }
 
-        $table->data[5][0] = __('Time compare (Overlapped)');
-        $table->data[5][1] = html_print_checkbox_switch(
-            'time_compare_overlapped',
-            1,
-            (bool) $time_compare_overlapped,
-            true
-        );
-
-        $table->data[5][2] = __('Time compare (Separated)');
-        $table->data[5][3] = html_print_checkbox_switch(
-            'time_compare_separated',
-            1,
-            (bool) $time_compare_separated,
-            true
-        );
-
-
-        $table->data[6][0] = __('Show AVG/MAX/MIN data series in graph');
-        $table->data[6][1] = html_print_checkbox_switch(
-            'type_mode_graph',
-            1,
-            (bool) $type_mode_graph,
-            true,
-            false
-        );
-
-        $table->data[6][2] = __('Show full scale graph (TIP)');
-        $table->data[6][2] .= ui_print_help_tip(
-            __('TIP mode charts do not support average - maximum - minimum series, you can only enable TIP or average, maximum or minimum series'),
-            true
-        );
-        $table->data[6][3] = html_print_checkbox_switch(
-            'fullscale',
-            1,
-            (bool) $fullscale,
-            true,
-            false
-        );
-
         $form_table = html_print_table($table, true);
         $form_table .= '<div class="w100p right mrgn_top_15px right_align">';
         $form_table .= html_print_submit_button(
@@ -434,6 +476,8 @@ ui_print_message_dialog(
             $menu_form .= html_print_input_hidden('server', $server_id, true);
         }
 
+        $menu_form .= html_print_input_hidden('histogram', $histogram, true);
+
         if (isset($_GET['type']) === true) {
             $type = get_parameter_get('type');
             $menu_form .= html_print_input_hidden('type', $type, true);
@@ -460,7 +504,13 @@ ui_print_message_dialog(
         );
         $menu_form .= '</span>';
         $menu_form .= '</div>';
-        $menu_form .= '<div class="module_graph_menu_content module_graph_menu_content_closed invisible">';
+
+        $class = 'module_graph_menu_content';
+        if ($histogram === false) {
+            $class .= ' module_graph_menu_content_closed invisible';
+        }
+
+        $menu_form .= '<div class="'.$class.'">';
         $menu_form .= $form_table;
         $menu_form .= '</div>';
         $menu_form .= '</div>';
@@ -497,6 +547,8 @@ ui_print_message_dialog(
             'zoom'            => $zoom,
             'height'          => 300,
             'type_mode_graph' => $type_mode_graph,
+            'histogram'       => $histogram,
+            'begin_date'      => strtotime($start_date.' '.$start_time),
         ];
 
         // Graph.
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 16961214cf..5e5ab2b43f 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1725,6 +1725,17 @@ $table->data[4][0] .= __('Not condition').'&nbsp;'.ui_print_help_tip(__('If you
                     }
 
                     if ($row['history_data'] == 1 && $acl_graphs) {
+                        $tresholds = true;
+                        if (empty((float) $module['min_warning']) === true
+                            && empty((float) $module['max_warning']) === true
+                            && empty($module['warning_inverse']) === true
+                            && empty((float) $module['min_critical']) === true
+                            && empty((float) $module['max_critical']) === true
+                            && empty($module['critical_inverse']) === true
+                        ) {
+                            $tresholds = false;
+                        }
+
                         $graph_type = return_graphtype($row['module_type']);
 
                         $url = ui_get_full_url('operation/agentes/stat_win.php', false, false, false);
@@ -1738,6 +1749,10 @@ $table->data[4][0] .= __('Not condition').'&nbsp;'.ui_print_help_tip(__('If you
                             'refresh' => SECONDS_10MINUTES,
                         ];
 
+                        if ($tresholds === true || $graph_type === 'boolean') {
+                            $graph_params['histogram'] = 1;
+                        }
+
                         if (is_metaconsole() && isset($row['server_id'])) {
                             // Set the server id.
                             $graph_params['server'] = $row['server_id'];
@@ -1749,6 +1764,18 @@ $table->data[4][0] .= __('Not condition').'&nbsp;'.ui_print_help_tip(__('If you
 
                         $data[8] = get_module_realtime_link_graph($row);
 
+                        if ($tresholds === true || $graph_type === 'boolean') {
+                            $data[8] .= '<a href="javascript:'.$link.'">'.html_print_image(
+                                'images/histograma.png',
+                                true,
+                                [
+                                    'border' => '0',
+                                    'alt'    => '',
+                                    'class'  => 'invert_filter',
+                                ]
+                            ).'</a>';
+                        }
+
                         if (!is_snapshot_data($row['datos'])) {
                             $data[8] .= '<a href="javascript:'.$link.'">'.html_print_image('images/chart.png', true, ['border' => '0', 'alt' => '', 'class' => 'invert_filter']).'</a>';
                         }
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 3e7a143b74..8a33477d57 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -556,13 +556,13 @@ $table_ichanges = '<div class="autorefresh_select">
                         </div>
                         <div class="autorefresh_select_arrows" style="display:grid">
                             <a href="javascript:">'.html_print_image(
-    'images/darrowright_green.png',
-    true,
-    [
-        'id'    => 'right_autorefreshlist',
-        'alt'   => __('Push selected pages into autorefresh list'),
-        'title' => __('Push selected pages into autorefresh list'),
-    ]
+                                'images/darrowright_green.png',
+                                true,
+                                [
+                                    'id'    => 'right_autorefreshlist',
+                                    'alt'   => __('Push selected pages into autorefresh list'),
+                                    'title' => __('Push selected pages into autorefresh list'),
+                                ]
 ).'</a>
                             <a href="javascript:">'.html_print_image(
     'images/darrowleft_green.png',