--- a/fhiiqm/laser_flist.php	Fri Mar 02 13:54:32 2012 +0100
+++ b/fhiiqm/laser_flist.php	Thu Apr 05 15:35:43 2012 +0200
@@ -49,7 +49,7 @@
 
     // Felder, nach denen gefiltert werden kann
     $fields = array(2=>"ID",3=>"Bezeichnung",4=>"Art",5=>"Klasse",6=>"Typ",7=>"Schutzstufe",8=>"Hersteller",9=>"'in Betrieb'",
-                    10=>"Haus",11=>"Raum-Nr.",12=>"Verantwortlicher",13=>"Referenz-ID");
+                    10=>"Haus",11=>"Raum-Nr.",12=>"Verantwortlicher",13=>"Referenz-ID",14=>"Abteilung");
 
     $zeil = $_GET["z"];
     if (!$zeil) $zeil = $_POST["z"];
@@ -118,13 +118,21 @@
         {
             // Formular anzeigen fuer Filterbegriff
             $text = $fields[$fnum];
+            $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
             echo "<form action=" . $_SERVER['PHP_SELF'] . " method='post' enctype='application/x-www-form-urlencoded' id='ffilter' name='ffilter' target='_self'>\n";
             echo "<input type='hidden' name='s' value='$sort'>";
             echo "<input type='hidden' name='d' value='$dir'>";
             echo "<input type='hidden' name='f' value='$fnum'>";
-            echo "<table width=\"25%\" border=\"0\">\n";
+            echo "<table width=\"40%\" border=\"0\">\n";
             echo "<tr><td>filtern nach $text: </td>";
             echo "<td><input id='filter' name='filter' type=\"text\" size=\"10\" maxlength=\"30\" value=\"$filter\"/></td>";
+            echo "<td>Zeilen/Seite?   <select name='z'>\n";
+            foreach ($azeil as $key=>$val)
+            {
+                if ($key == $zeil) $select = "selected"; else $select = "";
+                echo "<option $select value='$key'>$val</option>\n";
+            }
+            echo "</select></td>\n";
             
             echo "<td><input class=\"button\" type=\"submit\" value=\"finden\" name=\"subf\" title=\"subf\" /></td></tr></table>\n";
             echo "</form>\n";
@@ -148,6 +156,7 @@
         tab_column(9,"Betrieb",$sort,$dir,9,$fnum,$filter,$start,$zeil);
         tab_column(10,"Haus",$sort,$dir,10,$fnum,$filter,$start,$zeil);
         tab_column(11,"Raum",$sort,$dir,11,$fnum,$filter,$start,$zeil);
+        tab_column(14,"Abt.",$sort,$dir,14,$fnum,$filter,$start,$zeil);
         tab_column(12,"Verantw.",$sort,$dir,12,$fnum,$filter,$start,$zeil);
 
         echo "<th>&nbsp;</th>";
@@ -159,7 +168,7 @@
         {
 			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
             echo "<tr bgcolor='" . $bg . "'><td>$row->las_ID</td>";
-            echo "<td>$row->las_ref_ID</td>";
+            if ($row->las_ref_ID) echo "<td>$row->las_ref_ID: $row->ref_bez </td>"; else echo "<td>&nbsp;</td>";
             echo "<td>$row->las_bez</td>";
             echo "<td>" .str_replace(".",",",str_replace(".00","",$row->las_welle_von))." - ".str_replace(".",",",str_replace(".00","",$row->las_welle_bis))."</td>";
             echo "<td>$row->las_art_bez</td>";
@@ -170,6 +179,7 @@
             echo "<td>"; echo ($row->aktiv) ? "ja" : "nein"; echo "</td>";
             echo "<td>$row->geb_ID</td>";
             echo "<td>$row->raum_nr</td>";
+            echo "<td>$row->abt_name</td>";
             echo "<td>$row->vma</td>";
             echo "<td><a href='/fhiiqm/laser_ed.php?i=$row->las_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
             if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))