--- a/fhiiqm/keytyp_ma_search.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/keytyp_ma_search.php Wed Jul 31 15:10:48 2013 +0200
@@ -143,11 +143,12 @@
else
{
$sql = "SELECT km.keytyp_ID, key_level, pers_anz AS anzahl,pers_date, pers_bem,
- CONCAT(TRIM(nachname), ', ',vorname,' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') AS nvname,
+ CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') AS nvname,
(CASE WHEN pers_action = 'get' THEN 'erhalten' WHEN pers_action = 'out' THEN 'zurück' ELSE 'verloren' END) AS status
FROM fhiiqm.Mitarbeiter m
INNER JOIN Keytyp_MA km ON m.persknr=km.persknr
- INNER JOIN Keytyp k ON km.keytyp_ID = k.keytyp_ID
+ INNER JOIN Keytyp k ON km.keytyp_ID = k.keytyp_ID
+ LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
WHERE m.aktiv<2 AND km.keytyp_ID = '".$ky["kt"].
"' ORDER BY nvname, pers_date";
if ($result = $dbc -> queryObjectArray($sql))
@@ -159,7 +160,7 @@
$bg2 = "#DEDFE1";
$bg = "#FFFFFF";
echo "<table width='40%' border='0' cellspacing='2' cellpadding='2'>\n";
- echo "<tr bgcolor='#68ACBF'><th>Mitarbeiter</th><th>Anzahl</th><th>Status</th><th>Datum</th><th>Bemerkung</th></tr>\n";
+ echo "<tr bgcolor='#68ACBF'><th>Mitarbeiter, Abteilung</th><th>Anzahl</th><th>Status</th><th>Datum</th><th>Bemerkung</th></tr>\n";
foreach ($result as $row)
{
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;