IQM: comparison fhiiqm/ma_tel

equal deleted inserted replaced

-:c2d325791e24
+:f1a8785434e4
 error_reporting(E_ALL ^ E_NOTICE);
 if (isset($_GET["i"]) && $_GET["i"]) $edit = $_GET["i"]; // wegen tab_column, "i" als "e" missbraucht -> editieren ermoeglichen
 if (!$edit) $edit = $_GET["e"];
 if (!$edit) $edit = $_POST["e"];
-if (isset($edit))
+if (isset($edit) && $edit)
 {
 session_start();
 if (! isset($_SESSION["userid"]))
 {
 include_once ("inc/func_lib.inc.php");
 login($_SERVER["PHP_SELF"]);
 exit;
 }
-if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("fmr",$_SESSION["recht"]) && !in_array("fme",$_SESSION["recht"])
+if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("mtr",$_SESSION["recht"]) && !in_array("mte",$_SESSION["recht"])))
-&& !in_array("ddr",$_SESSION["recht"]) && !in_array("dde",$_SESSION["recht"])))
 {
 header("Location: start.php");
 exit;
 }
 }
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 	<link href="http://achilleus.rz-berlin.mpg.de/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
 	<link href="http://achilleus.rz-berlin.mpg.de/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
-	<title>MA-Telefonliste</title>
+	<title>MA/O-Telefonliste</title>
 </head>
 <body onload="document.ffilter.filter.focus();">
 <?php
-if (isset($edit))
+if (isset($edit) && $edit)
 {
 echo "&nbsp;";
 echo "<div class=\"float-br smaller\" valign='top'>";
 echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
 echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
 echo "<div class=\"float-r\"><img src=\"img/group.png\" border=\"0\" alt=\"Telefonliste\" title=\"Telefonliste\"/></div>\n";
 }
 // Felder, nach denen gefiltert werden kann
 $fields = array(2=>"Name",3=>"Vorname",5=>"Abteilung",6=>"Telefon/Fax",9=>"Haus", 10=>"Raum");
 //    $fieldf = array(2=>"trim(nachname)",3=>"vorname",5=>"abt_name",6=>"mt.telefon_nr",9=>"geb_ID", 10=>"raum_nr");
 $fieldf = array(2=>"name",3=>"vorname",5=>"abt_name",6=>"telefon_nr",9=>"geb_ID", 10=>"raum_nr");
 	$dbc = new dbconnection();
 /*
 $sql = "SELECT m.persknr, TRIM(nachname) as name, vorname, titel, abt_name, mt.telefon_nr, telefon_typ, public, geb_ID, raum_nr, email
 FROM Mitarbeiter m LEFT OUTER JOIN
 Abteilung a ON m.abt_tel=a.abt_ID LEFT OUTER JOIN
-MA_Telefon mt ON m.persknr=mt.persknr INNER JOIN
+MA_Telefon mt ON m.persknr=mt.persknr LEFT OUTER JOIN
 Telefon t ON mt.telefon_nr=t.telefon_nr LEFT OUTER JOIN
 Raum r ON t.raum_ID = r.raum_ID
-WHERE aktiv>0 AND (m.abt_tel <> 7)
+WHERE aktiv>0 AND (m.abt_tel <> 7 OR m.abt_tel IS NULL)
 UNION
 SELECT m.persknr, TRIM(nachname) as name, vorname, titel, IFNULL(rag_bez,'INF') as abt_name, mt.telefon_nr, telefon_typ, public, geb_ID, raum_nr, email
 FROM Mitarbeiter m LEFT OUTER JOIN
 MA_Telefon mt ON m.persknr=mt.persknr INNER JOIN
 Telefon t ON mt.telefon_nr=t.telefon_nr LEFT OUTER JOIN
 Raum r ON t.raum_ID = r.raum_ID LEFT OUTER JOIN
 MA_RaumArbGruppe ma ON m.persknr=ma.persknr LEFT OUTER JOIN
 RaumArb_Gruppe rag ON ma.rag_ID=rag.rag_ID
 WHERE aktiv>0 AND m.abt_tel=7";
 */
