- added basic support for simple graphs in screens (Alexei)

 - added table screens_graphs (Alexei)


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

1 files changed, 123 insertions, 34 deletions

diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index 7038680e..e042418c 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -28,7 +28,14 @@
 			{
 				delete_screen_item($HTTP_GET_VARS["screenitemid"]);
 			}
-			$result=add_screen_item($HTTP_GET_VARS["screenid"],$HTTP_GET_VARS["x"],$HTTP_GET_VARS["y"],$HTTP_GET_VARS["graphid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]);
+			if($HTTP_GET_VARS["resource"]==0)
+			{
+				$result=add_screen_graph($HTTP_GET_VARS["screenid"],$HTTP_GET_VARS["x"],$HTTP_GET_VARS["y"],$HTTP_GET_VARS["itemid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]);
+			}
+			if($HTTP_GET_VARS["resource"]==1)
+			{
+				$result=add_screen_item($HTTP_GET_VARS["screenid"],$HTTP_GET_VARS["x"],$HTTP_GET_VARS["y"],$HTTP_GET_VARS["graphid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]);
+			}
 			show_messages($result,"Item added","Cannot add item");
 		}
 		if($HTTP_GET_VARS["register"]=="delete")
@@ -42,6 +49,7 @@
                         $result=update_screen_item($HTTP_GET_VARS["screenitemid"],$HTTP_GET_VARS["graphid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]);
                         show_messages($result,"Item updated","Cannot update item");
                 }
+		unset($HTTP_GET_VARS["register"]);
 
 	}
 ?>
@@ -50,7 +58,7 @@
 	$screenid=$HTTP_GET_VARS["screenid"];
 	$result=DBselect("select name,cols,rows from screens where screenid=$screenid");
 	$row=DBfetch($result);
-	show_table_header($row["name"]);
+	show_table_header("<a href=\"screenedit.php?screenid=$screenid\">".$row["name"]."</a>");
 	echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#FFFFFF\"";
         for($r=0;$r<$row["rows"];$r++)
 	{
@@ -61,64 +69,141 @@
 
 		echo "<a name=\"form\"></a>";
 		echo "<form method=\"get\" action=\"screenedit.php\">";
+
+		{
+                	$screenitemid=0;
+                	$screengraphid=0;
+                	$graphid=0;
+                	$sysmapid=0;
+                	$itemid=0;
+                	$width=500;
+                	$height=100;
+			$resource=@iif(isset($HTTP_GET_VARS["resource"]),$HTTP_GET_VARS["resource"],0);
+		}
+
 		$iresult=DBSelect("select * from screens_items where screenid=$screenid and x=$c and y=$r");
         	if(DBnum_rows($iresult)>0)
         	{
+			$resource=1;
         		$irow=DBfetch($iresult);
         		$screenitemid=$irow["screenitemid"];
 			$graphid=$irow["graphid"];
 			$width=$irow["width"];
 			$height=$irow["height"];
+			$found=1;
         	}
-		else
-		{
-                	$screenitemid=0;
-                	$graphid=0;
-                	$width=500;
-                	$height=100;
-		}
 
-		if(isset($HTTP_GET_VARS["register"])&&($HTTP_GET_VARS["register"]=="edit")&&($HTTP_GET_VARS["x"]==$c)&&($HTTP_GET_VARS["y"]==$r))
+		$iresult=DBSelect("select * from screens_graphs where screenid=$screenid and x=$c and y=$r");
+        	if(DBnum_rows($iresult)>0)
+        	{
+			$resource=0;
+        		$irow=DBfetch($iresult);
+        		$screengraphid=$irow["screengraphid"];
+			$itemid=$irow["itemid"];
+			$width=$irow["width"];
+			$height=$irow["height"];
+        	}
+
+		if(isset($HTTP_GET_VARS["x"])&&($HTTP_GET_VARS["x"]==$c)&&($HTTP_GET_VARS["y"]==$r))
 		{
         		show_table2_header_begin();
         		echo "Screen item configuration";
-        		show_table2_v_delimiter();
+
         		echo "<input name=\"screenid\" type=\"hidden\" value=$screenid>";
 			echo "<input name=\"x\" type=\"hidden\" value=$c>";
 			echo "<input name=\"y\" type=\"hidden\" value=$r>";
 			echo "<input name=\"screenitemid\" type=\"hidden\" value=$screenitemid>";
+			echo "<input name=\"resource\" type=\"hidden\" value=$resource>";
 
-			echo "Graph name";
+			show_table2_v_delimiter();
+			echo "Resource";
 			show_table2_h_delimiter();
+			echo "<select name=\"resource\" size=1 onChange=\"submit()\">";
+			echo "<OPTION VALUE='0' ".iif($resource==0,"selected","").">Simple graph";
+			echo "<OPTION VALUE='1' ".iif($resource==1,"selected","").">Graph";
+//			echo "<OPTION VALUE='2' ".iif($resource==2,"selected","").">Network map";
+			echo "</SELECT>";
 
-			if($graphid!=0) 
+			if($resource == 0)
+			{
+				show_table2_v_delimiter();
+				echo "Graph name";
+				show_table2_h_delimiter();
+				$result=DBselect("select h.host,i.description,i.itemid from hosts h,items i where h.hostid=i.hostid and h.status in (0,2) and i.status=0 order by h.host,i.description");
+				echo "<select name=\"itemid\" size=1>";
+				echo "<OPTION VALUE='0'>(none)";
+				for($i=0;$i<DBnum_rows($result);$i++)
+				{
+					$host_=DBget_field($result,$i,0);
+					$description_=DBget_field($result,$i,1);
+					$itemid_=DBget_field($result,$i,2);
+					echo "<OPTION VALUE='$itemid_ ".iif($itemid==$itemid_,"selected","")."'>$host_: $description_";
+				}
+				echo "</SELECT>";
+			}
+			else
 			{
-				$result=DBselect("select name from graphs where graphid=$graphid");
-				if($result)  $name=DBget_field($result,0,0);
-				else $name="(none)";
+				echo "<input class=\"biginput\" name=\"itemid\" type=\"hidden\" size=1 value=\"$itemid\">";
 			}
-			else $name="(none)";
-			
-			$result=DBselect("select graphid,name from graphs");
-			echo "<select name=\"graphid\" size=1>";
-			echo "<OPTION VALUE='$graphid'>$name";
 
-			for($i=0;$i<DBnum_rows($result);$i++)
+			if($resource == 1)
 			{
-				$name_=DBget_field($result,$i,1);
-				$graphid_=DBget_field($result,$i,0);
-				echo "<OPTION VALUE='$graphid_'>$name_";
+				show_table2_v_delimiter();
+				echo "Graph name";
+				show_table2_h_delimiter();
+				$result=DBselect("select graphid,name from graphs order by name");
+				echo "<select name=\"graphid\" size=1>";
+				echo "<OPTION VALUE='0'>(none)";
+				for($i=0;$i<DBnum_rows($result);$i++)
+				{
+					$name_=DBget_field($result,$i,1);
+					$graphid_=DBget_field($result,$i,0);
+					echo "<OPTION VALUE='$graphid_' ".iif($graphid==$graphid_,"selected","").">$name_";
+				}
+				echo "</SELECT>";
+			}
+			else
+			{
+				echo "<input class=\"biginput\" name=\"graphid\" type=\"hidden\" size=1 value=\"$graphid\">";
 			}
-			echo "</SELECT>";
 
-			show_table2_v_delimiter();
-			echo "Width";
-			show_table2_h_delimiter();
-			echo "<input class=\"biginput\" name=\"width\" size=5 value=\"$width\">";
-                        show_table2_v_delimiter();
-                        echo "Height";
-                        show_table2_h_delimiter();
-                        echo "<input class=\"biginput\" name=\"height\" size=5 value=\"$height\">";
+			if($resource == 2)
+			{
+				show_table2_v_delimiter();
+				echo "Map";
+				show_table2_h_delimiter();
+				$result=DBselect("select sysmapid,name from sysmaps order by name");
+				echo "<select name=\"sysmapid\" size=1>";
+				echo "<OPTION VALUE='0'>(none)";
+				for($i=0;$i<DBnum_rows($result);$i++)
+				{
+					$name_=DBget_field($result,$i,1);
+					$sysmapid_=DBget_field($result,$i,0);
+					echo "<OPTION VALUE='$sysmapid_' ".iif($sysmapid==$sysmapid_,"selected","").">$name_";
+				}
+				echo "</SELECT>";
+			}
+			else
+			{
+				echo "<input class=\"biginput\" name=\"sysmapid\" type=\"hidden\" size=1 value=\"$sysmapid\">";
+			}
+
+			if($resource!=2)
+			{
+				show_table2_v_delimiter();
+				echo "Width";
+				show_table2_h_delimiter();
+				echo "<input class=\"biginput\" name=\"width\" size=5 value=\"$width\">";
+				show_table2_v_delimiter();
+				echo "Height";
+				show_table2_h_delimiter();
+				echo "<input class=\"biginput\" name=\"height\" size=5 value=\"$height\">";
+			}
+			else
+			{
+				echo "<input class=\"biginput\" name=\"width\" type=\"hidden\" size=5 value=\"$width\">";
+				echo "<input class=\"biginput\" name=\"height\" type=\"hidden\" size=5 value=\"$height\">";
+			}
 
 			show_table2_v_delimiter2();
 			echo "<input type=\"submit\" name=\"register\" value=\"add\">";
@@ -134,6 +219,10 @@
 		{
 			echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r><img src='chart2.php?graphid=$graphid&width=$width&height=$height&period=3600' border=0></a>";
 		}
+		else if($itemid!=0)
+		{
+			echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r><img src='chart.php?itemid=$itemid&width=$width&height=$height&period=3600' border=0></a>";
+		}
 		else
 		{
 			echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r>Empty</a>";