--- a/fhiiqm/form/vertrag_report_form.inc.php	Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/form/vertrag_report_form.inc.php	Tue Sep 27 14:59:40 2011 +0200
@@ -22,17 +22,17 @@
 <table width="50%" border="0" cellspacing="3" cellpadding="3">
     <tr>
         <td>Produktgruppe</td>
-        <td><select name="vr[prodg]">
+        <td><select name="vr[prodg]" <?php  if ($rvnr == 1) echo "onchange=\"this.form.submit();\""; ?>>
             <?php 
-                $select = null;
                 if ($vr["prodg"] == -1) $select = " selected "; else $select = "";
                 echo "<option $select value=\"-1\"></option>\n";
                 $sql = "SELECT prod_group_ID, prod_group_name FROM Produkt_Gruppe ORDER BY 2";
                 if ($result = $dbc->queryObjectArray($sql))
                 {
+                    $select = "";
                     foreach ($result as $row)
                     {
-                        if (is_array($vr["prodg"])) $select = in_array( $row->prod_group_ID, $vr["prodg"] ) ? ' selected' : null;
+                        if (isset($vr["prodg"])) $select = ($row->prod_group_ID == $vr["prodg"] ) ? ' selected' : null;
     					   echo "<option $select value=\"$row->prod_group_ID\">$row->prod_group_name</option>\n";
                     }
                 }
@@ -40,19 +40,22 @@
             </select>
         </td>
     </tr>
+    <?php if ($rvnr == 1)
+    { ?>
     <tr>
         <td>Produkt</td>
         <td><select name="vr[prod]">
             <?php 
-                $select = null;
                 if ($vr["prod"] == -1) $select = " selected "; else $select = "";
                 echo "<option $select value=\"-1\"></option>\n";
-                $sql = "SELECT produkt_ID, prod_name FROM Produkt ORDER BY 2";
+                if (isset($vr["prodg"]) && $vr["prodg"] > -1) $where = " WHERE prod_group_ID = $vr[prodg] "; else $where = "";
+                $sql = "SELECT produkt_ID, prod_name FROM Produkt $where ORDER BY 2";
                 if ($result = $dbc->queryObjectArray($sql))
                 {
-                    foreach ($result as $row)
+                    $select = null;
+                   foreach ($result as $row)
                     {
-                        if (is_array($vr["prod"])) $select = in_array( $row->produkt_ID, $vr["prod"] ) ? ' selected' : null;
+                        if (isset($vr["prod"])) $select = ( $row->produkt_ID == $vr["prod"] ) ? ' selected' : null;
     					   echo "<option $select value=\"$row->produkt_ID\">$row->prod_name</option>\n";
                     }
                 }
@@ -60,19 +63,21 @@
             </select>
         </td>
     </tr>
+    <?php 
+    } ?>
     <tr>
         <td>Vertrag-Typ</td>
         <td><select name="vr[vtyp]">
             <?php 
-                $select = null;
                 if ($vr['vtyp'] == -1) $select = " selected "; else $select = "";
                 echo "<option $select value=\"-1\"></option>\n";
                 $sql = "SELECT vtyp_ID, vtyp_bezeichnung FROM Vertrag_Typ ORDER BY 2";
                 if ($result = $dbc->queryObjectArray($sql))
                 {
+                    $select = null;
                     foreach ($result as $row)
                     {
-                        if (is_array($vr["vtyp"])) $select = in_array( $row->vtyp_ID, $vr["vtyp"] ) ? ' selected' : null;
+                        if (isset($vr["vtyp"])) $select = ( $row->vtyp_ID == $vr["vtyp"] ) ? ' selected' : null;
 	                       echo "<option $select value=\"$row->vtyp_ID\">$row->vtyp_bezeichnung</option>\n";
                     }
             }
@@ -80,6 +85,16 @@
             </select>
         </td>
     </tr>
+    <?php if ($rvnr == 2)
+    { ?>
+    <tr><td>gew&uuml;nschtes<br />K&uuml;ndigungsdatum</td>
+        <td valign="top"><input type="text" name="vr[kd]" id="kd" value="<?php echo $vr['kd']; ?>"/>
+        </td>
+    </tr>
+    <?php 
+    } ?>
+    <?php if ($rvnr == 1)
+    { ?>
     <tr>
         <td>Jahr</td>
         <td>
@@ -91,8 +106,8 @@
         		 	echo "<option value=\"-1\"></option>\n";  
         		$ja = $vr['jahr'];
         		for ($i=2000; $i<2031; $i++)
-        		 {	if ($i==intval($j1)) 
-        				echo "<option selected>$ja1</option>\n";
+        		 {	if ($i==intval($ja)) 
+        				echo "<option selected>$ja</option>\n";
         			else		
         				echo "<option>$i</option>\n";
         		  }
@@ -100,6 +115,8 @@
     		 </select>
         </td>
     </tr>    
+    <?php 
+    } ?>
     <tr> 
           <td>Verkn&uuml;pfung</td>
           <td>UND&nbsp;&nbsp;&nbsp;
@@ -110,14 +127,16 @@
     <tr>
         <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
     <?php
-        $sort = array("-1"=>"","2"=>"Vertragsbezeichnung","10"=>"Kosten","11"=>"Kostenjahr");
-        for ($i=1; $i<4; $i++)
+        if ($rvnr == 1)
+            $sort = array("-1"=>"","2"=>"Vertragsbezeichnung","10"=>"Kosten","11"=>"Jahr");
+        elseif ($rvnr ==2)
+            $sort = array("-1"=>"","2"=>"Vertragsbezeichnung","12"=>"Partner","13"=>"K&uuml;ndigungstermin");
+        for ($i=1; $i<count($sort); $i++)
         { 
           echo "$i.&nbsp;&nbsp;<select name='vr[sort$i]'>\n";
           foreach ($sort as $key=>$val)
           {
-            $rsort = $sort . $i;
-            if ($rag[$rsort] == $i) $select= " selected"; else $select = "";
+            if ($vr["sort$i"] == $key) $select= " selected"; else $select = "";
             echo "<option$select value='$key'>$val</option>\n";
           }
           echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";