-$sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email FROM v_tel_list";
+//    $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email FROM v_tel_list";
-if ($filter) $wher = " WHERE " . $fieldf[$fnum] . " LIKE " . "'%$filter%'"; else $wher = "";
+//  Raum zu Mitarbeiter und nicht zu Telefon
-if ($sort == 2) $sort = "2, 3, 5";
+$sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email FROM v_tel_list_ma_raum";
-if ($sort == 5) $sort = "5, 2, 3";
+if ($filter)
-if ($sort) $ord = " ORDER BY $sort, 6"; // immer nach Telefon-Nr als 2.
+{
+if ($fnum > 3)
+$wher = " WHERE " . $fieldf[$fnum] . " LIKE " . "'%$filter%'";
+else
+$wher = " WHERE " . $fieldf[$fnum] . " LIKE " . "'$filter%'";
+}
+else $wher = "";
+if ($sort == 2) $so = "name COLLATE latin1_general_ci $dir, 3, 5";
+//    if ($sort == 2) $sort = "2, 3, 5";
+elseif ($sort == 5) $so = "5 $dir, name COLLATE latin1_general_ci, 3";
+//    if ($sort == 5) $sort = "5, 2, 3";
+else $so = "$sort $dir ";
+if ($so) $ord = " ORDER BY $so, 6 "; // immer nach Telefon-Nr als 2.
 $sql .= $wher . $ord;
 //    echo "sql = $sql<br /><br />";
 $result = $dbc ->queryObjectArray($sql);
 if ($result)
 		$bg2 = "#DEDFE1";
 		$bg = "#FFFFFF";
 $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter"; // Parameter Listenanzeige
 echo "<div align='center'>\n";
-echo "<p><b>Mitarbeiter - Telefonliste</b></p>\n";
+echo "<p><b>Mitarbeiter/Objekte - Telefonliste</b></p>\n";
 echo "<table border='0' cellspacing='0'>\n";
 echo "<tr><td class='bigger'>Mittels '<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />'
 können Sie nach bestimmten Spalten auf- bzw. absteigend sortieren</td></tr>
 <tr><td class='bigger'>'<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' erm&ouml;glicht das Filtern nach ausgew&auml;hlten Spalten der Liste</td></tr>
 <tr><td class='bigger'>Rote Telefon-/Fax-Nummern sind nur intern erreichbar</td></tr>";
 if ($edit)
 echo "<tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Angaben</tr>";
-echo "</table><br />\n";
+echo "</table>\n";
+echo "</div><p>&nbsp;&nbsp;&nbsp;<a href=/fhiiqm/ma_tel_pdf.php?e=$edit$getp>PDF erstellen</a></p>\n<div align='center'>\n";
 if (isset($fnum) && $fnum>1 && !$filter && !$subf)
 {
 // 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 "<td><input class=\"button\" type=\"hidden\" value=\"finden\" name=\"subf\" title=\"subf\" /></td></tr></table>\n";
 echo "</form>\n";
 echo "<p>&nbsp;&nbsp;&nbsp;</p>\n";
 }
+// Schnellsuche Namen
+echo "<p>";
+for ($j=65; $j<91; $j++)
+{
+echo "<a href='". $_SERVER["PHP_SELF"] . "?e=$edit&f=2&b=". chr($j)."' target=\"_self\" title=\"Telefonliste\" class=\"sc\">".chr($j)."&nbsp;&nbsp;&nbsp;</a>";
+}
+echo "</p>\n";
 echo "<table width='55%'>\n";
 if ($filter>'!') echo "<tr><td class='bigger' colspan=6>Filter: ". $fields["$fnum"] . " wie '$filter'</td></tr>\n";
 // Listenkopf generieren
 echo "<tr bgcolor='#68ACBF'>";
 tab_column(2,"Name",$sort,$dir,2,$fnum,$filter,$start,$zeil,$edit);
 tab_column(3,"Vorname",$sort,$dir,3,$fnum,$filter,$start,$zeil,$edit);
 tab_column(5,"Abteilung",$sort,$dir,5,$fnum,$filter,$start,$zeil,$edit);
