- [DEV-197] added support of trends_uint

git-svn-id: svn://svn.zabbix.com/trunk@5845 97f52cf1-0a1b-0410-bd0e-c28be96e8082

4 files changed, 51 insertions, 9 deletions

diff --git a/frontends/php/history.php b/frontends/php/history.php
index ce58bf04..83ed592d 100644
--- a/frontends/php/history.php
+++ b/frontends/php/history.php
@@ -136,7 +136,7 @@ include_once "include/page_header.php";
 					' FROM items i,hosts h '.
 					' WHERE i.itemid IN ('.(is_array($_REQUEST["itemid"]) ? implode(',', $_REQUEST["itemid"]) : $_REQUEST["itemid"]).') '.
 						' AND h.hostid=i.hostid '.
-						' AND '.DBcondition('h.hostid',$available_host, true))))
+						' AND '.DBcondition('h.hostid',$available_hosts, true))))
 	{
 		access_deny();
 	}
diff --git a/frontends/php/include/classes/chart.inc.php b/frontends/php/include/classes/chart.inc.php
index 50f076c6..c80a1107 100644
--- a/frontends/php/include/classes/chart.inc.php
+++ b/frontends/php/include/classes/chart.inc.php
@@ -748,6 +748,16 @@ class Chart extends Graph{
 						' AND clock>='.$from_time.
 						' AND clock<='.$to_time.
 					' GROUP BY itemid,'.$calc_field
+					,
+
+					'SELECT itemid,'.$calc_field.' as i,'.
+						' sum(num) as count,avg(value_avg) as avg,min(value_min) as min,'.
+						' max(value_max) as max,max(clock) as clock'.
+					' FROM trends_uint '.
+					' WHERE itemid='.$this->items[$i]['itemid'].
+						' AND clock>='.$from_time.
+						' AND clock<='.$to_time.
+					' GROUP BY itemid,'.$calc_field
 					);
 
 				$this->items[$i]['delay'] = max($this->items[$i]['delay'],3600);
diff --git a/frontends/php/include/classes/pie.inc.php b/frontends/php/include/classes/pie.inc.php
index ad92298d..822431b9 100644
--- a/frontends/php/include/classes/pie.inc.php
+++ b/frontends/php/include/classes/pie.inc.php
@@ -132,6 +132,17 @@ function selectData(){
 					' AND t.clock>='.$from_time.
 					' AND t.clock<='.$to_time.
 				' GROUP BY t.itemid'
+				,
+
+				'SELECT t.itemid, '.
+					' avg(t.value_avg) AS avg,min(t.value_min) AS min,'.
+					' max(t.value_max) AS max,max(t.clock) AS clock, max(i.lastvalue) as lst'.
+				' FROM trends_uint t '.
+					' LEFT JOIN items i ON t.itemid = i.itemid'.
+				' WHERE t.itemid='.$this->items[$i]['itemid'].
+					' AND t.clock>='.$from_time.
+					' AND t.clock<='.$to_time.
+				' GROUP BY t.itemid'
 				);
 		}
 		
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 84bfa6c6..e20342b9 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -247,15 +247,26 @@
  *     Aly
  *
  */	
-	function get_min_itemclock_by_graphid($graphid){
+	function get_min_itemclock_by_graphid($graphid)
+	{
+		$min = 0;
 		$row = DBfetch(DBselect('SELECT MIN(t.clock) as clock '.
 						' FROM graphs_items gi, trends t '.
 						' WHERE gi.graphid='.$graphid.
 						  ' AND t.itemid = gi.itemid')); 
 						  
-		if(!empty($row) && $row) 
-			return  $row['clock'];
-	return 0;
+		if(!empty($row) && $row && $row['clock']) 
+			$min = $row['clock'];
+
+		$row = DBfetch(DBselect('SELECT MIN(t.clock) as clock '.
+						' FROM graphs_items gi, trends_uint t '.
+						' WHERE gi.graphid='.$graphid.
+						  ' AND t.itemid = gi.itemid')); 
+						  
+		if(!empty($row) && $row && $row['clock']) 
+			$min = $min == 0 ? $row['clock'] : min($min, $row['clock']);
+
+		return $min;
 	}
 
 /*
@@ -268,14 +279,24 @@
  *     Aly
  *
  */	
-	function get_min_itemclock_by_itemid($itemid){
+	function get_min_itemclock_by_itemid($itemid)
+	{
+		$min = 0;
 		$row = DBfetch(DBselect('SELECT MIN(t.clock) as clock '.
 						' FROM trends t '.
 						' WHERE t.itemid='.$itemid)); 
 						  
-		if(!empty($row) && $row) 
-			return  $row['clock'];
-	return 0;
+		if(!empty($row) && $row && $row['clock']) 
+			$min = $row['clock'];
+
+		$row = DBfetch(DBselect('SELECT MIN(t.clock) as clock '.
+						' FROM trends_uint t '.
+						' WHERE t.itemid='.$itemid)); 
+						  
+		if(!empty($row) && $row && $row['clock']) 
+			$min = $min == 0 ? $row['clock'] : min($min, $row['clock']);
+
+		return $min;
 	}
 	
 // Show History Graph