From 182b594c1c596290a059dac0c649712ccd03697c Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Fri, 13 Dec 2013 11:50:20 +0000
Subject: [PATCH] 2013-12-13  Sergio Martin <sergio.martin@artica.es>

	* mobile/operation/events.php, mobile/operation/modules.php,
	mobile/operation/agents.php: fixed the scroll of list for old
	browser in android mobiles devices.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9223 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                    |   6 ++
 pandora_console/mobile/operation/agents.php  |  15 ++-
 pandora_console/mobile/operation/events.php  |  32 ++++--
 pandora_console/mobile/operation/modules.php | 100 ++++++++++---------
 4 files changed, 93 insertions(+), 60 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 6b1245c749..1c49efe8da 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-13  Sergio Martin <sergio.martin@artica.es>
+
+	* mobile/operation/events.php, mobile/operation/modules.php,
+	mobile/operation/agents.php: fixed the scroll of list for old
+	browser in android mobiles devices.
+
 2013-12-13  Sergio Martin <sergio.martin@artica.es>
 
 	* include/graphs/flot/pandora.flot.js: Fixed wrong
diff --git a/pandora_console/mobile/operation/agents.php b/pandora_console/mobile/operation/agents.php
index 12fb443a40..88f3aef88c 100644
--- a/pandora_console/mobile/operation/agents.php
+++ b/pandora_console/mobile/operation/agents.php
@@ -354,9 +354,9 @@ class Agents {
 		$ui->contentAddHtml("<script type=\"text/javascript\">
 				var load_more_rows = 1;
 				var page = 1;
-				$(document).ready(function() {
-					$(window).bind(\"scroll\", function () {
-						
+				
+				function custom_scroll() {
+					
 						if (load_more_rows) {
 							if ($(this).scrollTop() + $(this).height()
 								>= ($(document).height() - 100)) {
@@ -404,6 +404,15 @@ class Agents {
 									\"json\");
 							}
 						}
+				}
+				
+				$(document).ready(function() {
+					$(window).bind(\"scroll\", function () {
+						custom_scroll();
+					});
+					
+					$(window).on(\"touchmove\", function(event) {
+						custom_scroll();
 					});
 				});
 			</script>");
diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php
index d24bf8b036..8c0c8cc463 100644
--- a/pandora_console/mobile/operation/events.php
+++ b/pandora_console/mobile/operation/events.php
@@ -70,7 +70,7 @@ class Events {
 					
 					$events = array();
 					$end = 1;
-					foreach ($events_db as $event) {						
+					foreach ($events_db as $event) {
 						$end = 0;
 						
 						switch ($event['estado']) {
@@ -88,27 +88,27 @@ class Events {
 						if($event['criticity'] == EVENT_CRIT_WARNING) {
 							$img_st = str_replace("white.png", "dark.png", $img_st);
 						}
-
+						
 						$status_icon = html_print_image($img_st, true);
 						
 						$open_link = '';
 						$close_link = '';
 						
-						if (!$this->readOnly) {	
+						if (!$this->readOnly) {
 							$open_link = '<a href="javascript: openDetails(' . $event['id_evento'] . ')"><div style="height:100%;width:100%">';
-							$close_link = '</div></a>';										
+							$close_link = '</div></a>';
 						}
 						
 						$row = array();
 						$row[] = $open_link . '<b class="ui-table-cell-label">' . __('Event Name') . '</b>' . io_safe_output($event['evento']) . $close_link;
-												
+						
 						if ($event["id_agente"] == 0) {
 							$agent_name = __('System');
 						}
 						else {
 							$agent_name = '<span class="nobold">' . ui_print_agent_name ($event["id_agente"], true, 'agent_small', '', false, '', '', false, false) . '</span>';
 						}
-
+						
 						$row_1 = $open_link;
 						$row_1 .= '<span class="events_agent"><b class="ui-table-cell-label">' . __('Agent') . '</b>' . $agent_name . '</span>';
 						$row_1 .= '<span class="events_timestamp">' . $status_icon . '<br>' . ui_print_timestamp ($event['timestamp_rep'], true) . '</span>';
@@ -912,7 +912,7 @@ class Events {
 				
 				function ajax_load_rows() {
 					if (load_more_rows) {
-
+						
 						load_more_rows = 0;
 						
 						postvars = {};
@@ -933,7 +933,7 @@ class Events {
 							postvars,
 							function (data) {
 								add_rows(data);
-
+								
 								//For large screens load the new events
 								if (document.documentElement.scrollHeight == document.documentElement.clientHeight) {
 									ajax_load_rows();
@@ -944,14 +944,24 @@ class Events {
 				}
 				
 				$(document).ready(function() {
+					ajax_load_rows();
+					
 					$(window).bind(\"scroll\", function () {
-						if ($(this).scrollTop() + $(this).height()
+						custom_scroll();
+					});
+					
+					$(window).on(\"touchmove\", function(event) {
+						custom_scroll();
+					});
+				});
+				
+				function custom_scroll() {
+					if ($(this).scrollTop() + $(this).height()
 							>= ($(document).height() - 100)) {
 							
 							ajax_load_rows();
 						}
-					});
-				});
+				}
 			</script>");
 	}
 	
diff --git a/pandora_console/mobile/operation/modules.php b/pandora_console/mobile/operation/modules.php
index ea1361c1fc..67eed87b5c 100644
--- a/pandora_console/mobile/operation/modules.php
+++ b/pandora_console/mobile/operation/modules.php
@@ -593,54 +593,62 @@ class Modules {
 		$ui->contentAddHtml("<script type=\"text/javascript\">
 				var load_more_rows = 1;
 				var page = 1;
+				
+				function custom_scroll() {
+					if (load_more_rows) {
+						if ($(this).scrollTop() + $(this).height()
+							>= ($(document).height() - 100)) {
+							
+							load_more_rows = 0;
+							
+							postvars = {};
+							postvars[\"action\"] = \"ajax\";
+							postvars[\"parameter1\"] = \"modules\";
+							postvars[\"parameter2\"] = \"get_modules\";
+							postvars[\"group\"] = $(\"select[name='group']\").val();
+							postvars[\"status\"] = $(\"select[name='status']\").val();
+							postvars[\"type\"] = $(\"select[name='module_group']\").val();
+							postvars[\"tag\"] = $(\"select[name='tag']\").val();
+							postvars[\"free_search\"] = $(\"input[name='free_search']\").val();
+							postvars[\"page\"] = page;
+							page++;
+							
+							$.post(\"index.php\",
+								postvars,
+								function (data) {
+									if (data.end) {
+										$(\"#loading_rows\").hide();
+									}
+									else {
+										$.each(data.modules, function(key, module) {
+											$(\"table#list_Modules tbody\").append(\"<tr>\" +
+													\"<th class='head_vertical'></th>\" +
+													\"<td class='cell_1'><b class='ui-table-cell-label'>" . __('Module name') . "</b>\" + module[0] + \"</td>\" +
+													\"<td class='cell_0'><b class='ui-table-cell-label'>" . __('Agent name') . "</b>\" + module[2] + \"</td>\" +
+													\"<td class='cell_2'><b class='ui-table-cell-label'>" . __('Status') . "</b>\" + module[5] + \"</td>\" +
+													\"<td class='cell_3'><b class='ui-table-cell-label'>" . __('Interval') . "</b>\" + module[4] + \"</td>\" +
+													\"<td class='cell_4'><b class='ui-table-cell-label'>" . __('Timestamp') . "</b>\" + module[6] + \"</td>\" +
+													\"<td class='cell_5'><b class='ui-table-cell-label'>" . __('Data') . "</b>\" + module[7] + \"</td>\" +
+												\"</tr>\");
+											});
+										
+										load_more_rows = 1;
+									}
+									
+									
+								},
+								\"json\");
+						}
+					}
+				}
+				
 				$(document).ready(function() {
 					$(window).bind(\"scroll\", function () {
-						
-						if (load_more_rows) {
-							if ($(this).scrollTop() + $(this).height()
-								>= ($(document).height() - 100)) {
-								
-								load_more_rows = 0;
-								
-								postvars = {};
-								postvars[\"action\"] = \"ajax\";
-								postvars[\"parameter1\"] = \"modules\";
-								postvars[\"parameter2\"] = \"get_modules\";
-								postvars[\"group\"] = $(\"select[name='group']\").val();
-								postvars[\"status\"] = $(\"select[name='status']\").val();
-								postvars[\"type\"] = $(\"select[name='module_group']\").val();
-								postvars[\"tag\"] = $(\"select[name='tag']\").val();
-								postvars[\"free_search\"] = $(\"input[name='free_search']\").val();
-								postvars[\"page\"] = page;
-								page++;
-								
-								$.post(\"index.php\",
-									postvars,
-									function (data) {
-										if (data.end) {
-											$(\"#loading_rows\").hide();
-										}
-										else {
-											$.each(data.modules, function(key, module) {
-												$(\"table#list_Modules tbody\").append(\"<tr>\" +
-														\"<th class='head_vertical'></th>\" +
-														\"<td class='cell_1'><b class='ui-table-cell-label'>" . __('Module name') . "</b>\" + module[0] + \"</td>\" +
-														\"<td class='cell_0'><b class='ui-table-cell-label'>" . __('Agent name') . "</b>\" + module[2] + \"</td>\" +
-														\"<td class='cell_2'><b class='ui-table-cell-label'>" . __('Status') . "</b>\" + module[5] + \"</td>\" +
-														\"<td class='cell_3'><b class='ui-table-cell-label'>" . __('Interval') . "</b>\" + module[4] + \"</td>\" +
-														\"<td class='cell_4'><b class='ui-table-cell-label'>" . __('Timestamp') . "</b>\" + module[6] + \"</td>\" +
-														\"<td class='cell_5'><b class='ui-table-cell-label'>" . __('Data') . "</b>\" + module[7] + \"</td>\" +
-													\"</tr>\");
-												});
-											
-											load_more_rows = 1;
-										}
-										
-										
-									},
-									\"json\");
-							}
-						}
+						custom_scroll();
+					});
+					
+					$(window).on(\"touchmove\", function(event) {
+						custom_scroll();
 					});
 				});
 			</script>");