--- a/fhiiqm/inc/ma_list_ac.inc.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/inc/ma_list_ac.inc.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,42 +1,50 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 09/2011
- *
- * Autocomplete Mitarbeitersuche
- */
-
-    header('Content-type: text/html; charset="iso-8859-1',true); //wg. jquery ui autocomplete
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    $q = strtolower(utf8_decode($_GET["term"])); // wird in jquery in 'term' uebergeben, term UTF-8 codiert
-
-    $abt = $_GET["s"]; // Sortierung zuerst nach Abteilung (laser)
-    
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	$dbc = new dbconnection();
-    // label = angezeigter ListenWert, val = Wert im Eingabefeld nach Klick
-/*    $sql = "SELECT  CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as label, 
-            CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as val,persknr as id 
-            FROM fhiiqm.Mitarbeiter
-            WHERE nachname LIKE '%".$q."%' COLLATE latin1_general_ci 
-            ORDER BY 1";
-*/
-    if (isset($abt) && $abt == "a") $ord = "abt_ID, "; else $ord = "";
-    $sql = "SELECT CONCAT (nachname, ', ',IFNULL(vorname,''), ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') as label, 
-            CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''), ' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') as val,persknr as id 
-            FROM fhiiqm.Mitarbeiter m LEFT OUTER JOIN fhiiqm.Abteilung a ON m.abt_tel=a.abt_ID
-            WHERE aktiv < 2 AND nachname LIKE '%".$q."%' COLLATE latin1_general_ci 
-            ORDER BY ". $ord ."1";
-    $result = $dbc ->queryObjectArray($sql);
-    if ($result)
-    {
-        foreach ($result as $row)
-        {
- 			$clist[] = "{\"label\": \"" . $row->label . "\",\"value\": \"" . $row->val . "\",\"id\": " . $row->id . "}";
-		}
-        echo "[" . implode(", ", $clist) . "]"; // Format, das jquery source erwartet
-    }
-    $dbc -> close();
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 09/2011
+ * 
+ * 17.12.2013 aktiv in Mitarbeiter
+ *  -1 -> Gast
+ *   0 -> inaktiv
+ *   1 -> aktiv
+ *   2 -> Objekt
+ *
+ * Autocomplete Mitarbeitersuche
+ */
+
+    header('Content-type: text/html; charset="iso-8859-1',true); //wg. jquery ui autocomplete
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    $q = strtolower(utf8_decode($_GET["term"])); // wird in jquery in 'term' uebergeben, term UTF-8 codiert
+
+    $abt = $_GET["s"]; // Sortierung zuerst nach Abteilung (laser)
+    $gast = $_GET["g"]; // Gaeste zulassen
+    
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	$dbc = new dbconnection();
+    // label = angezeigter ListenWert, val = Wert im Eingabefeld nach Klick
+/*    $sql = "SELECT  CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as label, 
+            CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as val,persknr as id 
+            FROM fhiiqm.Mitarbeiter
+            WHERE nachname LIKE '%".$q."%' COLLATE latin1_general_ci 
+            ORDER BY 1";
+*/
+    if (isset($abt) && $abt == "a") $ord = "abt_ID, "; else $ord = "";
+    if (isset($gast) && $gast) $aktiv = ""; else $aktiv = "aktiv>=0 AND ";    
+    $sql = "SELECT CONCAT (nachname, IF (vorname>'',CONCAT(', ',vorname), ''), ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE (CASE aktiv WHEN -1 THEN 'Gast' ELSE 'inaktiv' END) END, ')') as label, 
+            CONCAT (nachname, IF (vorname>'',CONCAT(', ',vorname), ''), ', ' , IFNULL(abt_name,''), ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE (CASE aktiv WHEN -1 THEN 'Gast' ELSE 'inaktiv' END) END, ')') as val,persknr as id 
+            FROM fhiiqm.Mitarbeiter m LEFT OUTER JOIN fhiiqm.Abteilung a ON m.abt_tel=a.abt_ID
+            WHERE $aktiv aktiv<2 AND nachname LIKE '%".$q."%' COLLATE latin1_general_ci 
+            ORDER BY ". $ord ."1";
+    $result = $dbc ->queryObjectArray($sql);
+    if ($result)
+    {
+        foreach ($result as $row)
+        {
+ 			$clist[] = "{\"label\": \"" . $row->label . "\",\"value\": \"" . $row->val . "\",\"id\": " . $row->id . "}";
+		}
+        echo "[" . implode(", ", $clist) . "]"; // Format, das jquery source erwartet
+    }
+    $dbc -> close();
 ?>
\ No newline at end of file