--- a/fhiiqm/form/info_form2.inc.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/form/info_form2.inc.php Wed Jul 31 15:10:48 2013 +0200
@@ -171,7 +171,7 @@
}
else */
$wherm = " WHERE aktiv < 2 "; // nur MA, keine Objekte, 02.11.2012, bs
- $sql = "SELECT persknr, CONCAT (nachname, ', ',vorname,' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as pname FROM fhiiqm.Mitarbeiter $wherm ORDER BY 2";
+ $sql = "SELECT persknr, CONCAT (nachname, ', ',IFNULL(vorname,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as pname FROM fhiiqm.Mitarbeiter $wherm ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
--- a/fhiiqm/form/raumarbgr_form.inc.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/form/raumarbgr_form.inc.php Wed Jul 31 15:10:48 2013 +0200
@@ -107,7 +107,7 @@
$select = null;
$select = ( "-1"==$rag['ma'][0] ) ? ' selected' : null;
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT persknr, CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') AS ma
+ $sql = "SELECT persknr, CONCAT (nachname, ', ',IFNULL(vorname,''), ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') AS ma
FROM fhiiqm.Mitarbeiter m LEFT OUTER JOIN fhiiqm.Abteilung a ON m.abt_tel=a.abt_ID WHERE aktiv < 2 ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
--- a/fhiiqm/form/vertrag_form.inc.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/form/vertrag_form.inc.php Wed Jul 31 15:10:48 2013 +0200
@@ -286,7 +286,7 @@
$select = null;
if (is_array($vtr['cpers'])) $select = in_array( "-1", $vtr['cpers'] ) ? ' selected' : null;
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT persknr, CONCAT (nachname, ', ',vorname,' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as pname FROM fhiiqm.Mitarbeiter WHERE aktiv < 2 ORDER BY 2";
+ $sql = "SELECT persknr, CONCAT (nachname, ', ',IFNULL(vorname,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as pname FROM fhiiqm.Mitarbeiter WHERE aktiv < 2 ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
--- a/fhiiqm/form/vertragmf_form.inc.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/form/vertragmf_form.inc.php Wed Jul 31 15:10:48 2013 +0200
@@ -154,7 +154,7 @@
$select = null;
if (is_array($vtr['cpers'])) $select = in_array( "-1", $vtr['cpers'] ) ? ' selected' : null;
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT persknr, CONCAT (nachname, ', ',vorname,' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as pname FROM fhiiqm.Mitarbeiter WHERE aktiv < 2 ORDER BY 2";
+ $sql = "SELECT persknr, CONCAT (nachname, ', ',IFNULL(vorname,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as pname FROM fhiiqm.Mitarbeiter WHERE aktiv < 2 ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
--- a/fhiiqm/inc/keytyp_list_ac.inc.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/inc/keytyp_list_ac.inc.php Wed Jul 31 15:10:48 2013 +0200
@@ -27,7 +27,7 @@
FROM `fhiiqm`.`Keytyp`
WHERE key_level LIKE '%".$q."%' COLLATE latin1_general_ci
ORDER BY 1";
- elseif ($dep == "d")
+ elseif ($typ == "d")
$sql = "SELECT CONCAT(key_level,' - ',k.keytyp_ID) as label,k.keytyp_ID as val, k.keytyp_ID as id
FROM Keytyp k LEFT OUTER JOIN Keytyp_Depot d ON k.keytyp_ID = d.keytyp_ID AND depot_ID = '".$dep."'
WHERE k.keytyp_ID LIKE '%".$q."%' AND d.keytyp_ID IS NULL
--- a/fhiiqm/inc/ma_list_ac.inc.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/inc/ma_list_ac.inc.php Wed Jul 31 15:10:48 2013 +0200
@@ -24,7 +24,7 @@
ORDER BY 1";
*/
if (isset($abt) && $abt == "a") $ord = "abt_ID, "; else $ord = "";
- $sql = "SELECT CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') as label,
+ $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
--- a/fhiiqm/inc/menu.inc.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/inc/menu.inc.php Wed Jul 31 15:10:48 2013 +0200
@@ -24,8 +24,8 @@
}
}
- // maximal moegliche Rechte (17.12.2012):
- // 'ae','ar','ase','asr','dde','ddr','fme','fmr','ie','ir','le','lr','mtr','mte','pe','pr','pze','pzr','re','rr','rtr','rte','ve','vpe','vpr','vr'
+ // maximal moegliche Rechte (11.07.2013):
+ // 'ae','ar','ase','asr','dde','ddr','fme','fmr','ie','ir','kr','ke','le','lr','mtr','mte','pe','pr','pze','pzr','re','rr','rtr','rte','ve','vpe','vpr','vr'
// Rechtegruppen: a, v, i, s
if (is_null($_SESSION["recht"]))
echo "<p> Sie haben keine Rechte, um mit dieser Anwendung zu arbeiten.</p>
@@ -185,13 +185,24 @@
// }
if (in_array("kr",$_SESSION["recht"]) || in_array("ke",$_SESSION["recht"]))
{
+ $sql = "SELECT depot_ID,edit FROM KeyDepot_userweb WHERE userid = '".$_SESSION["userid"]."'";
+ $res = $dbc -> queryObjectArray($sql);
+ foreach ($res as $row) if ($row->edit) $adep[] = $row->depot_ID;
echo "<li>Schlüsselverwaltung\n";
echo "<ul>\n";
- echo "<li><a href=\"/fhiiqm/keytyp_tract_dep.php\" target=\"_blank\" title=\"Keytyp Transfer Depot\">Schlüsseltyp innerhalb Depots verschieben</a></li>\n";
- echo "<li><a href=\"/fhiiqm/keytyp_tract_ma.php\" target=\"_blank\" title=\"Keytyp Transfer MA\">Schlüsseltyp Depot - MA verschieben</a></li>\n";
- echo "<li><a href=\"/fhiiqm/keytyp_ma_search.php\" target=\"_blank\" title=\"MA-Keytyp Suche\">Schlüsseltypen - Mitarbeiter Suche</a></li>\n";
- echo "<li><a href=\"/fhiiqm/keytyp_search.php\" target=\"_blank\" title=\"Keytyp MA Suche\">Schlüsseltyp suchen, bearbeiten</a></li>\n";
- echo "<li><a href=\"/fhiiqm/keytyp_korr_dep.php\" target=\"_blank\" title=\"Keytyp Korrektur Depot\">Schlüsseltyp Depot - Korrektur</a></li>\n";
+ if (isset($adep) && $adep)
+ echo "<li><a href=\"/fhiiqm/keytyp_tract_ma.php\" target=\"_blank\" title=\"Keytyp Transfer MA\">Transfer Schlüssel Depot - MA</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/keytyp_ma_search.php\" target=\"_blank\" title=\"MA-Keytyp Suche\">Suche Schlüssel - Mitarbeiter</a></li>\n";
+ if (isset($adep) && $adep)
+ echo "<li><a href=\"/fhiiqm/keytyp_korr_dep.php\" target=\"_blank\" title=\"Keytyp Korrektur Depot\">Korrektur Schlüsseltyp Depot</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/keytyp_search.php\" target=\"_blank\" title=\"Keytyp Suche\">Schlüsseltyp suchen, bearbeiten</a></li>\n";
+ if (in_array("ke",$_SESSION["recht"]) && in_array("FHI",$adep))
+ {
+ echo "<li><a href=\"/fhiiqm/keytyp_tract_dep.php\" target=\"_blank\" title=\"Keytyp Transfer Depot\">Transfer Schlüssel zwischen Depots</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/keytyp_del_dep.php\" target=\"_blank\" title=\"Keytyp Delete Depot\">Schlüsseltyp aus Depot löschen</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/keytyp_ed.php\" target=\"_blank\" title=\"Keytyp erfassen\">Schlüsseltyp erfassen</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/keydepot_user_list.php\" target=\"_blank\" title=\"KeyDepot-User Liste\">Verwalterliste Schlüsseltyp-Depot</a></li>\n";
+ }
echo "<li><a href=\"/fhiiqm/keytyp_report.php\" target=\"_blank\" title=\"Report Keytyp\">Berichte Schlüsseltyp</a></li>\n";
echo "</ul>\n
</li>\n";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/keydepot_user_ed.php Wed Jul 31 15:10:48 2013 +0200
@@ -0,0 +1,306 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 07/2013
+ *
+ * Liste User - Keytyp_Depot
+ *
+ */
+
+ error_reporting(E_ALL ^ E_NOTICE);
+
+ 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("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
+ {
+ header("Location: start.php");
+ exit;
+ }
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+ // userid: Depot 'FHI', 'edit' = 1 -> Keytyp bearbeitbar
+ $redit = 0;
+ $uid = $_SESSION["userid"];
+ $sql = "SELECT edit FROM KeyDepot_userweb WHERE depot_ID = 'FHI' AND userid = '$uid'";
+ $redit = $dbc -> querySingleItem($sql);
+
+ $sub = $_POST["eintragen"];
+ $ky = $_POST["ky"];
+ $okn = $ky["okn"];
+ $ok = $_POST["ok"];
+// if (!$okn) $ok=0;
+
+ $udid = $_GET["u"]; // user Depot
+ if ($ky["userid"]) $udid = $ky["userid"];
+//print_r($ky); echo "udid=$udid, sub=$sub<br />";
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+ <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />
+ <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
+ <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
+ <title>Keytyp-user bearbeiten</title>
+</head>
+
+<body>
+ <script>
+ //<--
+ var counter = 0;
+ var adep = new Array();
+ function addInput(divId,anz){
+ var newdiv = document.createElement('div');
+ var opt = "";
+ var i;
+ for (var key in adep)
+ {
+ opt = opt.concat("<option value='",key,"'>",adep[key],"</option>\n" );
+ }
+ opt += "</select>\n";
+ newdiv.innerHTML = "<span></span><select name='ky[dep][]'>"+opt;
+ newdiv.innerHTML += " Korrektur/Transfer <input type='checkbox' name='ky[ed][" + (counter+1) + "]' value='1' />";
+ newdiv.innerHTML += "<span id='cbl'> <input type='checkbox' id='del' name='ky[del][]' value='1'/>";
+ newdiv.innerHTML += "<label id='lb' for='del'> <i>löschen</i></label></span>\n";
+ document.getElementById(divId).appendChild(newdiv);
+ var delcb = document.getElementById('del');
+ delcb.id = "del_" + anz;
+ delcb.style.display = 'none';
+ var lcb = document.getElementById('lb');
+ lcb.id = "lb_" + anz;
+ lcb.setAttribute("for", delcb.id);
+ lcb.style.display = 'none';
+ counter++;
+ }
+ function markdelInput(divId,anz){
+ for (i=1; i<anz; i++)
+ {
+ var id = "del_" + i;
+ var delcb = document.getElementById(id);
+ delcb.style.display = 'inline';
+ var idl = "lb_" + i;
+ var lcb = document.getElementById(idl);
+ lcb.style.display = 'inline';
+ }
+ }
+ //-->
+ </script>
+
+<?php
+ echo " ";
+ echo "<div class=\"float-br smaller\" valign='top'>";
+ echo " user: " . $_SESSION["userid"];
+ echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+ echo "<div class=\"float-r\"><img src=\"img/key.png\" border=\"0\" alt=\"Keytyp-user bearbeiten\" title=\"Schlüsseltyp-Nutzer bearbeiten\"/></div>\n";
+
+ if ($redit)
+ if ($udid) $text = "editieren"; else $text = "erfassen";
+ else $text = "Ansicht";
+ echo "<div align=\"center\">";
+ echo "<h3>Schlüsseltyp-Depot Verwalter und Rechte $text</h3>";
+ echo "</div>\n";
+
+ if (!$sub || !isset($ky) || !$ok)
+ {
+ if ($udid && !$sub)
+ {
+ if (!$ky["userid"]) $ky["userid"] = $udid;
+ $ky["dep"] = null; $ky["ed"] = null;
+ $sql = "SELECT depot_ID,edit FROM KeyDepot_userweb WHERE userid = '$udid'";
+ $result = $dbc -> queryObjectArray($sql);
+ foreach ($result as $row)
+ {
+ $ky["dep"][] = $row->depot_ID;
+ $ky["ed"][] = $row->edit;
+ }
+ }
+?>
+ <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_depotma" id="f_depotma" target="_self">
+ <div align="center">
+ <table width="50%" border="0" cellspacing="3" cellpadding="3">
+ <tr>
+ <td>Mitarbeiter</td>
+ <td><select name="ky[userid]" size="1" <?php if (!$sub) echo "onchange=\"this.form.submit();\""; ?>>
+
+ <?php
+ $okn = true;
+ $select = ( "-1"==$ky['userid'] ) ? " selected='selected'" : "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT u.userid, CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') AS nvname
+ FROM userweb u
+ INNER JOIN Mitarbeiter m ON u.persknr=m.persknr
+ LEFT OUTER JOIN user_recht r ON u.userid=r.userid
+ LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
+ WHERE recht_ID = 'ke'";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+// if (!$ky['userid'] && !$beg) $ky['userid'] = $row->userid;
+ if ($row->userid == $ky['userid'])
+ echo "<option selected='selected' value=\"$row->userid\">$row->nvname</option>\n";
+ else
+ echo "<option value=\"$row->userid\">$row->nvname</option>\n";
+// $beg = 1;
+ }
+ }
+ echo "</select>\n";
+/*
+ if (isset($ky['userid']) && $ky['userid']== "-1")
+ {
+ echo "<br><span class=\"red\">Mitarbeiter ist erforderlich!</span>\n";
+ $okn = false;
+ }
+*/
+ ?>
+ </td>
+ </tr>
+ <tr><td>Depot</td>
+ <td valign="top">
+ <div id="adddep">
+ <select name="ky[dep][]">
+ <?php
+ if (isset($ky['dep'])) $anzdep = count($ky['dep']); else $anzdep = 1;
+ $select = ( "-1"==$ky['dep'][0] ) ? " selected='selected'" : "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT * FROM fhiiqm.KeyDepot";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ {
+ if ($row->depot_ID == $ky['dep'][0]) $select = "selected='selected'"; else $select = "";
+ echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
+ $adep .= "'".$row->depot_ID."':'".$row->depot_ID.": ".$row->depot_bez."',";
+ }
+ $adep = substr($adep,0,strlen($adep)-1);
+ ?>
+ </select>
+ <script type="text/javascript">
+ <!--
+ adep = {<?php echo ($adep); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ //-->
+ </script>
+ Korrektur/Transfer <input name="ky[ed][]" type="checkbox" value="1" <?php if ($ky['ed'][0]) echo "checked='checked'"; ?> />
+ <a href="<?php echo "javascript:addInput('adddep',$anzdep);" ?>" title="weiteres Depot"><img src="/fhiiqm/img/add.png" border="0"/></a>
+ <a href="<?php echo "javascript:markdelInput('adddep',$anzdep);" ?>" title="löschen letztes Depot"><img src="/fhiiqm/img/delete.png" border="0" /></a><br />
+ <?php
+ if (isset($ky) && (!$ok || $sub))
+ {
+ if (count($ky['dep'])>1 || count($ky['ed'])>1)
+ {
+ $i=0;
+ foreach ($ky['dep'] as $edep)
+ {
+ if ($i>0)
+ {
+ echo "<span></span><select name=\"ky[dep][]\" size=\"1\">";
+
+ foreach ($res as $row)
+ {
+ $select = ( $row->depot_ID == $edep ) ? " selected='selected'" : null;
+ echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
+ }
+ echo "</select>";
+ echo " Korrektur/Transfer ";
+ echo "<input name=\"ky[ed][$i]\" type=\"checkbox\" value=\"1\"";
+ $check = ($ky['ed'][$i]) ? " checked='checked'" : "" ;
+ echo "$check />";
+ if (isset($ky['del'])) $cls = "dispil"; else $cls = "pr";
+ if (isset($ky['del'][$i])) $chk = "checked = ' checked'"; else $chk ="";
+ echo "<span id='cbl_$i'> <input class='$cls' type='checkbox' id='del_$i' name='ky[del][$i]' value='1'$chk /></span>
+ <span id='lb_$i' class='$cls'> <i>löschen?</i></span><br />\n";
+ }
+ $i++;
+ }
+ }
+ }
+ ?>
+ </div>
+ </td>
+ </tr>
+<?php
+ if ($sub)
+ {
+ $frage = "Alle Angaben ok?";
+ echo "<tr>
+ <td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
+ <td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
+ if ($ok) echo "checked=\"checked\"";
+ echo " /></td>\n</tr>\n";
+ }
+ if (!is_null($_SESSION["recht"]) && in_array("ke",$_SESSION["recht"]) && $redit)
+ {
+ echo "
+ <tr><td> </td>\n
+ <td><input class=\"button\" type=\"submit\" name=\"eintragen\" value=\" eintragen \" />";
+ echo "</td></tr>\n";
+ }
+ echo "</table>\n";
+ echo "</div>\n";
+ echo "<p class='sc'> <a href=\"keydepot_user_list.php\" target=\"_self\" title=\"User-Liste\">« zur Schlüsseltyp-Depot Verwalter-Liste</a></p>\n";
+ echo "</form>\n";
+ }
+ else
+ {
+//print_r($ky);
+ echo "<div align='center'>\n";
+ if ($ky["dep"][0] == -1) $ky["dep"][0] = null;
+ if ($ky["userid"] == -1) $ky["userid"] = "";
+ if ($ky["userid"] > "!" && count($ky["dep"]) > 0 && $ky["dep"][0] > "!")
+ {
+ $sql = "DELETE FROM KeyDepot_userweb WHERE userid = '" . $ky["userid"] ."'";
+ $retd = $dbc -> execute($sql);
+ if ($retd)
+ {
+ $ret = 1;
+ $stmt = $dbc -> stmtinit();
+ if (is_object($stmt))
+ {
+ $stmt -> prepare("INSERT INTO KeyDepot_userweb (Depot_ID,userid,edit) VALUES (?,?,?)");
+ for ($k=0; $k<count($ky["dep"]); $k++)
+ {
+ if ($ky["dep"][$k] && !$ky["del"][$k])
+ {
+ if (is_null($ky["ed"][$k])) $ky["ed"][$k] = 0;
+ $stmt -> bind_param('ssi',$ky["dep"][$k],$ky["userid"],$ky["ed"][$k]);
+ $ret = $ret && $stmt -> execute();
+ }
+ }
+ if (!$ret) echo "error INSERT Depot-Rechte: $stmt->error<br />\n";
+ else echo "<p class='green'>Depot-Rechte für Nutzer '".$ky["userid"]. "' wurden erfolgreich gespeichert.</p>\n";
+ }
+ }
+ else echo "error INSERT Depot-Rechte: $dbc->error<br />\n";
+ }
+ else
+ {
+ $sql = "SELECT COUNT(*) as anz FROM KeyDepot_userweb WHERE userid = '" . $ky["userid"] ."'";
+ $anz = $dbc -> querySingleItem($sql);
+ if ($anz >0)
+ {
+ $sql = "DELETE FROM KeyDepot_userweb WHERE userid = '" . $ky["userid"] ."'";
+ $retd = $dbc -> execute($sql);
+ if ($retd)
+ echo "<p class='green'>Depot-Rechte für Nutzer '".$ky["userid"]. "' wurden erfolgreich gelöscht.</p>\n";
+ }
+ else echo "<p class='red'>Es wurden keine Depot-Rechte für Nutzer '".$ky["userid"]. "' vergeben!</p>\n";
+ }
+ echo "</div>";
+ echo "<p class='sc'> <a href=\"keydepot_user_list.php\" target=\"_self\" title=\"User-Liste\">« zur Schlüsseltyp-Depot Verwalter-Liste</a></p>\n";
+ echo "<p class='sc'> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Depotrechte edit\">weitere Schlüsseltyp-Depotrechte bearbeiten</a></p>\n";
+ }
+?>
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/keydepot_user_list.php Wed Jul 31 15:10:48 2013 +0200
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 07/2013
+ *
+ * Liste Depotverwalter+Rechte
+ */
+
+ error_reporting(E_ALL ^ E_NOTICE);
+
+ 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("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
+ {
+ header("Location: start.php");
+ exit;
+ }
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ $dbc = new dbconnection();
+ $redit = 0;
+ $uid = $_SESSION["userid"];
+ $sql = "SELECT edit FROM KeyDepot_userweb WHERE depot_ID = 'FHI' AND userid = '$uid'";
+ $redit = $dbc -> querySingleItem($sql);
+ if (!$redit)
+ {
+ header("Location: start.php");
+ exit;
+ }
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+ <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />
+ <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
+ <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
+ <title>KeyDepot-Verwalter+Rechte</title>
+
+</head>
+
+<body>
+<?php
+ echo " ";
+ echo "<div class=\"float-br smaller sc\" valign='top'>";
+ echo " user: " . $_SESSION["userid"];
+ echo " <a href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+ echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/key.png\" border=\"0\" alt=\"key\" title=\"key\"/></div>\n";
+
+ echo "<div align='center'><h3>Schlüsseltyp-Depot Verwalter und Rechte</h3>\n";
+ echo "<p>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten Rechte Schlüsseltyp-Depotverwalter</p>";
+ $sql = "SELECT u.userid,
+ SUM(CASE depot_ID WHEN 'FHI' THEN d.edit+1 END) AS FHI,
+ SUM(CASE depot_ID WHEN 'AC' THEN d.edit+1 END) AS AC,
+ SUM(CASE depot_ID WHEN 'CP' THEN d.edit+1 END) AS CP,
+ SUM(CASE depot_ID WHEN 'ELA' THEN d.edit+1 END) AS ELab,
+ SUM(CASE depot_ID WHEN 'FWT' THEN d.edit+1 END) AS FWT,
+ SUM(CASE depot_ID WHEN 'HT' THEN d.edit+1 END) AS HT,
+ SUM(CASE depot_ID WHEN 'MP' THEN d.edit+1 END) AS MP,
+ SUM(CASE depot_ID WHEN 'PC' THEN d.edit+1 END) AS PC,
+ SUM(CASE depot_ID WHEN 'TH' THEN d.edit+1 END) AS TH
+ FROM user_recht u LEFT OUTER JOIN KeyDepot_userweb d ON u.userid=d.userid
+ WHERE u.recht_ID = 'ke'
+ GROUP BY u.userid";
+ $result = $dbc -> queryObjectArray($sql);
+ if ($result)
+ {
+ $adep = array("FHI","AC","CP","MP","PC","TH","ELab","FWT","HT");
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+ echo "<table width='35%' border='0' cellspacing='2' cellpadding='2'>\n";
+ echo "<tr bgcolor='#68ACBF'><th>userid</th><th>FHI</th><th>AC</th><th>CP</th><th>MP</th><th>PC</th><th>TH</th><th>E-Lab</th><th>FWT</th><th>HT</th><th></th></tr>\n";
+ foreach ($result as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'>";
+ echo "<td><b>$row->userid</b></td>";
+ foreach ($adep as $dep)
+ {
+ if ($row->$dep == 2)
+ $recht = "x+ed";
+ elseif ($row->$dep == 1)
+ $recht = "x";
+ else $recht = "";
+ echo "<td class='center'><b>$recht</b></td>";
+ }
+// echo "<td>".($row->FHI == 2)? "x+ed" : (($row->FHI == 1)? "x" : "")."</td>";
+ if (in_array("ke",$_SESSION["recht"]))
+ echo "<td><a href='/fhiiqm/keydepot_user_ed.php?u=$row->userid'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
+ else echo "<td> </td>";
+ echo "</tr>\n";
+ }
+ echo "</table>\n";
+ echo "<p>Legende: 'x' - Depot verwalten, 'ed' - Depotkorrekturen, Transfer von Schlüsseltypen zwischen Depots</p>\n";
+ echo "</div>\n";
+// echo "<p class='sc'> <a href=\"keydepot_user_ed.php\" target=\"_self\" title=\"Rechte DepotVw erfassen\">Schlüssel-Depotverwalter Rechte erfassen</a></p>\n";
+ }
+?>
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/keytyp_del_dep.php Wed Jul 31 15:10:48 2013 +0200
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 07/2013
+ *
+ * Keytyp Depot - delete
+ */
+
+ error_reporting(E_ALL ^ E_NOTICE);
+
+ 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("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
+ {
+ header("Location: start.php");
+ exit;
+ }
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+ // zulaessige Depots
+ $uid = $_SESSION["userid"];
+ $sql = "SELECT depot_ID,edit FROM KeyDepot_userweb WHERE userid = '$uid'";
+ $res = $dbc -> queryObjectArray($sql);
+ foreach ($res as $row)
+ if ($row->edit) $adep[] = $row->depot_ID;
+
+ $del = $_POST["del"];
+ $ky = $_POST["ky"];
+ $ok = $_POST["ok"];
+
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+ <title>Keytyp Depot entfernen</title>
+</head>
+
+<body>
+
+<?php
+ echo " ";
+ echo "<div class=\"float-br smaller\" valign='top'>";
+ echo " user: " . $_SESSION["userid"];
+ echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+ echo "<div class=\"float-r\"><img src=\"img/key.png\" border=\"0\" alt=\"Keytyp transferieren\" title=\"Depotverwaltung Schlüsseltyp\"/></div>\n";
+
+ echo "<div align=\"center\">";
+ echo "<h3>Schlüsseltyp aus Depot löschen</h3>";
+ echo "</div>\n";
+
+ if (!$ok || !$del)
+ {
+?>
+ <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_key">
+ <div align="center">
+ <p>Löschbar sind nur Schlüsseltypen, deren Depot-Bestand = 0 ist. </p>
+
+ <?php
+ if ($err) echo "<p class='red'>$err</p>\n";
+ ?>
+ <table width="40%" border="0" cellspacing="3" cellpadding="3">
+
+ <tr>
+ <td>Depot</td><td>Schlüsseltyp</td>
+ </tr>
+ <tr>
+ <td><select name="ky[dep]" onchange="this.form.submit();">
+ <?php
+ $strdep = "'". implode("','",$adep) ."'";
+ $sql = "SELECT * FROM fhiiqm.KeyDepot WHERE depot_ID IN ($strdep)";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ {
+ if (!$ky['dep'] && !$beg) $ky['dep'] = $row->depot_ID;
+ if ($row->depot_ID == $ky['dep']) $select = "selected='selected'"; else $select = "";
+ echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
+ $beg=1;
+ }
+ $beg=0;
+ ?>
+ </select>
+ </td>
+ <td><select name="ky[kt]" onchange="this.form.submit();">
+ <?php
+ $sql = "SELECT key_level,d.keytyp_ID,keytyp_bez,
+ SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
+ FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID
+ WHERE depot_ID = '" . $ky['dep'] . "'
+ GROUP BY key_level,d.keytyp_ID,keytyp_bez
+ HAVING SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) = 0";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ {
+ if (!$ky['kt'] && !$beg)
+ $ky['kt'] = $row->keytyp_ID;
+ if ($row->keytyp_ID == $ky['kt']) $select = "selected='selected'"; else $select = "";
+ echo "<option $select value=\"$row->keytyp_ID\">$row->key_level - $row->keytyp_ID [$row->keytyp_bez] ($row->bestand)</option>\n";
+ $beg=1;
+ }
+ $beg=0;
+ ?>
+ </select>
+ </td>
+ </tr>
+ <?php
+ if ($del)
+ {
+ $frage = "Schlüsseltyp wirklich löschen?";
+ echo "<tr>
+ <td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
+ <td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
+ if ($ok) echo "checked=\"checked\"";
+ echo " /></td>\n</tr>\n";
+ }
+ if (!is_null($_SESSION["recht"]) && in_array("ke",$_SESSION["recht"]) && in_array("FHI",$adep))
+ {
+ echo "
+ <tr><td> </td><td><input class=\"buttonr\" type=\"submit\" value=\"löschen\" name=\"del\" title=\"delete\" /></td></tr>\n";
+ }
+ echo "</table>\n";
+ echo "</div>\n";
+ echo "</form>\n";
+ }
+ else
+ {
+// print_r($ky);
+ echo "<div align='center'>\n";
+ $stmt = $dbc -> stmtinit();
+ if (is_object($stmt))
+ {
+ $stmt -> prepare("DELETE FROM Keytyp_Depot WHERE depot_ID =? AND keytyp_ID = ?");
+ $stmt -> bind_param('ss',$ky["dep"], $ky["kt"]);
+ $result = $stmt -> execute();
+ if ($result)
+ echo "<p class='green'><b>Schlüsseltyp '" . $ky["kt"] . "' wurde erfolgreich aus Depot '" . $ky["dep"] ."' gelöscht.</b> (" . $stmt->affected_rows ." Einträge)</p>";
+ else
+ {
+ echo "<p class='red'><b>Löschen von Schlüsseltyp '" . $ky["kt"] . "' aus Depot '" . $ky["dep"] ."' ist fehlgeschlagen!</b></p>";
+ echo $stmt -> error;
+ }
+ echo "<br /><br />\n";
+ }
+ echo "</div>\n";
+ echo "<p class='sc'> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Depot-Delete\">Weiteren Schlüsseltyp aus Depot löschen</a></p>\n";
+ }
+ ?>
+
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/keytyp_ed.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/keytyp_ed.php Wed Jul 31 15:10:48 2013 +0200
@@ -70,7 +70,7 @@
echo "</div>\n";
if ((!$sub && !$del) || !isset($ky) || !$ok)
{
- if ($kid && (!$sub || !$del) && !isset($ma))
+ if ($kid && (!$sub || !$del) && !isset($ky))
{
$sql = "SELECT keytyp_ID,key_level,key_parent,key_hiertyp_ID,keytyp_bez,key_anl_ID FROM Keytyp WHERE keytyp_ID='$kid'";
if ($result = $dbc -> queryObjectArray($sql))
@@ -112,7 +112,7 @@
}
echo "</table>\n";
echo "</div>\n";
- echo "<p class='sc'> <a href=\"keytyp_search.php?$getp\" target=\"_self\" title=\"Schlüsseltyp-Suche\">« zur Schlüsseltyp-Suche</a></p>\n";
+ echo "<p class='sc'> <a href=\"keytyp_search.php?$getp\" target=\"_self\" title=\"Schlüsseltyp-Hierarchie\">« zur Schlüsseltyp-Hierarchie</a></p>\n";
echo "</form>\n";
}
else
@@ -137,6 +137,7 @@
if ($ky['hier'] == -1) $ky['hier'] = null;
if ($ky['anl'] == -1) $ky['anl'] = null;
foreach ($ky as &$elem) if (!$elem) $elem = null; // NULL-Eintrag in Leerfelder
+ if (is_null($ky['level'])) $ky['level'] = '';
$stmt = $dbc -> stmtinit();
if (is_object($stmt))
{
@@ -156,7 +157,7 @@
}
else
{
- $stmt -> prepare("INSERT INTO Keytype (keytyp_ID,key_level,key_parent,key_hier_ID,key_bez,key_anl_ID) VALUES(?,?,?,?,?,?)");
+ $stmt -> prepare("INSERT INTO Keytyp (keytyp_ID,key_level,key_parent,key_hiertyp_ID,keytyp_bez,key_anl_ID) VALUES(?,?,?,?,?,?)");
$stmt -> bind_param('ssssss',$ky['typ'],$ky['level'],$ky['parent'],$ky['hier'],$ky['bez'],$ky['anl']);
$result = $stmt -> execute();
if ($stmt->error) echo "error INSERT Keytyp: " . $stmt->error . "<br><br>\n";
@@ -170,7 +171,6 @@
else
{
echo "<p class='red'><b>Keytypdaten zu '" . $ky['typ']. "', Level = '". $ky['level'] . "' konnten nicht gespeichert werden.</b></p>\n";
- echo "error: ". $dbc -> error;
echo "<br /><br />\n";
}
include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/keytyp_dat_show.inc.php");
@@ -178,7 +178,7 @@
}
echo "</div>";
- echo "<p class='sc'> <a href=\"keytyp_search.php?$getp\" target=\"_self\" title=\"Schlüsseltyp-Suche\">« zur Schlüsseltyp-Suche</a></p>\n";
+ echo "<p class='sc'> <a href=\"keytyp_search.php?$getp\" target=\"_self\" title=\"Schlüsseltyp-Hierarchie\">« zur Schlüsseltyp-Hierarchie</a></p>\n";
echo "<p class='sc'> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Schlüsseltyp erfassen\">Neuen Schlüsseltyp erfassen</a></p>\n";
}
?>
--- a/fhiiqm/keytyp_korr_dep.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/keytyp_korr_dep.php Wed Jul 31 15:10:48 2013 +0200
@@ -85,7 +85,8 @@
$out = $_POST["out"];
$get = $_POST["get"];
$lost = $_POST["lost"];
-
+
+/* // Inventurdaten eingeben, danach wieder aktivieren, 04.07.2013, bs
if (isset($ky) && ($out || $lost))
{
$sql = "SELECT IFNULL(SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END),0) AS bestand
@@ -93,6 +94,7 @@
$anzdep = $dbc->querySingleItem($sql);
if (is_numeric($ky["anz"]) && $anzdep < $ky["anz"]) $err = "Abgang/Verlust: Bestand '". $ky["kt"] ."' Depot 'FHI': <b>$anzdep < ".$ky["anz"]."</b> (Transfer-Anzahl)!";
}
+*/
if (isset($ky["anz"]) && !is_numeric($ky["anz"]) && ($out || $get || $lost)) $err = "Anzahl ist ncht numerisch!";
if (!isset($ky) || (!$out && !$get && !$lost) || $err)
@@ -106,10 +108,15 @@
<?php
if ($err) echo "<p class='red'>$err</p>\n";
?>
- <table width="50%" border="0" cellspacing="3" cellpadding="3">
+ <table width="47%" border="0" cellspacing="3" cellpadding="3">
<tr>
- <td>Depot *</td><td>Schlüsseltyp *</td><td>Schlüsseltyp neu</td><td>Anzahl *</td>
+ <td>Depot *</td><td>Schlüsseltyp *</td>
+ <?php
+ if (in_array("FHI",$adep))
+ echo "<td>Schlüsseltyp neu</td>";
+ ?>
+ <td>Anzahl *</td>
</tr>
<tr>
<td><select id="dep" name="ky[dep]" onchange="this.form.submit();">
@@ -149,25 +156,34 @@
$beg=0;
?>
</select>
- oder
- </td>
- <td><input id="ktn" name="ky[ktn]" type="text" size="10" maxlength="10" value="<?php echo $ky['ktn']; ?>" /></td>
- <td><input name="ky[anz]" type="text" size="5" maxlength="3" value="<?php echo $ky['anz']; ?>" /></td>
- </tr>
- <tr><td> </td><td colspan="3">neuer Schlüsseltyp: bitte mind. 2 Zeichen Schlüsseltyp eingeben -> Liste der verfügbaren</td></tr>
- <tr><td>Bemerkung</td><td colspan="3"><textarea name="ky[bem]" cols="50" rows="2"><?php echo $ky['bem']; ?></textarea></td></tr>
- <?php
+ <?php
+ if (in_array("FHI",$adep))
+ {
+ echo " oder
+ </td>";
+ echo "<td><input id=\"ktn\" name=\"ky[ktn]\" type=\"text\" size=\"10\" maxlength=\"10\" value=\"".$ky['ktn']."\" /></td>";
+ $csp = 3;
+ }
+ else $csp =2;
+ echo "<td><input name=\"ky[anz]\" type=\"text\" size=\"5\" maxlength=\"3\" value=\"".$ky['anz']."\" /></td>";
+ echo "</tr>\n";
+ if (in_array("FHI",$adep))
+ echo "<tr><td> </td><td colspan=\"3\">neuer Schlüsseltyp: bitte mind. 2 Zeichen Schlüsseltyp eingeben -> Liste der verfügbaren</td></tr>\n";
+ echo "<tr><td>Bemerkung</td><td colspan=\"". $csp. "\"><textarea name=\"ky[bem]\" cols=\"50\" rows=\"2\">". $ky['bem']."</textarea></td></tr>\n";
if (in_array("ke",$_SESSION["recht"]))
{
?>
- <tr><td> </td><td colspan="3"><input class="button" type="submit" name="get" value="Zugang +" title="Zugang"/>
+ <tr><td> </td><td colspan="<?php echo $csp; ?>"><input class="button" type="submit" name="get" value="Zugang +" title="Zugang"/>
<input class="button" type="submit" name="out" value="Abgang -" title="Abgang"/>
<input class="button" type="submit" name="lost" value="Verlust -" title="Verlust"/></td></tr>
<?php
}
?>
</table>
+ </div>
<?php
+ if (in_array("FHI",$adep))
+ echo "<p class='sc'> <a href=\"keytyp_ed.php\" target=\"_blank\" title=\"Schlüsseltyp erfassen\">Neuen Schlüsseltyp erfassen</a></p>\n";
}
else
{
--- 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;
--- a/fhiiqm/keytyp_report.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/keytyp_report.php Wed Jul 31 15:10:48 2013 +0200
@@ -52,11 +52,18 @@
<table width="94%" cellspacing="4" cellpadding="4">
<tr>
<td class="bigger">
- <a href="/fhiiqm/report/keytyp_dep_anz_report.php" title="Keytyp-Depot">Schlüsseltyp - Depot</a>
+ <a href="/fhiiqm/report/keytyp_dep_anz_report.php" title="Keytypbestand-Depot">Schlüsseltyp-Bestand - Depot</a>
<br /> Auswahl: Depot, Schlüsseltyp
<br /> Ansicht: Depot, Schlüsseltyp, Anzahl Zugang, Abgang, Verlust, Bestand
</td>
</tr>
+ <tr>
+ <td class="bigger">
+ <a href="/fhiiqm/report/keytyp_dep_history_report.php" title="Keytyphistorie-Depot">Schlüsseltyp-Historie - Depot</a>
+ <br /> Auswahl: Depot, Schlüsseltyp
+ <br /> Ansicht: Schlüsseltyp, Depot, Datum, Aktion, Anzahl, Bemerkung
+ </td>
+ </tr>
</table>
</div>
--- a/fhiiqm/keytyp_search.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/keytyp_search.php Wed Jul 31 15:10:48 2013 +0200
@@ -118,6 +118,7 @@
$result = $dbc -> queryObjectArray($sql);
if ($result)
{
+ echo "<p>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten Schlüsseltyp</p>";
$bg1 = "#F8F8F8";
$bg2 = "#DEDFE1";
$bg = "#FFFFFF";
--- a/fhiiqm/keytyp_tract_dep.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/keytyp_tract_dep.php Wed Jul 31 15:10:48 2013 +0200
@@ -29,7 +29,6 @@
// zulaessige Depots: nur FHI
$uid = $_SESSION["userid"];
$sql = "SELECT depot_ID,edit FROM KeyDepot_userweb WHERE userid = '$uid'";
-// $sql = "SELECT depot_ID FROM KeyDepot_userweb WHERE userid = '$uid'";
$res = $dbc -> queryObjectArray($sql);
foreach ($res as $row)
if ($row->edit) $adep[] = $row->depot_ID;
@@ -58,7 +57,7 @@
echo "<div class=\"float-r\"><img src=\"img/key.png\" border=\"0\" alt=\"Keytyp transferieren\" title=\"Depotverwaltung Schlüsseltyp\"/></div>\n";
echo "<div align=\"center\">";
- echo "<h3>Schlüsseltyp von/in Depot verschieben</h3>";
+ echo "<h3>Schlüssel-Transfer von/in Depots</h3>";
echo "</div>\n";
if (!isset($adep))
@@ -100,7 +99,7 @@
?>
<table width="45%" border="0" cellspacing="3" cellpadding="3">
<tr>
- <td>Depot FHI Schlüsseltyp *</td><td>Anzahl *</td><td>Depot *</td>
+ <td><b>Depot FHI</b> Schlüsseltyp *</td><td>Anzahl *</td><td>Depot *</td>
</tr>
<tr>
<td><select name="ky[kt]" onchange="this.form.submit();">
@@ -124,8 +123,10 @@
<td><input name="ky[anz]" type="text" size="5" maxlength="3" value="<?php echo $ky['anz']; ?>" /></td>
<td><select name="ky[dep]" onchange="this.form.submit();">
<?php
- $strdep = "'". implode("','",$adep) ."'";
- echo "$strdep<br />";
+ function nicht_fhi($var)
+ {return ($var!='FHI');}
+ $ofdep = array_filter($adep,"nicht_fhi");
+ $strdep = "'". implode("','",$ofdep) ."'";
$sql = "SELECT * FROM fhiiqm.KeyDepot WHERE depot_ID IN ($strdep)";
if ($res = $dbc -> queryObjectArray($sql))
foreach ($res as $row)
@@ -150,11 +151,10 @@
<?php
if (in_array("ke",$_SESSION["recht"]))
{
- ?>
- <tr><td></td><td><input class="button" type="submit" name="out" value="-> Ausgabe " title="Ausgabe"/></td></tr>
- <tr><td></td><td><input class="button" type="submit" name="get" value="<- Rücknahme" title="Rueckgabe"/></td></tr>
- <!-- <tr><td></td><td><input class="button" type="submit" name="lost" value="<- Verlust " title="Verlust"/></td></tr> -->
- <?php
+ if (in_array("FHI",$adep))
+ echo "<tr><td></td><td><input class=\"button\" type=\"submit\" name=\"out\" value=\"-> Ausgabe \" title=\"Ausgabe\"/></td></tr>";
+ echo "<tr><td></td><td><input class=\"button\" type=\"submit\" name=\"get\" value=\"<- Rücknahme\" title=\"Rueckgabe\"/></td></tr>";
+ // echo "<tr><td></td><td><input class=\"button\" type=\"submit\" name=\"lost\" value=\"<- Verlust \" title=\"Verlust"/></td></tr>\";
}
?>
</table>
--- a/fhiiqm/keytyp_tract_ma.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/keytyp_tract_ma.php Wed Jul 31 15:10:48 2013 +0200
@@ -4,7 +4,7 @@
* @author Bettina Schwarzer, Fritz-Haber-Institut
* @copyright 06/2013
*
- * Keytyp Transaktion Depot - Depot
+ * Keytyp Transaktion Depot - MA
*/
error_reporting(E_ALL ^ E_NOTICE);
@@ -57,7 +57,7 @@
echo "<div class=\"float-r\"><img src=\"img/key.png\" border=\"0\" alt=\"Keytyp transferieren\" title=\"Depotverwaltung Schlüsseltyp\"/></div>\n";
echo "<div align=\"center\">";
- echo "<h3>Schlüsseltyp von/an Depot an/von Mitarbeiter verschieben</h3>";
+ echo "<h3>Schlüssel-Transfer Depot <-> Mitarbeiter</h3>";
echo "</div>\n";
if (!isset($adep))
echo "<p class='red'> Sie haben nicht das Recht, Transfers von Schlüsseln zu Mitarbeitern vorzunehmen. Bitte wenden Sie sich an Frau Kohl.</p>";
@@ -68,6 +68,7 @@
$get = $_POST["get"];
$lost = $_POST["lost"];
$ky = $_POST["ky"];
+ if (!isset($ky["anz"])) $ky["anz"]=1;
//print_r($ky); echo "<br />";
if (isset($ky) && $get)
@@ -147,12 +148,12 @@
?>
</select>
</td>
- <td><input name="ky[anz]" type="text" size="5" maxlength="3" value="<?php echo $ky['anz']; ?>" /></td>
+ <td><input class="right" name="ky[anz]" type="text" size="5" maxlength="3" value="<?php echo $ky['anz']; ?>" /></td>
<td><select name="ky[ma]" onchange="this.form.submit();">
<?php
if ($ky['dep'] == 'FHI') $wher = " WHERE 1=1";
else $wher = "INNER JOIN KeyDepot_Abteilung k ON a.abt_ID=k.abt_ID WHERE depot_ID = '" . $ky['dep'] . "'";
- $sql = "SELECT persknr,CONCAT(TRIM(nachname), ', ',vorname,' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') AS nvname
+ $sql = "SELECT persknr,CONCAT(TRIM(nachname), ', ',IFNULL(vorname,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') AS nvname
FROM fhiiqm.Mitarbeiter m INNER JOIN Abteilung a ON m.abt_tel=a.abt_ID
$wher AND m.aktiv<2
ORDER BY nvname";
@@ -233,7 +234,7 @@
{
// $ky["bem"] = str_replace($umls,$umlr,str_replace("'","\"",substr($ky["bem"],0,100)));
$ky["bem"] = str_replace("'","\"",substr($ky["bem"],0,100));
- $sql = "SELECT CONCAT(nachname,', ',vorname) AS nvname FROM Mitarbeiter WHERE persknr=".$ky["ma"];
+ $sql = "SELECT CONCAT(nachname,', ',IFNULL(vorname,'')) AS nvname FROM Mitarbeiter WHERE persknr=".$ky["ma"];
$nvname = $dbc->querySingleItem($sql);
if (is_numeric($ky["anz"]) && $ky["anz"] != 0)
{
@@ -259,7 +260,7 @@
echo "<p>Aktueller Bestand Schlüsseltyp '". $ky["kt"] ."' im Depot ". $ky["dep"] . ": $anzdep</p><br /><br />\n";
}
echo "</div>\n";
- echo "<p class='sc'> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Transfer Depot-MA\">Weiterer Depot-MA Transfer</a></p>\n";
+ echo "<p class='sc'> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Transfer Depot-MA\">Weiterer Transfer Depot-MA</a></p>\n";
}
}
?>
--- a/fhiiqm/raum_vma_ed.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/raum_vma_ed.php Wed Jul 31 15:10:48 2013 +0200
@@ -190,7 +190,7 @@
$select = null;
$select = ( "-1"==$ap['gf'][0] ) ? ' selected' : null;
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT persknr, CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as ma
+ $sql = "SELECT persknr, CONCAT (nachname, ', ',IFNULL(vorname,''), ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as ma
FROM fhiiqm.Mitarbeiter m LEFT OUTER JOIN fhiiqm.Abteilung a ON m.abt_tel=a.abt_ID
WHERE aktiv < 2
ORDER BY 2";
--- a/fhiiqm/raumarbgr_ed.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/raumarbgr_ed.php Wed Jul 31 15:10:48 2013 +0200
@@ -65,14 +65,35 @@
else {
var newdiv = document.createElement('div');
var count;
+ var strval = "";
+ var strk,strv;
var opt="<option value='-1'></option>";
- for (var key in arr)
+ for (var key in arr)
+// alert(key + " => " + arr[key]); // hier schon sort nach key
+ var sorta = [];
+ for (var key in arr)
+ sorta.push([key, arr[key]])
+ sorta.sort(function(a, b) {return a[1] > b[1]})
+// alert (sorta);
+ for (var key in sorta)
+ {
+ strval = '"'+sorta[key]+'"'; // nur mit "" ist es ein String-Objekt
+// alert (strval.valueOf()+": " + sorta[key]+",index: "+ strval.indexOf(","));
+ strk = strval.substring(1,strval.indexOf(","));
+ strv = strval.substring(strval.indexOf(",")+1,strval.length-1);
+ if (strval.indexOf("inaktiv")>0)
+ opt = opt.concat("<option class='red' value='",strk,"'>",strv,"</option>\n" );
+ else
+ opt = opt.concat("<option value='",strk,"'>",strv,"</option>\n" );
+ }
+/* for (var key in arr)
{
if (arr[key].indexOf("inaktiv")>0)
opt = opt.concat("<option class='red' value='",key,"'>",arr[key],"</option>\n" );
else
opt = opt.concat("<option value='",key,"'>",arr[key],"</option>\n" );
}
+*/
opt += "</select>\n";
if (divId == 'addr')
newdiv.innerHTML += "<select name='rag[ra][]'>"+opt;
--- a/fhiiqm/report/keytyp_dep_anz_report.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/report/keytyp_dep_anz_report.php Wed Jul 31 15:10:48 2013 +0200
@@ -78,10 +78,13 @@
$_GET["s2"]= $ky["sort2"];
$_GET["z"] = $zeil;
- echo "<span class='sc'>";
- echo "<br /> <a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
- echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Übersicht Keytyp\" class=\"sc\">neuer Bericht Übersicht Schlüsseltypen</a>\n";
- echo "</span>";
+ if ($search)
+ {
+ echo "<span class='sc'>";
+ echo "<br /> <a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Übersicht Keytyp\" class=\"sc\">neuer Bericht Übersicht Schlüsseltypen</a>\n";
+ echo "</span>";
+ }
echo "<div align='center'>\n";
echo "<p><b>Bericht Übersicht Schlüsseltypen </b></p>\n";
@@ -146,7 +149,7 @@
<tr>
<td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
<?php
- $sort = array("-1"=>"","1"=>"Depot","2"=>"Schlüsseltyp");
+ $sort = array("-1"=>"","1"=>"Depot","2,3"=>"Schlüsseltyp");
for ($i=1; $i<3; $i++)
{
echo "$i. <select name='ky[sort$i]'>\n";
@@ -197,7 +200,7 @@
if ($ky["dep"]> -1) $where = " depot_ID = '$ky[dep]' ";
if ($ky["kt"]> -1)
- if ($where) $where .= "$bind keytyp_ID = '$ky[kt]' "; else $where = " keytyp_ID = '$ky[kt]'' ";
+ if ($where) $where .= "$bind keytyp_ID = '$ky[kt]' "; else $where = " keytyp_ID = '$ky[kt]' ";
if ($where) $where = " HAVING ($where)";
if ($ky["sort1"]>0 || $ky["sort2"]>0)
@@ -215,11 +218,11 @@
echo "error SELECT: " . $dbc -> error . "<br /><br />";
echo "sql = $sql<br />\n";
}
- if ($ky["dep"]> -1) $krit = " [Depot = '" . $ky["dep"] ."']";
+ if ($ky["dep"]> -1) $krit = " [Depot = <b>'" . $ky["dep"] ."'</b>]";
if ($ky["kt"] > -1)
{
if ($krit) $bd = " ".$bind; else $bd = "";
- $krit .= $bd." [Schlüsseltyp = '".$ky["kt"]."']";
+ $krit .= $bd." [Schlüsseltyp = <b>'".$ky["kt"]."'</b>]";
}
if ($krit )echo "Suchergebnis für $krit"; else echo "Suchergebnis\n";
printf ("<p>Anzahl Schlüsseltypen: %s</p>", $ianz);
@@ -234,12 +237,14 @@
echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
// Listenkopf
echo "<tr bgcolor='#68ACBF'>";
- echo "<th>Depot</th><th>Schlüsseltyp</th><th>Schlüsseltyp-Bezeichnung</th><th>Zugang</th><th>Abgang</th><th>Verlust</th><th>Bestand</th>";
+ if ($ky["dep"] == -1) echo "<td>Depot</td>";
+ echo "<th>Schlüsseltyp</th><th>Schlüsseltyp-Bezeichnung</th><th>Zugang</th><th>Abgang</th><th>Verlust</th><th>Bestand</th>";
foreach ($result as $row)
{
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
echo "<tr bgcolor='" . $bg . "'>";
- echo "<td>$row->depot_ID</td><td>$row->key_level - $row->keytyp_ID</td><td>$row->keytyp_bez</td>";
+ if ($ky["dep"] == -1) echo "<td>$row->depot_ID</td>";
+ echo "<td>$row->key_level - $row->keytyp_ID</td><td>$row->keytyp_bez</td>";
echo "<td class='right'>$row->anzget</td><td class='right'>$row->anzout</td><td class='right'>$row->anzlost</td><td class='right'>$row->bestand</td>";
echo "</tr>";
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/report/keytyp_dep_history_report.php Wed Jul 31 15:10:48 2013 +0200
@@ -0,0 +1,278 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 07/2013
+ *
+ * Report Historie Keytyp in Depots
+ */
+
+ error_reporting(E_ALL ^ E_NOTICE);
+
+ session_start();
+ if (! isset($_SESSION["userid"]))
+ {
+ include_once ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/func_lib.inc.php");
+ login($_SERVER["PHP_SELF"]);
+ exit;
+ }
+
+ if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
+ {
+ header("Location: start.php");
+ exit;
+ }
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+ // zulaessige Depots
+ $uid = $_SESSION["userid"];
+ $sql = "SELECT depot_ID FROM KeyDepot_userweb WHERE userid = '$uid'";
+ $res = $dbc -> queryObjectArray($sql);
+ foreach ($res as $row)
+ $adep[] = $row->depot_ID;
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+ <title>Report Historie Schlüsseltypen</title>
+</head>
+
+<body>
+
+<?php
+ echo " ";
+ echo "<div class=\"float-br smaller\" valign='top'>";
+ echo " user: " . $_SESSION["userid"];
+ echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+ echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/key.png\" border=\"0\" alt=\"Keytyp Ü:bersicht\" title=\"Schlüsseltypen im Depot\"/></div>\n";
+
+ $ky = $_POST["ky"]; // Parameter aus Form
+ $search = $_POST["search"];
+ if (!$search) $search = $_GET["s"];
+
+ $zeil = $ky["z"];
+ if (!$zeil) $zeil = $_GET["z"];
+ if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+ $start = $_GET["st"]; // Start bei DS $start+1
+ if (!$start) $start=0;
+
+ if (!is_array($ky))
+ {
+ $ky["dep"] = $_GET["d"];
+ $ky["kt"] = $_GET["k"];
+ $ky["bind"] = $_GET["b"];
+ $ky["sort1"] = $_GET["s1"];
+ $ky["sort2"] = $_GET["s2"];
+ }
+ $_GET["d"] = $ky["dep"];
+ $_GET["k"] = $ky["kt"];
+ $_GET["b"] = $ky["bind"];
+ $_GET["s1"]= $ky["sort1"];
+ $_GET["s2"]= $ky["sort2"];
+ $_GET["z"] = $zeil;
+
+ if ($search)
+ {
+ echo "<span class='sc'>";
+ echo "<br /> <a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Historie Keytyp\" class=\"sc\">neuer Bericht Historie Schlüsseltypen</a>\n";
+ echo "</span>";
+ }
+
+ echo "<div align='center'>\n";
+ echo "<p><b>Bericht Historie Schlüsseltypen </b></p>\n";
+ echo "</div>\n";
+
+
+ if (!$search)
+ {
+?>
+ <div align="center">
+ <p>Bitte Kriterien für die Suche wählen</p>
+ <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">
+ <table width="50%" border="0" cellspacing="3" cellpadding="3">
+ <tr>
+ <td>Depot</td>
+ <td><select name="ky[dep]">
+ <?php
+ if ($ky["dep"] == -1) $select = "selected='selected'"; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $strdep = "'". implode("','",$adep) ."'";
+ $sql = "SELECT * FROM fhiiqm.KeyDepot WHERE depot_ID IN ($strdep)";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ {
+ if ($row->depot_ID == $ky['dep']) $select = "selected='selected'"; else $select = "";
+ echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
+ }
+ $beg=0;
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Schlüsseltyp</td>
+ <td><select name="ky[kt]">
+ <?php
+ if ($ky["kt"] == -1) $select = "selected='selected'"; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT key_level,keytyp_ID,keytyp_bez
+ FROM Keytyp
+ ORDER BY key_level";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ {
+ if ($row->keytyp_ID == $ky['kt']) $select = "selected='selected'"; else $select = "";
+ echo "<option $select value=\"$row->keytyp_ID\">$row->key_level - $row->keytyp_ID [$row->keytyp_bez]</option>\n";
+ }
+ $beg=0;
+ ?>
+ </select>
+ </tr>
+ <tr>
+ <td>Verknüpfung</td>
+ <td>UND
+ <input type="radio" name="ky[bind]" value="AND" <?php if (isset($ky["bind"]) && $ky["bind"]=="AND") echo "checked='checked'"; else echo "checked='checked'";?>>
+ ODER
+ <input type="radio" name="ky[bind]" value="OR" <?php if (isset($ky["bind"]) && $ky["bind"]=="OR") echo "checked='checked'"; ?>></td>
+ </tr>
+ <tr>
+ <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+ <?php
+ $sort = array("-1"=>"","4"=>"Depot","1,2"=>"Schlüsseltyp", "5"=>"Datum");
+ for ($i=1; $i<4; $i++)
+ {
+ echo "$i. <select name='ky[sort$i]'>\n";
+ foreach ($sort as $key=>$val)
+ {
+ $rsort = "sort" . $i;
+ if ($ky[$rsort] == $val) $select = "selected='selected'"; else $select = "";
+ echo "<option $select value='$key'>$val</option>\n";
+ }
+ echo "</select> \n";
+ }
+ echo "</td></tr>\n";
+
+ $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+ echo "<tr><td>Zeilen/Seite?</td><td><select name='ky[z]'>\n";
+ if (!$ky['z']) $ky['z'] = 9999;
+ foreach ($azeil as $key=>$val)
+ {
+ if ($key == $ky['z']) $select = "selected='selected'"; else $select = "";
+ echo "<option $select value='$key'>$val</option>\n";
+ }
+ echo "</select></td></tr>\n";
+
+ ?>
+ <tr>
+ <td> </td>
+ <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+ </tr>
+ </table>
+ </div>
+ </form>
+<?php
+ }
+ else
+ {
+
+ echo "<div align='center'>\n";
+ $sql = "SELECT key_level, d.keytyp_ID,keytyp_bez,depot_ID,depot_date,depot_action,depot_anz,depot_bem
+ FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID";
+
+ $lim = " LIMIT $start,$zeil";
+
+ if (!$ky["bind"]) $bind = " AND "; else $bind = $ky["bind"];
+
+ if ($ky["dep"]> -1) $where = " depot_ID = '$ky[dep]' ";
+ if ($ky["kt"]> -1)
+ if ($where) $where .= "$bind d.keytyp_ID = '$ky[kt]' "; else $where = " d.keytyp_ID = '$ky[kt]' ";
+ if ($where) $where = " WHERE ($where)";
+
+ if ($ky["sort1"]>0 || $ky["sort2"]>0)
+ {
+ if ($ky["sort1"]>0) $ord = " ORDER BY " . $ky["sort1"];
+ if ($ky["sort2"]>0) $ord .= ",".$ky["sort2"];
+ }
+
+ $sql .= $where;
+ $ianz = $dbc -> numrows($sql);
+ $sql .= $ord . $lim;
+ $result = $dbc ->queryObjectArray($sql);
+ if ($dbc -> error)
+ {
+ echo "error SELECT: " . $dbc -> error . "<br /><br />";
+ echo "sql = $sql<br />\n";
+ }
+ if ($ky["dep"]> -1) $krit = " [Depot = <b>'" . $ky["dep"] ."'</b>]";
+ if ($ky["kt"] > -1)
+ {
+ if ($krit) $bd = " ".$bind; else $bd = "";
+ $krit .= $bd." [Schlüsseltyp = <b>'".$ky["kt"]."'</b>]";
+ }
+ if ($krit )echo "Suchergebnis für $krit"; else echo "Suchergebnis\n";
+ printf ("<p>Anzahl Transaktionen: %s</p>", $ianz);
+
+ if ($result)
+ {
+ include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+ $aaction = array("get" => "erhalten", "out" => "ausgegeben", "lost" => "verloren");
+
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+ echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ echo "<th>Schlüsseltyp</th><th>Schlüsseltyp-Bezeichnung</th>";
+ if ($ky["dep"] == -1) echo "<th>Depot</th>";
+ echo "<th>Datum</th><th>Aktion</th><th>Anzahl</th><th>Bemerkung</th>";
+ foreach ($result as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'>";
+ echo "<td>$row->key_level - $row->keytyp_ID</td><td>$row->keytyp_bez</td>";
+ if ($ky["dep"] == -1) echo "<td>$row->depot_ID</td>";
+ $ddate = new DateTime($row->depot_date);
+ echo "<td>".$ddate->format("d.m.Y")."</td><td>".$aaction["$row->depot_action"]."</td><td class='right'>$row->depot_anz</td><td>$row->depot_bem</td>";
+ echo "</tr>";
+ }
+ echo "</table>\n";
+ echo "<p></p><table width=40%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+ <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+ echo "</div>\n";
+
+ echo "<br /> ";
+ if ($search != 2) // Aufruf aus fhiiqm
+ {
+ // Parameter aus $_GET fuer weitere Seiten
+ $_GET["s"] = 1; // bewirkt weitere Suche
+ foreach ($_GET as $key=>$val)
+ {
+ if ($key != "st") $liste .= "&" . $key ."=".$val;
+ }
+ // Links auf andere Seiten generieren
+ liste_links($start,$zeil,$ianz,$liste);
+ }
+ }
+ else
+ {
+ echo "<p class='red'> Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+ echo "</div>\n";
+ echo "<br /> ";
+ }
+ echo "<span class='sc'>";
+ echo "<br /><br /> <a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Historie Keytyp\" class=\"sc\">neuer Bericht Historie Schlüsseltypen</a>\n";
+ echo "</span>";
+ }
+?>
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/start.php Mon Jul 01 14:36:18 2013 +0200
+++ b/fhiiqm/start.php Wed Jul 31 15:10:48 2013 +0200
@@ -11,6 +11,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+<!DOCTYPE html>
+<html>
+-->
<head>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
@@ -33,7 +37,13 @@
include_once($_SERVER["DOCUMENT_ROOT"] . "/fhiiqm/inc/menu.inc.php");
- echo "<p><br /> <a href='/fhiiqm/infos/123_fhiiqm_anwenderdoc.pdf' title='Anwenderdokumentaion' target='_blank'>Anwender-Dokumentation</a></p>\n";
+ echo "<p><br /> <a href='/fhiiqm/infos/123_fhiiqm_anwenderdoc.pdf' title='Anwenderdokumentaion' target='_blank'>Anwender-Dokumentation (Gesamt)</a><br /> </p>\n";
+ if (in_array("mte",$_SESSION["recht"]))
+ echo "<p> <a href='/fhiiqm/infos/237_fhiiqm_telefon.pdf' title='Mitarbeiter - Telefon' target='_blank'>Mitarbeiter-Telefon erfassen, -Liste</a></p>\n";
+ if (in_array("kr",$_SESSION["recht"]) || in_array("ke",$_SESSION["recht"]))
+ echo "<p> <a href='/fhiiqm/infos/251_fhiiqm_keytyp.pdf' title='Schlüsselverwaltung' target='_blank'>Schlüsselverwaltung</a></p>\n";
+ if (in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
+ echo "<p> <a href='/fhiiqm/infos/186_fhiiqm_raumverantw.pdf' title='Raumverantwortliche' target='_blank'>Raumverantwortliche erfassen</a></p>\n";
if (date("Y-m-d") < date("Y-m-d", mktime(0,0,0,12,25,2012)))
{
echo "<p> </p><p class='red'>
@@ -47,7 +57,9 @@
?>
</div>
-<div id="renavi" align="right"><img src="/fhiiqm/img/fhi.jpg" border="0" alt="FHI" width="100%"/> </div>
+<div id="renavi" align="right"><img src="/fhiiqm/img/fhi.jpg" border="0" alt="FHI" width="100%"/>
+<span class="smaller">Foto: Bettina Schwarzer [Juli 2011]</span>
+</div>
</body>
</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/test/test_html_keygen.php Wed Jul 31 15:10:48 2013 +0200
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 7/2013
+ */
+
+
+if (!$_POST)
+{
+?>
+<!DOCTYPE html>
+<html>
+<body>
+
+<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post">
+ Username: <input type="text" name="usr_name">
+ Encryption: <keygen name="security">
+ <input type="submit">
+</form>
+
+<p><strong>Note:</strong> The keygen tag is not supported in Internet Explorer.</p>
+
+<?php
+}
+else echo "user = " . $_POST["usr_name"] . "<br />encryption = ".$_POST["security"] . "<br />";
+?>
+</body>
+</html>
\ No newline at end of file