--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/form/anlage_form.inc.php Mon Nov 21 16:24:43 2011 +0100
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 11/2011
+ *
+ * Form Anlage
+ */
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+ $okn = true;
+ if (!$al["geb"]) $al["geb"]="A";
+
+?>
+<div align="center">
+<table>
+<tr><td class="bigger">Die Auswahl eines Anlagenverantwortlichen geschieht durch<br />Eingeben von mindesten 2 Zeichen in das Verantwortlicher-Feld.
+</td></tr>
+<tr><td class="bigger"><div class="red">Achtung! </div>Umlaute wie 'ä', 'ü', 'ö', 'ß' werden nicht gefunden, bitte benachbarte Zeichen eingeben.</td></tr>
+<tr><td class="bigger"> </td></tr>
+</table>
+</div>
+<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="fanl">
+<div align="center">
+ <table border="0" cellspacing="3" cellpadding="3">
+<!-- <div class="ui-widget"> -->
+ <tr><td>Anlagenbezeichnung *</td>
+ <td valign="top"><input type="text" name="al[bez]" id="albez" size="30" maxlength="50" value="<?php echo $al['bez']; ?>"/>
+ <?php
+ if (isset($al['bez']) && $al['bez']<'!')
+ {
+ echo "<br><span class=\"red\">Anlagenbezeichnung ist erforderlich!</span>\n";
+ $okn = false;
+ }
+ else
+ if ($okn) $okn = true; else $okn=false;
+ ?>
+ </td>
+ </tr>
+ <tr><td>Anlagenbeschreibung</td>
+ <td><textarea name="al[beschr]" cols="50" rows="5"><?php echo $al['beschr']; ?></textarea></td>
+ </tr>
+ <tr><td>Kategorie</td>
+ <td valign="top">
+ <select name="al[kat]">
+ <?php
+ if ($al['kat'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT al_kat_bez, al_kat_ID FROM `fhiiqm`.`A_Kategorie` ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->al_kat_ID == $al['kat'])
+ echo "<option selected value=\"$row->al_kat_ID\">$row->al_kat_ID: $row->al_kat_bez</option>\n";
+ else
+ echo "<option value=\"$row->al_kat_ID\">$row->al_kat_ID: $row->al_kat_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr><td>Befähigungsgrad</td>
+ <td valign="top">
+ <select name="al[befg]">
+ <?php
+ if ($al['befg'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT al_befgrad_bez, al_befgrad_ID FROM `fhiiqm`.`A_BefGrad` ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->al_befgrad_ID == $al['befg'])
+ echo "<option selected value=\"$row->al_befgrad_ID\">$row->al_befgrad_ID: $row->al_befgrad_bez</option>\n";
+ else
+ echo "<option value=\"$row->al_befgrad_ID\">$row->al_befgrad_ID: $row->al_befgrad_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr><td>Prüfart</td>
+ <td valign="top">
+ <select name="al[part]">
+ <?php
+ if ($al['part'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT al_pruefart_bez, al_pruefart_ID FROM `fhiiqm`.`A_PruefArt` ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->al_pruefart_ID == $al['part'])
+ echo "<option selected value=\"$row->al_pruefart_ID\">$row->al_pruefart_ID: $row->al_pruefart_bez</option>\n";
+ else
+ echo "<option value=\"$row->al_pruefart_ID\">$row->al_pruefart_ID: $row->al_pruefart_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr><td>Standort</td>
+ <td valign="top">Haus
+ <select name="al[geb]" onchange="this.form.submit();">
+ <?php
+ $sql = "SELECT geb_ID, geb_name FROM `fhiiqm`.`Haus` ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->geb_ID == $al['geb'])
+ echo "<option selected value=\"$row->geb_ID\">$row->geb_ID: $row->geb_name</option>\n";
+ else
+ echo "<option value=\"$row->geb_ID\">$row->geb_ID: $row->geb_name</option>\n";
+ }
+ }
+ ?>
+ </select>
+ Raum
+ <select name="al[raum]">
+ <?php
+ if ($al['raum'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT raum_ID, raum_nr, raum_name FROM `fhiiqm`.`Raum` WHERE geb_ID='" . $al['geb'] ."' ORDER BY 2";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->raum_ID == $al['raum'])
+ echo "<option selected value=\"$row->raum_ID\">$row->raum_nr $row->raum_name</option>\n";
+ else
+ echo "<option value=\"$row->raum_ID\">$row->raum_nr $row->raum_name</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr><td>Verantwortlicher</td>
+ <td valign="top"><input class="long20" type="text" name="al[persknr]" id="persknr" value="<?php echo $al['persknr']; ?>"/>
+ </td>
+ </tr>
+ <input type="hidden" name="al[pid]" id="pid" value="<?php echo $al['pid']; ?>"/>
+ <input type="hidden" name="al[okn]" value="<?php echo $okn; ?>"/>
+
--- a/fhiiqm/form/ma_fkt_form.inc.php Fri Nov 04 11:18:11 2011 +0100
+++ b/fhiiqm/form/ma_fkt_form.inc.php Mon Nov 21 16:24:43 2011 +0100
@@ -44,7 +44,9 @@
</select>
</td>
</tr>
- <tr><td>Geltungsbereich</td>
+ <tr><td>Geltungsbereich
+ <?php if ($fkt["func"]=='KST') echo "<span> = Kostenstelle</span>"; ?>
+ </td>
<td valign="top">
<?php
if (isset($fkt['func']) && $fkt["func"]=='AL')
Binary file fhiiqm/img/rotate_00.png has changed
Binary file fhiiqm/img/rotate_90.png has changed
Binary file fhiiqm/img/user_go.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/inc/anlage_dat_show.inc.php Mon Nov 21 16:24:43 2011 +0100
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 11/2011
+ *
+ * Bestaetigen Anlagen - INSERT/UPDATE-Daten
+ */
+
+ echo "<table>\n";
+ echo "<tr><td>Anlagen-ID: </td><td>" . $alid . "<td></td></tr>\n";
+ echo "<tr><td>Anlagenbezeichnung: </td><td>" . $al['bez'] . "<td></td></tr>\n";
+ echo "<tr><td>Anlagenbeschreibung: </td><td>" . nl2br($al['beschr']) . "<td></td></tr>\n";
+ // Kategorie
+ $sql = "SELECT al_kat_ID,al_kat_bez FROM fhiiqm.A_Kategorie WHERE al_kat_ID = '" . $al["kat"] . "'";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ echo "<tr><td>Anlagen-Kategorie: </td><td>" . $row->al_kat_ID.": " . $row->al_kat_bez . "</td></tr>\n";
+ }
+ // Befaehigungsgrad
+ $sql = "SELECT al_befgrad_ID,al_befgrad_bez FROM fhiiqm.A_BefGrad WHERE al_befgrad_ID = '" . $al["befg"] . "'";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ echo "<tr><td>Befähigungsgrad: </td><td>" . $row->al_befgrad_ID.": " . $row->al_befgrad_bez . "</td></tr>\n";
+ }
+ // Pruefart
+ $sql = "SELECT al_pruefart_ID,al_pruefart_bez FROM fhiiqm.A_PruefArt WHERE al_pruefart_ID = '" . $al["part"] . "'";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ echo "<tr><td>Prüfart: </td><td>" . $row->al_pruefart_ID.": " . $row->al_pruefart_bez . "</td></tr>\n";
+ }
+ // Raum
+ $sql = "SELECT raum_nr,raum_name,r.geb_ID,geb_name
+ FROM fhiiqm.Raum r INNER JOIN fhiiqm.Haus h ON r.geb_ID = h.geb_ID
+ WHERE raum_ID = '" . $al["raum"] . "'";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ echo "<tr><td>Standort: </td><td>" . $row->geb_ID.": " . $row->geb_name . " - Raum: " . $row->raum_nr . "</td></tr>\n";
+ }
+ // Verantwortlicher
+ $sql = "SELECT CONCAT (nachname, ', ',vorname) AS ma FROM fhiiqm.Mitarbeiter WHERE persknr = " . $al["pid"];
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ echo "<tr><td>Verantwortlicher: </td><td>" . $row->ma . "</td></tr>\n";
+ }
+
+ echo "</table>\n";
+?>
\ No newline at end of file
--- a/fhiiqm/inc/ma_list_ac.inc.php Fri Nov 04 11:18:11 2011 +0100
+++ b/fhiiqm/inc/ma_list_ac.inc.php Mon Nov 21 16:24:43 2011 +0100
@@ -16,8 +16,8 @@
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 'ehemals' END, ')') as label,
- CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'ehemals' END, ')') as val,persknr as id
+ $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";
--- a/fhiiqm/ma_fkt_ed.php Fri Nov 04 11:18:11 2011 +0100
+++ b/fhiiqm/ma_fkt_ed.php Mon Nov 21 16:24:43 2011 +0100
@@ -98,6 +98,7 @@
$fkt["fid"] = $fkt["func"]; // kein autocomplete bei Funktion
if (!$fkt["pid"]) $fkt["pid"] = $_GET["p"];
if (!$fkt["fid"]) $fkt["fid"] = $_GET["f"];
+ $mfid = $_GET[i];
$sub = $_POST["eintragen"];
echo "<h3>Zuordnung von Funktionen zu Mitarbeitern<h3>";
@@ -105,13 +106,13 @@
if ((!isset($fkt) && !$fkt) || !$fkt["pid"] || !$fkt["fid"] || !$sub)
{
- if ($fkt["pid"] && $fkt["fid"])
+ if ($fkt["pid"] && $fkt["fid"] && $mfid)
{
$sql = "SELECT fkt_bereich, fkt_von, fkt_bis, fkt_bem, CONCAT(nachname,', ',vorname) AS vname, fkt_bez, ma.fkt_ID
FROM fhiiqm.MA_Funktion ma INNER JOIN
fhiiqm.Mitarbeiter m ON ma.persknr=m.persknr INNER JOIN
fhiiqm.Funktion f ON ma.fkt_ID=f.fkt_ID
- WHERE ma.persknr = " . $fkt["pid"] . " AND ma.fkt_ID ='" . $fkt["fid"] ."'";
+ WHERE mf_ID = $mfid";
if ($result = $dbc -> queryObjectArray($sql))
{
foreach ($result as $row)
@@ -153,7 +154,7 @@
{
$sql="SELECT COUNT(*) FROM MA_Funktion WHERE persknr=" . $fkt["pid"] . " AND fkt_ID='" . $fkt["fid"] ."'";
$result = $dbc ->querySingleItem($sql);
- if ($result && $fkt["ber"]>"!")
+ if ($result && $fkt["ber"]>"!" && $mfid)
{ // UPDATE
$stmt = $dbc -> stmtinit();
if (is_object($stmt))
@@ -163,7 +164,7 @@
fkt_von = ?,
fkt_bis = ?,
fkt_bem = ?
- WHERE persknr=" . $fkt["pid"] . " AND fkt_ID='" . $fkt["fid"] ."'");
+ WHERE mf_ID = $mfid");
$stmt -> bind_param('ssss',$fkt["ber"], $fvon, $fbis, $fkt["bem"]);
$res = $stmt -> execute();
// print_r($stmt);
@@ -193,7 +194,7 @@
}
echo "</div>\n";
echo "<p> <a href=\"ma_fkt_flist.php\" target=\"_self\" title=\"Funktionen\">Zur Funktionenliste</a></p>\n";
- echo "<p> <a href=\"ma_fkt_ed.php\" target=\"_self\" title=\"Information erfassen\">Weitere Funktion erfassen/editieren</a></p>\n";
+ echo "<p> <a href=\"ma_fkt_ed.php\" target=\"_self\" title=\"Funktion erfassen\">Weitere Funktion erfassen</a></p>\n";
}
?>
--- a/fhiiqm/ma_fkt_flist.php Fri Nov 04 11:18:11 2011 +0100
+++ b/fhiiqm/ma_fkt_flist.php Mon Nov 21 16:24:43 2011 +0100
@@ -45,9 +45,10 @@
echo "<div class=\"float-r\"><img src=\"img/reseller_account_template.png\" border=\"0\" alt=\"Mitarbeiter-Funktion\" title=\"Mitarbeiter-Funktion\"/></div>\n";
// Felder, nach denen gefiltert werden kann
- $fields = array(2=>"Name",4=>"Funktion");
+ $fields = array(2=>"Name",4=>"Funktion",8=>"Abteilung");
$zeil = $_GET["z"];
+ if (!$zeil) $zeil = $_POST["z"];
if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
$start = $_GET["st"];
if (!$start) $start=0;
@@ -75,7 +76,7 @@
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
$dbc = new dbconnection();
- $sql = "CALL ma_fkt_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',@anz);";
+ $sql = "CALL ma_fkt_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,@anz);";
// Parameter: Nr. Sortfeld, Sortierrichtung, Nr. Filterfeld, Filterbegriff, Anzahl gefundener Mitarbeiter
// liefert: persknr, mname, fkt_ID, fkt_bez, fkt_bereich, fkt_von, fkt_bis, fkt_bem
// echo "sql = $sql<br />";
@@ -94,23 +95,33 @@
echo "<tr><td class='bigger'>Mittels '<img src='/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />'
können Sie nach relevanten Spalten auf- bzw. absteigend sortieren</td></tr>
<tr><td class='bigger'>'<img src='/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' ermöglicht das Filtern nach ausgewählten Spalten der Liste</td></tr>
- <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Zuordnung Mitarbeiter - Funktion</td></tr>\n";
+ <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Zuordnung Mitarbeiter - Funktion</td></tr>
+ <tr><td class='bigger'>Das Klicken auf den Mitarbeiternamen löst das <em>Versenden einer E-Mail</em> an diesen aus.</td></tr>\n";
echo "</table>\n";
$panz = $dbc -> querySingleItem("SELECT @anz");
printf ("<p>Anzahl Zuordnungen Mitarbeiter - Funktion: %s</p>", $panz);
-
+
if (isset($fnum) && $fnum>1 && !$filter && !$subf)
{
// Formular anzeigen fuer Filterbegriff
$text = $fields[$fnum];
+ $azeil = array(25=>'25',50=>'50',100=>'100',1000=>'alle');
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=\"30%\" 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=\"30\" maxlength=\"30\" value=\"$filter\"/></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";
echo "<p> </p>\n";
@@ -122,8 +133,11 @@
// Listenkopf generieren
echo "<tr bgcolor='#68ACBF'>";
tab_column(2,"Mitarbeiter",$sort,$dir,2,$fnum,$filter,$start,$zeil);
+ tab_column(8,"Abt.",$sort,$dir,8,$fnum,$filter,$start,$zeil);
+ echo "<th>Tel.</th>";
tab_column(4,"Funktion",$sort,$dir,4,$fnum,$filter,$start,$zeil);
- echo "<th>Geltungsbereich</th>";
+ tab_column(5,"Geltungsbereich",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+// echo "<th>Geltungsbereich</th>";
tab_column(6,"Beginn",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(7,"Ende",$sort,$dir,0,$fnum,$filter,$start,$zeil);
echo "<th>Bemerkung</th>";
@@ -132,9 +146,11 @@
foreach ($result as $row)
{
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
- echo "<tr bgcolor='" . $bg . "'><td><b>$row->mname</b></td>";
+ echo "<tr bgcolor='" . $bg . "'><td><a href='mailto:$row->email'>$row->mname</a></td>";
+ echo "<td>$row->abt_name</td>";
+ echo "<td>$row->tel</td>";
echo "<td>$row->fkt_bez</td>";
- echo "<td>$row->fkt_bereich</td>";
+ echo "<td class=\"right\">$row->fkt_bereich</td>";
if ($row->fkt_von)
{
$fb = new DateTime($row->fkt_von);
@@ -148,12 +164,12 @@
}
else echo "<td> </td>";
echo "<td>$row->fkt_bem</td>";
- echo "<td><a href='/fhiiqm/ma_fkt_ed.php?p=$row->persknr&f=$row->fkt_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
+ echo "<td><a href='/fhiiqm/ma_fkt_ed.php?i=$row->mf_ID&p=$row->persknr&f=$row->fkt_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
}
echo "</table></div>\n";
echo "<br /> ";
-/*
+
// Sortierung und Filter aus $_GET fuer weitere Seiten
foreach ($_GET as $key=>$val)
{
@@ -169,7 +185,7 @@
// Links auf andere Seiten generieren
liste_links($start,$zeil,$panz,$liste);
-*/
+
}
else
{
--- a/fhiiqm/recht_ed.php Fri Nov 04 11:18:11 2011 +0100
+++ b/fhiiqm/recht_ed.php Mon Nov 21 16:24:43 2011 +0100
@@ -214,7 +214,7 @@
}
$dbc -> close();
echo "</div>\n";
- echo "<p> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Rechte erfassen\">Weiteren User & Rechte erfassen</a></p>\n";
+ echo "<p> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Rechte erfassen\">Weiteren Nutzer & Rechte erfassen</a></p>\n";
echo "<p> <a href='/fhiiqm/recht_list.php' title='Nutzerliste'>zur Nutzerliste</a></p>";
}
?>
--- a/fhiiqm/recht_list.php Fri Nov 04 11:18:11 2011 +0100
+++ b/fhiiqm/recht_list.php Mon Nov 21 16:24:43 2011 +0100
@@ -73,6 +73,8 @@
}
echo "</table></div>\n";
}
+ if (!is_null($_SESSION["recht"]) && in_array("re",$_SESSION["recht"]))
+ echo "<p> <a href=\"/fhiiqm/recht_ed.php\" target=\"_self\" title=\"Nutzer erfassen\" class=\"sc\">Weiteren Nutzer & Rechte erfassen</a></p>\n";
?>
</body>