-tab_column(6,"Telefon/Fax",$sort,$dir,6,$fnum,$filter,$start,$zeil,$edit);
 tab_column(9,"Haus",$sort,$dir,9,$fnum,$filter,$start,$zeil,$edit);
 tab_column(10,"Raum",$sort,$dir,10,$fnum,$filter,$start,$zeil,$edit);
-if ($edit && !is_null($_SESSION["recht"]) && in_array("fme", $_SESSION["recht"]))
+tab_column(6,"Telefon/Fax",$sort,$dir,6,$fnum,$filter,$start,$zeil,$edit);
+if ($edit && !is_null($_SESSION["recht"]) && in_array("mte", $_SESSION["recht"]))
 echo "<th>&nbsp</th>";
 echo "</tr>\n";
 foreach ($result as $row)
 {
 			if ($row->persknr != $vpnr)
 echo "<td>$row->vorname</td>";
 echo "<td>$row->abt_name</td>";
 //            echo "<td class=\"left\">$row->telnr " . ($row->telefon_typ == 'fax')? ", " . strtoupper($row->telefon_typ) : "" . "</td>";
 $ttyp = ($row->telefon_typ == 'fax')? " " . strtoupper($row->telefon_typ) : "";
 $rot = ($row->public)? "" : " class=\"red\"";
-echo "<td$rot>$row->telefon_nr $ttyp</td>";
 echo "<td>$row->geb_ID</td>";
 echo "<td>$row->raum_nr</td>";
-if ($edit && !is_null($_SESSION["recht"]) && in_array("fme", $_SESSION["recht"]))
+echo "<td$rot>$row->telefon_nr $ttyp</td>";
+if ($edit && !is_null($_SESSION["recht"]) && in_array("mte", $_SESSION["recht"]))
 echo "<td><a href='/fhiiqm/ma_tel_ed.php?i=$row->persknr$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
 echo "</tr>\n";
 }
 else
 {
-echo "<tr bgcolor='" . $bg . "'><td colspan='3'>&nbsp;</td>";
+if ($vabt != $row->abt_name) $abt = $row->abt_name;
+else $abt = '&nbsp';
+echo "<tr bgcolor='" . $bg . "'><td colspan='2'>&nbsp;</td>";
 $ttyp = ($row->telefon_typ == 'fax')? " " . strtoupper($row->telefon_typ) : "";
 $rot = ($row->public)? "" : " class=\"red\"";
+echo "<td>$abt</td>";
+echo "<td>&nbsp;</td>";
+echo "<td>&nbsp;</td>";
 echo "<td$rot>$row->telefon_nr $ttyp</td>";
-echo "<td>$row->geb_ID</td>";
+if ($edit && !is_null($_SESSION["recht"]) && in_array("mte", $_SESSION["recht"]))
-echo "<td>$row->raum_nr</td>";
-if ($edit && !is_null($_SESSION["recht"]) && in_array("fme", $_SESSION["recht"]))
 echo "<td>&nbsp;</td>";
 echo "</tr>\n";
 }
 $vpnr = $row->persknr;
+$vabt = $row->abt_name;
 }
 echo "</table></div>\n";
+echo "<p>&nbsp;&nbsp;&nbsp;<a href=/fhiiqm/ma_tel_pdf.php?e=$edit$getp>PDF erstellen</a></p>\n";
 }
 else
 {
 echo "<div align=center>";
 if ($dbc -> error)
 echo "error: " . $dbc -> error . "<br />\n";
 else
 {
 echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider nichts gefunden f&uuml;r ". $fields["$fnum"] . " wie '$filter'!</p><br />";
-echo "&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "?$edit\" target=\"_self\" title=\"Telefonliste\" class=\"sc\">Telefonliste</a></p>\n";
+echo "&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "?e=$edit\" target=\"_self\" title=\"Telefonliste\" class=\"sc\">Telefonliste</a></p>\n";
 }
 echo "</div>";
 }
 ?>

changeset 33	f1a8785434e4
parent 32	c2d325791e24
child 34	fc60ef80a7ad