--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/form/laser_search_form.inc.php Fri Jan 17 08:50:55 2014 +0100
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 10/2013
+ *
+ * Form Recherche Laser
+ *
+ */
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+ $okn = true;
+
+?>
+<div align="center">
+<h3><font face="Verdana, Arial, Helvetica, sans-serif"></font></h3>
+<p>Bitte Kriterien für die Suche wählen</p>
+</div>
+<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_las" target="_self">
+<div align="center">
+<table width="50%" border="0" cellspacing="3" cellpadding="3">
+ <tr>
+ <td>Abteilung</td>
+ <td>
+ <select name="las[abt]" size="1">
+ <?php
+ if ($las["abt"] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT abt_name, abt_long FROM Abteilung WHERE abt_ID < 6 ORDER BY abt_ID"; // nur wiss. Abt.
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->abt_name == $las['abt'])
+ echo "<option selected value=\"$row->abt_name\">$row->abt_name - $row->abt_long</option>\n";
+ else
+ echo "<option value=\"$row->abt_name\">$row->abt_name - $row->abt_long</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Haus</td>
+ <td>
+ <select name="las[geb]" size="1" onchange="this.form.submit();">
+ <?php
+ if ($las["geb"] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT geb_ID, geb_name FROM Haus ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->geb_ID == $las['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>
+ </td>
+ </tr>
+ <tr>
+ <td>Raum-Nummer</td>
+ <td><select name="las[rnum]">
+ <?php
+ if ($las["rnum"] == "0") $select = " selected "; else $select = "";
+ echo "<option $select value=\"0\"></option>\n";
+ if (isset($las["geb"]) && $las["geb"] > "") $where = " WHERE geb_ID = '".$las["geb"]."'"; else $where = "";
+ echo "Gebaeude: ".$las["geb"]."<br />\n";
+ $sql = "SELECT geb_ID, raum_ID,raum_nr,raum_name FROM fhiiqm.Raum $where ORDER BY 1,3";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->raum_ID == $las['rnum'])
+ echo "<option selected value=\"$row->raum_ID\">$row->geb_ID - $row->raum_nr, $row->raum_name</option>\n";
+ else
+ echo "<option value=\"$row->raum_ID\">$row->geb_ID - $row->raum_nr, $row->raum_name</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Laser-Klasse</td>
+ <td><select name="las[kl]">
+ <?php
+ if ($las["kl"] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT las_klasse_ID,las_klasse_bez FROM fhiiqm.Laser_Klasse
+ ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->las_klasse_ID == $las['kl'])
+ echo "<option selected value=\"$row->las_klasse_ID\">$row->las_klasse_bez</option>\n";
+ else
+ echo "<option value=\"$row->las_klasse_ID\">$row->las_klasse_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Verknüpfung</td>
+ <td>UND
+ <input type="radio" name="las[bind]" value="AND" <?php if (isset($las["bind"]) && $las["bind"]=="AND") echo "checked"; else echo "checked";?>>
+ ODER
+ <input type="radio" name="las[bind]" value="OR" <?php if (isset($las["bind"]) && $las["bind"]=="OR") echo "checked"; ?>></td>
+ </tr>
+ <tr>
+ <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+ <?php
+ $sort = array("-1"=>"","4"=>"Abteilung","5"=>"Haus","7"=>"Raum-Nr.","3"=>"Klasse");
+ for ($i=1; $i<3; $i++)
+ {
+ echo "$i. <select name='las[sort$i]'>\n";
+ foreach ($sort as $key=>$val)
+ {
+ $rsort = "sort" . $i;
+ if ($las[$rsort] == $val) $select= " selected"; else $select = "";
+ echo "<option$select value='$key'>$val</option>\n";
+ }
+ echo "</select> \n";
+ }
+ echo "</td></tr>\n";
+
+ $azeil = array(1=>'1',10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+ echo "<tr><td>Zeilen/Seite?</td><td><select name='las[z]'>\n";
+ if (!$las['z']) $las['z'] = 9999;
+ foreach ($azeil as $key=>$val)
+ {
+ if ($key == $las['z']) $select = "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>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/form/ma_tel_ed_form.inc.php Fri Jan 17 08:50:55 2014 +0100
@@ -0,0 +1,356 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 11/2012, 12/2013
+ *
+ * Form Mitarbeiter/Objekte FHI
+ */
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+ $okn = true;
+ if (!$ma)
+ {
+ $ma['geb'] = 'A';
+ $ma['fhi'] = '1';
+ $ma['abt'][0] = $dbc -> querySingleItem("SELECT abt_ID FROM Abteilung ORDER BY abt_ID+0 LIMIT 0,1");
+ $ma['so'][0] = 1;
+ }
+
+?>
+<div align="center">
+<h5>* - Felder sind erforderlich!</h5>
+</div>
+<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_ma">
+<div align="center">
+<table width="65%" border="0" cellspacing="3" cellpadding="3">
+ <tr>
+ <td>
+ <u>Mitarbeiter</u> FHI?
+ </td>
+ <td><select name="ma[fhi]" id="fhi" size="1" onchange="this.form.submit();" >
+ <?php
+ $akt = array("0"=>"inaktiv","1"=>"aktiv","2"=>"Objekt","-1"=>"Gast");
+ foreach ($akt as $key=>$value)
+ {
+ if ($ma['fhi'] == $key) $select = " selected='selected'"; else $select="";
+ echo "<option$select value='$key'>$value</option>\n";
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <?php if ($ma["fhi"] == 2) echo "<td>Bezeichnung 1 *</td>\n";
+ else echo "<td>Name *</td>\n"; ?>
+ <td><input name="ma[name]" id="nname" type="text" size="30" maxlength="50" value="<?php echo $ma['name']; ?>" />
+ <?php
+ if (isset($ma['name']) && $ma['name']<'!')
+ {
+ echo "<br><span class=\"red\">Name ist erforderlich!</span>\n";
+ $okn = false;
+ }
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <?php if ($ma["fhi"] == 2) echo "<td>Bezeichnung 2 </td>\n";
+ else echo "<td>Vorname </td>\n"; ?>
+ <td><input name="ma[vname]" id="vname" type="text" size="30" maxlength="50" value="<?php echo $ma['vname']; ?>" />
+ <?php
+ /* if (isset($ma['vname']) && $ma['vname']<'!')
+ {
+ echo "<br><span class=\"red\">Vorname ist erforderlich!</span>\n";
+ $okn = false;
+ } */
+ ?>
+ </td>
+ </tr>
+ <?php if ($ma["fhi"] != 2) { ?>
+ <tr>
+ <td>Titel</td>
+ <td><input name="ma[titel]" type="text" size="30" maxlength="30" value="<?php echo $ma['titel']; ?>" /></td>
+ </tr>
+ <?php } ?>
+ <tr><td>Ort</td>
+ <td valign="top">Haus
+ <select name="ma[geb]" onchange="this.form.submit();">
+ <?php
+ if ($ma['geb'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $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 == $ma['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="ma[raum]">
+ <?php
+ if ($ma['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='" . $ma['geb'] ."' ORDER BY 2";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->raum_ID == $ma['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>
+<?php
+/* // deaktiviert am 08.01.2013, Kaendler, Schwarzer
+ echo
+ "<tr>
+ <td>Arbeitsgruppe</td>
+ <td><select name=\"ma[rag]\">";
+ if ($ma['rag'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT rag_ID, rag_bez, abt_name FROM RaumArb_Gruppe g INNER JOIN Abteilung a
+ ON g.abt_ID = a.abt_ID ORDER BY g.abt_ID,rag_ID";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->rag_ID == $ma['rag'])
+ {
+ echo "<option selected value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+ }
+ else
+ echo "<option value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+ }
+ }
+ echo
+ "</select>
+ </td>
+ </tr>";
+*/
+?>
+ <tr>
+ <td>Telefon</td>
+ <td><div id="addtel">
+ <select name="ma[tel][]" size="1">
+ <?php
+ $select = null;
+ $select = ( "-1"==$ma['tel'][0] ) ? " selected='selected'" : "";
+ echo "<option $select value=\"-1\"></option>\n";
+/* $sql = "SELECT telefon_nr,geb_ID,raum_nr, telefon_typ FROM fhiiqm.Telefon t
+ LEFT OUTER JOIN Raum r ON t.raum_ID=r.Raum_ID
+ ORDER BY telefon_nr"; */
+ $sql = "SELECT telefon_nr, telefon_typ FROM fhiiqm.Telefon
+ ORDER BY telefon_nr";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->telefon_typ == "fax") $teln = $row->telefon_nr." FAX"; else $teln = $row->telefon_nr;
+// if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
+ $select = ( $row->telefon_nr==$ma['tel'][0] ) ? " selected='selected'" : "";
+ echo "<option $select value=\"$row->telefon_nr\">$teln</option>\n";
+// $tel .= "'".$row->telefon_nr. "':'" . $teln ." ". $telr. "',";
+ $tel .= "'".$row->telefon_nr. "':'" . $teln . "',";
+ }
+ }
+ $tel = substr($tel,0,strlen($tel)-1);
+ ?>
+ </select>
+ <script type="text/javascript">
+ <!--
+ arr = {<?php echo ($tel); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ //-->
+ </script>
+ oder neu <input name="ma[ntel][]" type="text" size="20" maxlength="20" value="<?php echo $ma['ntel'][0]; ?>" />
+ Priorität <select name="ma[so][]" size="1">
+ <?php
+ $select = ($ma["so"][0] == '-1')? " selected='selected'" : "";
+ echo "<option$select value=-1></option>\n";
+ for ($i=1; $i<10; $i++)
+ {
+ $select=($ma["so"][0] == $i)? " selected='selected'" : "";
+ echo "<option$select value=$i>$i</option>\n";
+ }
+ ?>
+ </select>
+ öffentlich <input name="ma[pub][]" type="checkbox" value="1" <?php if ($ma['pub'][0]) echo "checked"; ?> />
+ <a href="<?php echo "javascript:addInput('addtel');" ?>" title="weitere Telefon-Nr."><img src="/fhiiqm/img/add.png" /></a>
+ <a href="<?php echo "javascript:delInput('addtel');" ?>" title="löschen letzte Telefon-Nr."><img src="/fhiiqm/img/delete.png" /></a><br />
+ <?php
+ if (isset($ma) && (!$ok || $sub))
+ {
+ if (count($ma['ntel'])>1 || count($ma['tel'])>1)
+ {
+ $i=0;
+ foreach ($ma['tel'] as $atel)
+ {
+ if ($i>0)
+ {
+ echo "<span></span><select name=\"ma[tel][]\" size=\"1\">";
+
+ $select = ( "-1" == $atel ) ? ' selected' : null;
+ echo "<option $select value=\"-1\"></option>\n";
+ foreach ($result as $row)
+ {
+ if ($row->telefon_typ == "fax") $teln = $row->telefon_nr." FAX"; else $teln = $row->telefon_nr;
+// if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
+ $select = ( $row->telefon_nr == $atel ) ? ' selected' : null;
+ echo "<option $select value=\"$row->telefon_nr\">$teln</option>\n";
+ }
+ echo "</select>";
+ echo " oder neu <input name=\"ma[ntel][]\" type=\"text\" size=\"20\" maxlength=\"20\" value=\"".$ma['ntel'][$i]."\" />";
+ echo " Priorität <select name=\"ma[so][]\" size=\"1\">";
+
+ $select = ( $ma["so"][$i] == "-1" ) ? " selected='selected'" : "";
+ echo "<option$select value=\"-1\"></option>\n";
+ for ($j=1; $j<10; $j++)
+ {
+ $select=($ma["so"][$i] == $j)? " selected='selected'" : "";
+ echo "<option$select value=$j>$j</option>\n";
+ }
+ echo "</select>\n";
+ echo " öffentlich <input name=\"ma[pub][$i]\" type=\"checkbox\" value=\"1\"";
+ $check = ($ma['pub'][$i]) ? " checked='checked'" : "" ;
+ echo "$check /><br />\n";
+ }
+ $i++;
+ }
+ }
+ }
+ ?>
+ </div>
+ </td>
+ </tr>
+ <?php if ($ma["fhi"]) { ?>
+ <tr>
+ <td>E-Mail</td>
+ <td><input name="ma[email]" id="email" type="text" size="30" maxlength="100" value="<?php echo $ma['email']; ?>" /></td>
+ </tr>
+ <?php } ?>
+ <tr><td>Abteilung *</td>
+ <td valign="top"><div id="addabt">
+ <select name="ma[abt][]" onchange="this.form.submit();">
+ <?php
+ $sql = "SELECT abt_ID, abt_name, abt_long FROM `fhiiqm`.`Abteilung` ORDER BY abt_ID+0";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->abt_ID == $ma['abt'][0])
+ echo "<option selected value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ else
+ echo "<option value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ $abt .= "'".$row->abt_ID. "':'" . $row->abt_name .": ". $row->abt_long . "',";
+ }
+ $abt = substr($abt,0,strlen($abt)-1);
+ }
+ ?>
+ </select>
+
+ Arbeitsgruppe
+ <select name="ma[rag][]">
+ <?php
+ if ($ma['rag'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT rag_ID, rag_bez FROM `fhiiqm`.`RaumArb_Gruppe` WHERE abt_ID = " .$ma["abt"][0] . " ORDER BY rag_bez";
+ if ($resrag = $dbc->queryObjectArray($sql))
+ {
+ foreach ($resrag as $row)
+ {
+ if ($row->rag_ID == $ma['rag'][0])
+ echo "<option selected value=\"$row->rag_ID\">$row->rag_bez</option>\n";
+ else
+ echo "<option value=\"$row->rag_ID\">$row->rag_bez</option>\n";
+// $rag .= "'".$row->rag_ID. "':'" . $row->rag_bez . "',";
+ }
+// $rag = substr($rag,0,strlen($rag)-1);
+ }
+ $sql = "SELECT rag_ID, rag_bez, abt_name, g.abt_ID FROM RaumArb_Gruppe g INNER JOIN Abteilung a
+ ON g.abt_ID = a.abt_ID ORDER BY g.abt_ID,rag_ID";
+ if ($res = $dbc->queryObjectArray($sql))
+ {
+ foreach ($res as $row)
+ {
+ $faktor = ($row->abt_ID*1000)+$row->rag_ID; // wegen sort nach Abt. fuer JS, z.B. 7047
+ $rag .= "'".$faktor. "':'" . $row->abt_name . ": ". $row->rag_bez . "',";
+ }
+ $rag = substr($rag,0,strlen($rag)-1);
+ }
+ ?>
+ </select>
+ <script type="text/javascript">
+ <!--
+ arra = {<?php echo ($abt); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ arrg = {<?php echo ($rag); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ //-->
+ </script>
+ <a href="<?php echo "javascript:addInput('addabt');" ?>" title="weitere Arbeitsgruppe"><img src="/fhiiqm/img/add.png" /></a>
+ <a href="<?php echo "javascript:delInput('addabt');" ?>" title="löschen letzte Arbeitsgruppe"><img src="/fhiiqm/img/delete.png" /></a><br />
+ <?php
+ if (isset($ma) && (!$ok || $sub))
+ {
+ if (count($ma['abt'])>1 || count($ma['rag'])>1)
+ {
+ $i=0;
+ foreach ($ma['abt'] as $eabt)
+ {
+ if ($i>0)
+ {
+ echo "<span></span><select name=\"ma[abt][]\" size=\"1\">";
+
+ foreach ($result as $row)
+ {
+ $select = ( $row->abt_ID == $eabt ) ? ' selected' : null;
+ echo "<option $select value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ }
+ echo "</select>";
+ echo " Arbeitsgruppe ";
+ echo "<select name='ma[rag][]' size=1>";
+ $select = ( $ma["rag"][$i] == "-1" ) ? " selected='selected'" : "";
+ echo "<option$select value=\"-1\"></option>\n";
+ foreach ($res as $row)
+ {
+ $select = ( $row->rag_ID == $ma['rag'][$i] ) ? ' selected' : null;
+ echo "<option $select value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+ }
+ echo "</select>";
+ echo "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' /><br />\n";
+ }
+ $i++;
+ }
+ }
+ }
+ ?>
+ </div>
+ </td>
+ </tr>
+<?php
+ if ($ma["tstmp"] && $ma["tstmp"]>0)
+ {
+ echo "<tr><td>letzte Änderung</td>";
+ $ts = new DateTime($ma["tstmp"]);
+ echo "<td>".$ts->format('d.m.Y H:i:s');
+ }
+ if (isset($ma["uid"]) && $ma["uid"])
+ echo " (".$ma["uid"] .")";
+ echo "</td></tr>\n";
+?>
+ <input type="hidden" name="ma[abtm]" value="<?php echo $ma['abtm']; ?>" />
+ <input type="hidden" name="okn" value="<?php echo $okn; ?>" />
+<!--
+</table>
+ </div>
+</form>
+-->
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/form/prozess_rag_form.inc.php Fri Jan 17 08:50:55 2014 +0100
@@ -0,0 +1,381 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 03/2012
+ *
+ * Form Prozess
+ *
+ */
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+ $okn = true;
+
+
+ echo "<div align=\"center\">";
+
+?>
+<h5>* - Felder sind erforderlich!</h5>
+</div>
+<!-- <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_svc"> -->
+<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="multipart/form-data" name="form_info" target="_self">
+<div align="center">
+<table width="60%" border="0" cellspacing="3" cellpadding="3">
+ <tr>
+ <td>Projekt-Bezeichnung *</td>
+ <td><input name="pz[bez]" id="bez" type="text" size="50" maxlength="50" value="<?php echo $pz['bez']; ?>" />
+ <?php
+ if (isset($pz['bez']) && $pz['bez']<'!')
+ {
+ echo "<br><span class=\"red\">Projektbezeichnung ist erforderlich!</span>\n";
+ $okn = false;
+ }
+ if ($pzid)
+ {
+ echo " Projekt-ID";
+ echo " <input class='read right' name='pz[pzid]' type='text' size='5' value='" .$pz['pzid']."' readonly='readonly' />";
+ }
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <td>Projekt-Beschreibung</td>
+ <td><textarea name="pz[bezl]" cols="80" rows="3"><?php echo $pz["bezl"]; ?></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td>zugeordnet zu Produkt *</td>
+ <td>
+ <select name="pz[prid]" size="1">
+ <?php
+ if (is_array($pz['prid'])) $select = in_array( "-1", $pz['prid'] ) ? ' selected' : null;
+ echo "<option $select value=\"-1\"></option>\n";
+/* $sql = "SELECT DISTINCT ip.produkt_ID,prod_name
+ FROM Info i LEFT OUTER JOIN Info_Produkt ip
+ ON i.info_ID=ip.info_ID LEFT OUTER JOIN Info_Verantwortlich v
+ ON i.info_ID=v.info_ID INNER JOIN Produkt p
+ ON ip.produkt_ID=p.produkt_ID INNER JOIN Mitarbeiter m
+ ON v.persknr=m.persknr
+ WHERE i.infotyp_ID=6 and v.persknr=$persknr
+ ORDER BY ip.produkt_ID";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if (strlen($row->prod_name) > 70)
+ $prod=str_replace(" "," ",htmlentities(substr($row->prod_name,0,70))) ."...";
+ else
+ $prod=str_replace(" "," ",htmlentities($row->prod_name));
+ $select = ($row->produkt_ID == $pz['prid'] && $pz['prid']>0) ? ' selected' : null;
+ echo "<option $select value=\"$row->produkt_ID\">$prod</option>\n";
+ }
+ }
+*/
+ // Recht Produktgruppe beruecksichtigen
+ if (is_array($_SESSION["prodg"]))
+ {
+ foreach ($_SESSION["prodg"] as $val)
+ $listg .= "," .$val;
+ $listg = substr($listg,1);
+ echo "prodg = $listg<br />";
+ $sql = "CALL fhiiqm.hier_prodgroup('$listg')";
+ }
+ else
+ $sql = "CALL fhiiqm.prod_hiera_all(0,0)";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if (strlen($row->bez) > 70)
+ $prod=str_replace(" "," ",htmlentities(substr($row->bez,0,70))) ."...";
+ else
+ $prod=str_replace(" "," ",htmlentities($row->bez));
+ if ($row->prid >0) $color=" class='green'"; else $color="";
+ if ($row->prid == $pz['prid'])
+ echo "<option $color selected value=\"$row->prid\">$prod</option>\n";
+ else
+ echo "<option $color value=\"$row->prid\">$prod</option>\n";
+ }
+ }
+ echo "
+ </select>\n";
+ echo "<br />bitte 1 <font color='green'>grünen</font> Eintrag wählen";
+
+ if (isset($pz) && $pz['prid']<1)
+ {
+ echo "<br><span class=\"red\">Produktzuordnung muss erfolgen!</span>\n";
+ $okn = false;
+ }
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <td>Auftraggeber</td>
+ <td><input type="text" name="pz[persa]" id="persa" value="<?php echo $pz['persa']; ?>"/>
+ Eingabe von mind. 2 Zeichen -> Namensliste
+ </td>
+ </tr>
+ <tr>
+ <td>Verantwortlicher</td>
+ <td><input type="text" name="pz[pers]" id="pers" value="<?php echo $pz['pers']; ?>"/>
+ Eingabe von mind. 2 Zeichen -> Namensliste
+ </td>
+ </tr>
+ <tr><td>gehört zu Projekt</td>
+ <td><select name="pz[pzref]">
+ <?php
+ if ($pz['pzref'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ if (isset($pz["pzid"]) && $pz["pzid"]>0) $where = " WHERE proz_ID != " . $pz["pzid"]; else $where="";
+ $sql = "SELECT proz_ID, proz_bez FROM Prozess $where ORDER BY 2";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->proz_ID == $pz['pzref'])
+ echo "<option selected value=\"$row->proz_ID\">$row->proz_ID - $row->proz_bez</option>\n";
+ else
+ echo "<option value=\"$row->proz_ID\">$row->proz_ID - $row->proz_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Plan Start-Datum</td>
+ <td><input class="long10" name="pz[psdat]" id="psdat" value="<?php echo $pz['psdat']; ?>" />
+ Plan Ende-Datum
+ <input class="long10" name="pz[pedat]" id="pedat" value="<?php echo $pz['pedat']; ?>" />
+ Plan Kosten (€)
+ <input class='right' name="pz[pkost]" type="text" value="<?php echo $pz["pkost"]; ?>" /></td>
+ </tr>
+ <tr>
+ <td>Start-Datum</td>
+ <td><input class="long10" name="pz[sdat]" id="sdat" value="<?php echo $pz['sdat']; ?>" />
+ Ende-Datum
+ <input class="long10" name="pz[edat]" id="edat" value="<?php echo $pz['edat']; ?>" />
+ Kosten (€)
+ <input class='right' name="pz[kost]" type="text" value="<?php echo $pz["kost"]; ?>" /></td>
+ </tr>
+<!-- <tr>
+ <td>Prozess-Kategorie</td>
+ <td><select name="pz[kat]">
+ <?php
+/* if ($pz['kat'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT proz_kat_ID,proz_kat_bez FROM Proz_Kategorie ORDER BY 2";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->proz_kat_ID == $pz['kat'])
+ echo "<option selected value=\"$row->proz_kat_ID\">$row->proz_kat_bez</option>\n";
+ else
+ echo "<option value=\"$row->proz_kat_ID\">$row->proz_kat_bez</option>\n";
+ }
+ }
+*/ ?>
+ </select>
+ </td>
+ </tr> -->
+ <tr>
+ <td>Arbeitschritte</td>
+ <td>
+ <div id="add">
+ <input name="pz[step][]" type="text" size="50" maxlength="50" value="<?php echo $pz['step'][0]; ?>" />
+ Status <select name="pz[ststat][]">
+ <?php
+ if (isset($pz['step'])) $anzstep = count($pz['step']); else $anzstep = 1;
+ if ($pz['ststat'][0] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT proz_stat_ID,proz_stat_bez FROM Proz_Status ORDER BY 1";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->proz_stat_ID == $pz['ststat'][0])
+ echo "<option selected value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
+ else
+ echo "<option value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
+ $stat .= "'".$row->proz_stat_ID. "':'" . $row->proz_stat_bez . "',";
+ $sta[$row->proz_stat_ID] = $row->proz_stat_bez;
+ }
+ }
+ $stat = substr($stat,0,strlen($stat)-1);
+ echo "</select>";
+ echo " Sort <input type='text' name=\"pz[sort][]\" class='right' size=\"2\" maxlen=\"2\" value=\"". $pz['sort'][0]. "\" /><br />\n";
+ echo " Bemerkung zu Schritt ";
+ echo "<input name=\"pz[stbem][]\" maxlen=\"50\" size=\"50\" value='".$pz["stbem"][0]."' />";
+ ?>
+ <script type="text/javascript">
+ <!--
+ arr = {<?php echo ($stat); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ //-->
+ </script>
+
+
+
+ <a href="<?php echo "javascript:addInput('add',$anzstep);" ?>" id="badd" title="Schritt hinzufügen"><img src="/fhiiqm/img/add.png" border="0" /></a>
+ <a href="<?php echo "javascript:markdelInput('add',$anzstep);" ?>" id="bdel" title="Schritt entfernen"><img src="/fhiiqm/img/delete.png" border="0" /></a>
+ <?php
+ if ($pzid || ($sub && isset($pz) && !$ok))
+ {
+ if (count($pz['step'])>1)
+ {
+ $i=0;
+ foreach ($pz['step'] as $akt)
+ {
+ if ($i>0)
+ {
+ echo "<span></span><br /><input name=\"pz[step][]\" type=\"text\" size=\"50\" maxlength=\"50\" value=\"" .$pz['step'][$i] . "\" />\n";
+ echo " Status <select name='pz[ststat][]'>";
+ if ($pz['ststat'][$i] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ foreach ($sta as $key => $value)
+ {
+ $select = ($key == $pz['ststat'][$i])? " selected='selected'" : "";
+ echo "<option$select value=\"$key\">$value</option>\n";
+ }
+ echo "</select>";
+ echo " Sort <input type='text' name='pz[sort][]' class='right' size='2' maxlen='2' value='".$pz['sort'][$i] ."' />";
+ if (isset($pz['del'])) $cls = "dispil"; else $cls = "pr";
+ if (isset($pz['del'][$i])) $chk = "checked = ' checked'"; else $chk ="";
+ echo "<span id='cbl_$i'> <input class='$cls' type='checkbox' id='del_$i' name='pz[del][$i]' value='1'$chk /></span>
+ <span id='lb_$i' class='$cls'> löschen?</span>";
+ echo "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />\n";
+ echo "<br /> Bemerkung zu Schritt ";
+ echo "<input name=\"pz[stbem][]\" maxlen=\"50\" size=\"50\" value=\"".$pz["stbem"][$i]."\" />\n";
+ }
+ $i++;
+ }
+ }
+ }
+ ?>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>Projekt-Dringlichkeit</td>
+ <td><select name="pz[urg]">
+ <?php
+ if ($pz['urg'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT proz_urg_ID,proz_urg_bez FROM Proz_Dringlichkeit ORDER BY 1";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->proz_urg_ID == $pz['urg'])
+ echo "<option selected value=\"$row->proz_urg_ID\">$row->proz_urg_bez</option>\n";
+ else
+ echo "<option value=\"$row->proz_urg_ID\">$row->proz_urg_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Projekt-Status</td>
+ <td><select name="pz[stat]">
+ <?php
+ if ($pz['stat'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT proz_stat_ID,proz_stat_bez FROM Proz_Status ORDER BY 1";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->proz_stat_ID == $pz['stat'])
+ echo "<option selected value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
+ else
+ echo "<option value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>betroffene AGs</td>
+ <td>
+ <div id="addrag">
+ <select name="pz[rag][]">
+ <?php
+ if (isset($pz['rag'])) $anzrag = count($pz['rag']); else $anzrag = 1;
+ if ($pz['rag'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT rag_ID,rag_bez,rag_bezk,abt_name,rag.abt_ID
+ FROM fhiiqm.RaumArb_Gruppe rag
+ LEFT OUTER JOIN Abteilung a ON rag.abt_ID=a.abt_ID
+ ORDER BY rag.abt_ID,rag_bez";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->rag_ID == $pz['rag'][0]) $select = " selected "; else $select = "";
+ echo "<option$select value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+ $faktor = ($row->abt_ID*1000)+$row->rag_ID; // wegen sort nach Abt. fuer JS, z.B. 7047
+ $rag .= "'".$faktor. "':'" . $row->abt_name.": ". $row->rag_bez . "',";
+ $ag[$row->rag_ID] = $row->abt_name.": ". $row->rag_bez;
+ }
+ }
+ $rag = substr($rag,0,strlen($rag)-1);
+ ?>
+ </select>
+ <script type="text/javascript">
+ <!--
+ arrag = {<?php echo ($rag); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ //-->
+ </script>
+
+
+ <a href="<?php echo "javascript:addInput('addrag',$anzrag);" ?>" id="badd" title="AG hinzufügen"><img src="/fhiiqm/img/add.png" border="0" /></a>
+ <a href="<?php echo "javascript:markdelInput('addrag',$anzrag);" ?>" id="bdel" title="AG entfernen"><img src="/fhiiqm/img/delete.png" border="0" /></a>
+ <?php
+ if ($pzid || ($sub && isset($pz) && !$ok))
+ {
+ if (count($pz['rag'])>1)
+ {
+ $i=0;
+ foreach ($pz['rag'] as $akt)
+ {
+ if ($i>0)
+ {
+ echo "<span></span><br /><select name='pz[rag][]'>";
+ if ($pz['rag'][$i] == -1) $select = " select='selected' "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ foreach ($ag as $key => $value)
+ {
+ $select = ($key == $pz['rag'][$i])? " selected='selected'" : "";
+ echo "<option$select value=\"$key\">$value</option>\n";
+ }
+ echo "</select>";
+ if (isset($pz['delag'])) $cls = "dispil"; else $cls = "pr";
+ if (isset($pz['delag'][$i])) $chk = "checked = ' checked'"; else $chk ="";
+ echo "<span id='cblag_$i'> <input class='$cls' type='checkbox' id='delag_$i' name='pz[delag][$i]' value='1'$chk /></span>
+ <span id='lbag_$i' class='$cls'> löschen?</span>";
+ echo "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />\n";
+ }
+ $i++;
+ }
+ }
+ }
+ ?>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>Bemerkung</td>
+ <td><textarea name="pz[bem]" cols="80" rows="6"><?php echo $pz["bem"]; ?></textarea>
+ </td>
+ </tr>
+
+ <input type="hidden" name="pz[persknr]" id="pid" value="<?php echo $pz['persknr']; // Verantwortlicher?>"/>
+ <input type="hidden" name="pz[persknra]" id="paid" value="<?php echo $pz['persknra']; // Auftraggeber?>"/>
+ <input type="hidden" name="pz[okn]" value="<?php echo $okn; ?>"/>
+<!-- </table>
+ </div>
+</form> -->
\ No newline at end of file
--- a/fhiiqm/form/raumarbgr_form.inc.php Fri Dec 20 15:19:32 2013 +0100
+++ b/fhiiqm/form/raumarbgr_form.inc.php Fri Jan 17 08:50:55 2014 +0100
@@ -1,175 +1,178 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 06/2012
- *
- * Form RaumArb_Gruppe Raum, Mitarbeiter
- *
- */
-
- include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
- if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-
-?>
- <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_rag" target="_self">
- <div align="center">
- <table width="45%" border="0" cellspacing="3" cellpadding="3">
- <tr>
- <td width="20%">Raum-Arbeits-Gruppe *</td>
- <td>
- <select name="rag[gr]" size="1">
- <?php
- $select = null;
- $sql = "SELECT rag_ID, rag_bez, abt_name FROM fhiiqm.RaumArb_Gruppe r LEFT OUTER JOIN Abteilung a ON r.abt_ID=a.abt_ID ORDER BY 3,2";
- if ($result = $dbc->queryObjectArray($sql))
- {
- foreach ($result as $row)
- {
- $select = ( $row->rag_ID==$rag['gr'] ) ? ' selected' : null;
- echo "<option $select value=\"$row->rag_ID\">$row->rag_bez ($row->abt_name)</option>\n";
- }
- }
- ?>
- </select>
- </td>
- </tr>
- <tr>
- <td>zugehörige Räume *
- <br /> leeres Feld = Löschen
- </td>
- <td>
- <div id="addr">
- <select name="rag[ra][]" size="1">
- <?php
- $select = null;
- $select = ( "-1"==$rag['ra'][0] ) ? ' selected' : null;
- echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT raum_ID,raum_nr,raum_name,geb_ID FROM Raum ORDER BY geb_ID,raum_nr";
- if ($result = $dbc->queryObjectArray($sql))
- {
- foreach ($result as $row)
- {
- $select = ( $row->raum_ID==$rag['ra'][0] ) ? ' selected' : null;
- echo "<option $select value=\"$row->raum_ID\">$row->geb_ID: $row->raum_nr - $row->raum_name</option>\n";
- $sra .= "'".$row->raum_ID."':'".$row->geb_ID.": ".$row->raum_nr. " - " .$row->raum_name."',";
- }
- }
- $sra = substr($sra,0,strlen($sra)-1);
- ?>
- ?>
- </select>
- <script type="text/javascript">
- <!--
- arr = {<?php echo ($sra); ?>}; // Ergebnis: {'key':'value','key':'value',...}
- //-->
- </script>
-
- <a href="<?php echo "javascript:addInput('addr',arr);" ?>" title="weiterer Raum"><img src="/fhiiqm/img/add.png" /></a>
- <a href="<?php echo "javascript:delInput('addr');" ?>" title="löschen letzten Raum"><img src="/fhiiqm/img/delete.png" /></a>
- <?php
- if ($ragid || ($sub && isset($rag) && !$ok))
- {
- if (count($rag['ra'])>1)
- {
- $i=0;
- foreach ($rag['ra'] as $rae)
- {
- if ($i>0)
- {
- echo "<select name=\"rag[ra][]\" size=\"1\">";
-
- $select = ( "-1" == $rae ) ? ' selected' : null;
- echo "<option $select value=\"-1\"></option>\n";
- foreach ($result as $row)
- {
- $select = ( $row->raum_ID == $rae ) ? ' selected' : null;
- echo "<option $select value=\"$row->raum_ID\">$row->geb_ID: $row->raum_nr - $row->raum_name</option>\n";
- }
- echo "</select><br/>\n";
- }
- $i++;
- }
- }
- }
- ?>
- </div>
- </td>
- </tr>
- <tr>
- <td>zugehörige Mitarbeiter *
- <br /> leeres Feld = Löschen
- </td>
- <td>
- <div id="addm">
- <select name="rag[ma][]" size="1">
- <?php
- $select = null;
- $select = ( "-1"==$rag['ma'][0] ) ? ' selected' : null;
- echo "<option $select value=\"-1\"></option>\n";
- $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))
- {
- foreach ($result as $row)
- {
- $select = ( $row->persknr==$rag['ma'][0] ) ? "selected='selected' class='selected" : null;
- if (strpos($row->ma,"inaktiv"))
- {
- if ($select) $class = " red'"; else $class=" class='red'";
- }
- else if ($select) $class="'"; else $class="";
- echo "<option $select$class value=\"$row->persknr\">$row->ma</option>\n";
- $sma .= "'".$row->persknr."':'".$row->ma."',";
- }
- }
- $sma = substr($sma,0,strlen($sma)-1);
- ?>
- ?>
- </select>
- <script type="text/javascript">
- <!--
- arm = {<?php echo ($sma); ?>}; // Ergebnis: {'key':'value','key':'value',...}
- //-->
- </script>
-
- <a href="<?php echo "javascript:addInput('addm',arm);" ?>" title="weiterer MA"><img src="/fhiiqm/img/add.png" /></a>
- <a href="<?php echo "javascript:delInput('addm');" ?>" title="löschen letzten MA"><img src="/fhiiqm/img/delete.png" /></a>
- <?php
- if ($ragid || ($sub && isset($rag) && !$ok))
- {
- if (count($rag['ma'])>1)
- {
- $i=0;
- foreach ($rag['ma'] as $mae)
- {
- if ($i>0)
- {
- echo "<select name=\"rag[ma][]\" size=\"1\">";
-
- $select = ( "-1" == $mae ) ? ' selected' : null;
- echo "<option $select value=\"-1\"></option>\n";
- foreach ($result as $row)
- {
- $select = ( $row->persknr == $mae ) ? "selected='selected' class='selected" : null;
- if (strpos($row->ma,"inaktiv"))
- {
- if ($select) $class = " red'"; else $class=" class='red'";
- }
- else if ($select) $class="'"; else $class="";
- echo "<option $select$class value=\"$row->persknr\">$row->ma</option>\n";
- }
- echo "</select><br/>\n";
- }
- $i++;
- }
- }
- }
- ?>
- </div>
- </td>
- </tr>
-<!--
- </table>
- </form>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 06/2012
+ *
+ * Form RaumArb_Gruppe Raum, Mitarbeiter
+ *
+ */
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+?>
+ <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_rag" target="_self">
+ <div align="center">
+ <table width="45%" border="0" cellspacing="3" cellpadding="3">
+ <tr>
+ <td width="20%">Raum-Arbeits-Gruppe *</td>
+ <td>
+ <select name="rag[gr]" size="1">
+ <?php
+ $select = null;
+ $sql = "SELECT rag_ID, rag_bez, abt_name FROM fhiiqm.RaumArb_Gruppe r LEFT OUTER JOIN Abteilung a ON r.abt_ID=a.abt_ID ORDER BY 3,2";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ $select = ( $row->rag_ID==$rag['gr'] ) ? ' selected' : null;
+ echo "<option $select value=\"$row->rag_ID\">$row->rag_bez ($row->abt_name)</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>zugehörige Räume *
+ <br /> leeres Feld = Löschen
+ </td>
+ <td>
+ <div id="addr">
+ <select name="rag[ra][]" size="1">
+ <?php
+ $select = null;
+ $select = ( "-1"==$rag['ra'][0] ) ? ' selected' : null;
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT raum_ID,raum_nr,raum_name,geb_ID FROM Raum ORDER BY geb_ID,raum_nr";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ $select = ( $row->raum_ID==$rag['ra'][0] ) ? ' selected' : null;
+ echo "<option $select value=\"$row->raum_ID\">$row->geb_ID: $row->raum_nr - $row->raum_name</option>\n";
+ $sra .= "'".$row->raum_ID."':'".$row->geb_ID.": ".$row->raum_nr. " - " .$row->raum_name."',";
+ }
+ }
+ $sra = substr($sra,0,strlen($sra)-1);
+ ?>
+ ?>
+ </select>
+ <script type="text/javascript">
+ <!--
+ arr = {<?php echo ($sra); ?>}; // Ergebnis: {'key':'value','key':'value',...}
+ //-->
+ </script>
+
+ <a href="<?php echo "javascript:addInput('addr',arr);" ?>" title="weiterer Raum"><img src="/fhiiqm/img/add.png" /></a>
+ <a href="<?php echo "javascript:delInput('addr');" ?>" title="löschen letzten Raum"><img src="/fhiiqm/img/delete.png" /></a>
+ <?php
+ if ($ragid || ($sub && isset($rag) && !$ok))
+ {
+ if (count($rag['ra'])>1)
+ {
+ $i=0;
+ foreach ($rag['ra'] as $rae)
+ {
+ if ($i>0)
+ {
+ echo "<select name=\"rag[ra][]\" size=\"1\">";
+
+ $select = ( "-1" == $rae ) ? ' selected' : null;
+ echo "<option $select value=\"-1\"></option>\n";
+ foreach ($result as $row)
+ {
+ $select = ( $row->raum_ID == $rae ) ? ' selected' : null;
+ echo "<option $select value=\"$row->raum_ID\">$row->geb_ID: $row->raum_nr - $row->raum_name</option>\n";
+ }
+ echo "</select><br/>\n";
+ }
+ $i++;
+ }
+ }
+ }
+ ?>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>zugehörige Mitarbeiter *
+ <br /> leeres Feld = Löschen
+ </td>
+ <td>
+ <div id="addm">
+ <select name="rag[ma][]" size="1">
+ <?php
+ $select = null;
+ $select = ( "-1"==$rag['ma'][0] ) ? ' selected' : null;
+ echo "<option $select value=\"-1\"></option>\n";
+ $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 ABS(aktiv) < 2 AND abt_tel<>7
+ UNION
+ 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 abt_tel=7
+ ORDER BY 2";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ $select = ( $row->persknr==$rag['ma'][0] ) ? "selected='selected' class='selected" : null;
+ if (strpos($row->ma,"inaktiv"))
+ {
+ if ($select) $class = " red'"; else $class=" class='red'";
+ }
+ else if ($select) $class="'"; else $class="";
+ echo "<option $select$class value=\"$row->persknr\">$row->ma</option>\n";
+ $sma .= "'".$row->persknr."':'".$row->ma."',";
+ }
+ }
+ $sma = substr($sma,0,strlen($sma)-1);
+ ?>
+ </select>
+ <script type="text/javascript">
+ <!--
+ arm = {<?php echo ($sma); ?>}; // Ergebnis: {'key':'value','key':'value',...}
+ //-->
+ </script>
+
+ <a href="<?php echo "javascript:addInput('addm',arm);" ?>" title="weiterer MA"><img src="/fhiiqm/img/add.png" /></a>
+ <a href="<?php echo "javascript:delInput('addm');" ?>" title="löschen letzten MA"><img src="/fhiiqm/img/delete.png" /></a><br />
+ <?php
+ if ($ragid || ($sub && isset($rag) && !$ok))
+ {
+ if (count($rag['ma'])>1)
+ {
+ $i=0;
+ foreach ($rag['ma'] as $mae)
+ {
+ if ($i>0)
+ {
+ echo "<select name=\"rag[ma][]\" size=\"1\">";
+
+ $select = ( "-1" == $mae ) ? ' selected' : null;
+ echo "<option $select value=\"-1\"></option>\n";
+ foreach ($result as $row)
+ {
+ $select = ( $row->persknr == $mae ) ? "selected='selected' class='selected" : null;
+ if (strpos($row->ma,"inaktiv"))
+ {
+ if ($select) $class = " red'"; else $class=" class='red'";
+ }
+ else if ($select) $class="'"; else $class="";
+ echo "<option $select$class value=\"$row->persknr\">$row->ma</option>\n";
+ }
+ echo "</select><br/>\n";
+ }
+ $i++;
+ }
+ }
+ }
+ ?>
+ </div>
+ </td>
+ </tr>
+<!--
+ </table>
+ </form>
-->
\ No newline at end of file
--- a/fhiiqm/form/vertragmf_form.inc.php Fri Dec 20 15:19:32 2013 +0100
+++ b/fhiiqm/form/vertragmf_form.inc.php Fri Jan 17 08:50:55 2014 +0100
@@ -154,13 +154,14 @@
$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, ', ',IFNULL(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 (CASE aktiv WHEN -1 THEN 'Gast' ELSE 'inaktiv' END) END, ')') as pname FROM fhiiqm.Mitarbeiter WHERE aktiv < 2 ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
{
if (is_array($vtr['cpers'])) $select = in_array( $row->persknr, $vtr['cpers'] ) ? ' selected' : null;
- echo "<option $select value=\"$row->persknr\">$row->pname</option>\n";
+ if (strpos($row->pname,"inaktiv") || strpos($row->pname,"Gast")) $class=" class='red'"; else $class="";
+ echo "<option$class $select value=\"$row->persknr\">$row->pname</option>\n";
}
}
?>
@@ -173,6 +174,9 @@
echo "<tr>
<td>jährliche Teilbrutto-Kosten (€)</td><br />
<td>";
+ $dat = $vtr['bdat'];
+ $bdate = new DateTime("$dat");
+ $bjahr = $bdate->format("Y");
$j=0;
if ($vtr['edat'])
{
@@ -186,9 +190,6 @@
$ejahr = null;
if ($ejahr)
{
- $dat = $vtr['bdat'];
- $bdate = new DateTime("$dat");
- $bjahr = $bdate->format("Y");
for ($i=(int)$bjahr; $i<(int)$ejahr+1; $i++ )
{
echo "<input name=\"vertrag[kjahr][$j]\" type=\"text\" size=\"4\" value=\"$i\"/> ";
@@ -198,7 +199,7 @@
}
else
{
- echo "<input name=\"vertrag[kjahr][$j]\" type=\"text\" size=\"4\" value=\"" . $vtr['bjahr'] . "\"/> ";
+ echo "<input name=\"vertrag[kjahr][$j]\" type=\"text\" size=\"4\" value=\"" . $bjahr . "\"/> ";
echo "<input class='right' name=\"vertrag[kost][$j]\" type=\"text\" value=\"" . $vtr['kost'][$j] . "\"/>";
}
--- a/fhiiqm/inc/menu.inc.php Fri Dec 20 15:19:32 2013 +0100
+++ b/fhiiqm/inc/menu.inc.php Fri Jan 17 08:50:55 2014 +0100
@@ -196,6 +196,7 @@
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_dep_bem_ed.php\" target=\"_blank\" title=\"Korrektur Bemerkung Depot\">Ändern Bemerkung Transfer Depot</a></li>\n";
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))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/keytyp_dep_bem_ed.php Fri Jan 17 08:50:55 2014 +0100
@@ -0,0 +1,342 @@
+<?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("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>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";
+
+ // Korrektur Bemerkung
+ $t = $_POST["t"];
+ $save = $_POST["save"];
+ $kt = $_GET["kt"];
+ $dp = $_GET["dp"];
+ $dd = $_GET["dd"];
+
+ $ky = $_POST["ky"]; // Parameter aus SearchForm
+ $search = $_POST["search"];
+ if (!$search) $search = $_GET["s"];
+ if (!$search) $search = $t[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"];
+ $ky["sort3"] = $_GET["s3"];
+ }
+ $_GET["d"] = $ky["dep"];
+ $_GET["k"] = $ky["kt"];
+ $_GET["b"] = $ky["bind"];
+ $_GET["s1"]= $ky["sort1"];
+ $_GET["s2"]= $ky["sort2"];
+ $_GET["s3"]= $ky["sort3"];
+ $_GET["z"] = $zeil;
+
+ $ps="d=".$ky["dep"]."&k=".$ky["kt"]."&b=".$ky["bind"]."&s1=".$ky["sort1"]."&s2=".$ky["sort2"]."&s3=".$ky["sort3"];
+
+ if ($save)
+ {
+ // Korrektur Bemerkungsfeld in Keytyp_Depot
+ if (trim($t['bem'])>'!') $t['bem'] = substr(trim($t['bem']),0,100);
+ $stmt = $dbc -> stmtinit();
+ if (is_object($stmt))
+ {
+ $stmt -> prepare( "UPDATE fhiiqm.Keytyp_Depot SET depot_bem = ?
+ WHERE keytyp_ID=? AND depot_ID=? AND depot_date=?") ;
+ $stmt -> bind_param('ssss',$t['bem'],$t["kt"],$t["dp"],$t["dd"]);
+ $res = $stmt -> execute();
+ if ($stmt->error)
+ {
+ echo " UPDATE Keytyp_Depot, error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
+ $ddate = new DateTime($t["dd"]);
+ echo "<p class='red'> <b>Ändern Keytyp_Depot: Bemerkung zu Keytyp = '".$t["kt"]."', Depot = '".$t["dp"]."', Datum = ".$ddate->format("d.m.Y").
+ " konnte nicht aktualisiert werden</b></p>\n";
+ }
+ else
+ {
+ $ddate = new DateTime($t["dd"]);
+ echo "<p class='green'> <b>Ändern Keytyp_Depot: Bemerkung zu Keytyp = '".$t["kt"]."', Depot = '".$t["dp"]."', Datum = ".$ddate->format("d.m.Y").
+ " wurde aktualisiert</b></p>\n";
+ }
+ }
+ }
+
+ if ($search)
+ {
+ echo "<span class='sc'>";
+ echo "<br /> <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Historie Keytyp\" class=\"sc\">neue Historie Schlüsseltypen</a>\n";
+ echo "</span>";
+ }
+
+ echo "<div align='center'>\n";
+ echo "<p><b>Historie Schlüsseltypen -> Korrektur Bemerkung</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"=>"","1,2"=>"Schlüsseltyp", "5"=>"Datum");
+ for ($i=1; $i<3; $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="anzeigen"/></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>]";
+ }
+ echo "<p>Mittels Klick auf '<img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/>' - Ändern der Bemerkung des gewünschten Transfers</p>\n";
+ if ($krit )echo "Suchergebnis für $krit"; else echo "Suchergebnis\n";
+ printf ("<p>Anzahl Transfers: %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='0' cellspacing='2' 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>";
+ echo "<th> </th></tr>\n";
+ foreach ($result as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ if ($kt == $row->keytyp_ID && $dp == $row->depot_ID && $dd == $row->depot_date) $bg = "#D6E6E6";
+ 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>";
+ if ($kt == $row->keytyp_ID && $dp == $row->depot_ID && $dd == $row->depot_date)
+ {
+ // Bemerkung editierbar
+ echo "<form action='". $_SERVER['PHP_SELF'] ."' method='post' enctype='application/x-www-form-urlencoded' name='fkb'>\n";
+ echo "<td><input type='text' name='t[bem]' size='80' maxlen='100' value='".$row->depot_bem. "' />";
+ echo "<input type='hidden' name='t[s]' value='1' />";
+ echo "<input type='hidden' name='t[kt]' value='".$row->keytyp_ID."' />";
+ echo "<input type='hidden' name='t[dp]' value='".$row->depot_ID."' />";
+ echo "<input type='hidden' name='t[dd]' value='".$row->depot_date."' />";
+ echo "<input type='hidden' name='ky[kt]' value='".$ky["kt"]."' />";
+ echo "<input type='hidden' name='ky[dep]' value='".$ky["dep"]."' />";
+ echo "<input type='hidden' name='ky[bind]' value='".$ky["dep"]."' />";
+ echo "<input type='hidden' name='ky[sort1]' value='".$ky["sort1"]."' />";
+ echo "<input type='hidden' name='ky[sort2]' value='".$ky["sort2"]."' />";
+ echo "<input type='hidden' name='ky[sort3]' value='".$ky["sort3"]."' />";
+ echo " <input class=\"button\" type=\"submit\" name=\"save\" id=\"sub\" value=\"ändern\" /></td>";
+ echo "<td> </td>";
+ echo "</form>";
+ }
+ else
+ {
+ echo "<td>$row->depot_bem</td>";
+ echo "<td><a href='".$_SERVER["PHP_SELF"]."?kt=$row->keytyp_ID&dp=$row->depot_ID&dd=$row->depot_date&s=1&$ps'>
+ <img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
+ }
+ echo "</tr>\n";
+ }
+ 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=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Historie Keytyp\" class=\"sc\">neue Historie Schlüsseltypen</a>\n";
+ echo "</span>";
+ }
+?>
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/keytyp_tract_ma.php Fri Dec 20 15:19:32 2013 +0100
+++ b/fhiiqm/keytyp_tract_ma.php Fri Jan 17 08:50:55 2014 +0100
@@ -106,7 +106,7 @@
<?php
if ($err) echo "<p class='red'>$err</p>\n";
?>
- <table width="55%" border="0" cellspacing="3" cellpadding="3">
+ <table width="60%" border="0" cellspacing="3" cellpadding="3">
<tr>
<td>Depot *</td><td>Schlüsseltyp *</td><td>Anzahl *</td><td>Mitarbeiter *</td>
--- a/fhiiqm/ma_tel_ed.php Fri Dec 20 15:19:32 2013 +0100
+++ b/fhiiqm/ma_tel_ed.php Fri Jan 17 08:50:55 2014 +0100
@@ -292,7 +292,8 @@
if ($ma['email'])
{
if (strpos($ma['email'],"@") > 0) $ma['email'] = $ma['email']; else $ma['email'] = $ma['email'] . "@fhi-berlin.mpg.de";
- }
+ }
+ $aktiv = $ma['fhi'];
foreach ($ma as &$elem) if (!$elem) $elem = null; // NULL-Eintrag in Leerfelder
if ($pid) //UPDATE
{
@@ -307,7 +308,7 @@
aktiv = ?,
userid = ?
WHERE persknr = $pid");
- $stmt -> bind_param('ssssiis',$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abtm'], $ma['fhi'], $userid);
+ $stmt -> bind_param('ssssiis',$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abtm'], $aktiv, $userid);
// echo "UPDATE: ". var_dump($stmt);
$result = $stmt -> execute();
if ($stmt->error) echo "error UPDATE Mitarbeiter: " . $stmt->error . "<br><br>\n";
@@ -317,7 +318,7 @@
$sql = "SELECT MAX(persknr) FROM Mitarbeiter WHERE persknr < 9500";
$pid = $dbc -> querySingleItem($sql) + 1;
$stmt -> prepare ("INSERT INTO Mitarbeiter (persknr, nachname, vorname, titel,email,abt_tel,aktiv,userid) VALUES (?,?,?,?,?,?,?,?)");
- $stmt -> bind_param('issssiis',$pid,$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abt'][0], $ma['fhi'], $userid);
+ $stmt -> bind_param('issssiis',$pid,$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abt'][0], $aktiv, $userid);
$result = $stmt -> execute();
if ($stmt->error) echo "error INSERT Mitarbeiter: " . $stmt->error . "<br><br>\n";
$ma['abtm'] = $ma['abt'][0];
--- a/fhiiqm/report/keytyp_bestand_all_report.php Fri Dec 20 15:19:32 2013 +0100
+++ b/fhiiqm/report/keytyp_bestand_all_report.php Fri Jan 17 08:50:55 2014 +0100
@@ -204,9 +204,9 @@
if ($ky["sort3"]>0) $ord .= ",".$ky["sort3"];
}
- $sql = "SELECT h.keytyp_ID, key_level,
- CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') AS keyowner, IFNULL(abt_name,'') AS abt, h.depot_ID, 'ma' AS tab,
- SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END) - SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END) - SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END) AS bestand
+ $sql = "SELECT h.keytyp_ID, key_level,
+ CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE (CASE aktiv WHEN -1 THEN 'Gast' ELSE 'inaktiv' END) END, ')') AS keyowner, IFNULL(abt_name,'') AS abt, h.depot_ID, 'ma' AS tab,
+ SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END) - SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END) - SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END) AS bestand,m.persknr
FROM fhiiqm.Mitarbeiter m
INNER JOIN Keytyp_MA h ON m.persknr=h.persknr
INNER JOIN Keytyp k ON h.keytyp_ID = k.keytyp_ID
@@ -215,8 +215,8 @@
GROUP BY h.keytyp_ID, key_level,keyowner,abt
HAVING bestand > 0 $where $wherk
UNION
- SELECT h.keytyp_ID, key_level,CONCAT(depot_ID,'-Depot') AS keyowner, depot_ID AS abt, h.depot_ID, 'dep' AS tab,
- 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
+ SELECT h.keytyp_ID, key_level, CONCAT(depot_ID,'-Depot') AS keyowner, depot_ID AS abt, h.depot_ID, 'dep' AS tab,
+ 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,NULL
FROM fhiiqm.Keytyp_Depot h INNER JOIN Keytyp k ON h.keytyp_ID = k.keytyp_ID
GROUP BY h.keytyp_ID, key_level,keyowner,abt
HAVING bestand > 0 $where $wherd";
@@ -267,7 +267,16 @@
echo "<td>$row->keytyp_ID</td><td>$row->key_level</td>";
if ($row->tab == 'dep') $cl = " class = 'bold'"; else $cl = "";
echo "<td$cl>$row->keyowner</td>";
- echo "<td>$row->abt</td>";
+ if ($row->abt == 'INF' && $row->persknr)
+ { // MA aus Abt. 'INF' Arbeitsgruppe anzeigen
+ $sql = "SELECT rag_bezk FROM RaumArb_Gruppe rag
+ LEFT OUTER JOIN MA_RaumArbGruppe m ON rag.rag_ID = m.rag_ID
+ WHERE persknr = ".$row->persknr . " AND NOT rag_bezk IS NULL";
+ $ag = $dbc -> querySingleItem($sql);
+ echo "<td>$ag</td>";
+ }
+ else
+ echo "<td>$row->abt</td>";
echo "<td class='right'>$row->bestand</td>";
echo "</tr>";
$anzt += $row->bestand;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/test/ip_intern_test.php Fri Jan 17 08:50:55 2014 +0100
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 01/2014
+ */
+
+function isintern($ip)
+{
+ if (!preg_match("/^141\.14\./", $ip) &&
+ !preg_match("/^172\.(1[6-9]|2[0-9]|31)\./", $ip) &&
+ !preg_match("/^10\.0\./", $ip)) {
+ echo "extern: ".$ip. "<br />";
+ return false;
+ }
+ else
+ {
+ echo "intern: ".$ip. "<br />";
+ return false;
+ }
+}
+
+isintern($_SERVER["REMOTE_ADDR"]);
+echo ", ".ip2long($_SERVER["REMOTE_ADDR"]);
+echo "<br /><br />";
+foreach(array('171.15.255.555',
+ '172.16.0.0',
+ '172.24.3.3',
+ '172.16.3.3',
+ '172.18.3.3',
+ '172.24.3.3',
+ '172.31.255.255',
+ '172.32.0.0',
+ '10.0.1.128',
+ '123.123.123.123',
+ '8.8.8.8',
+ '141.14.127.255',
+ '141.14.128.0',
+ '141.14.143.255',
+ '141.14.144.0',
+ '141.14.141.141') as $ip) {
+ isintern($ip);
+ }
+echo "<br /><br />";
+
+function islocal($ip) {
+ foreach(array('172.16.0.0/12', '141.14.128.0/20','10.0.0.0/8') as $net) {
+ list($subnet, $mask) = explode('/', $net);
+ if ((ip2long($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long($subnet)) return true;
+ }
+ return false;
+}
+
+
+
+foreach(array('171.15.255.555',
+ '172.16.0.0',
+ '172.24.3.3',
+ '172.16.3.3',
+ '172.18.3.3',
+ '172.24.3.3',
+ '172.31.255.255',
+ '172.32.0.0',
+ '10.0.1.128',
+ '123.123.123.123',
+ '8.8.8.8',
+ '141.14.127.255',
+ '141.14.128.0',
+ '141.14.143.255',
+ '141.14.144.0',
+ '141.14.141.141') as $ip) {
+
+ if (islocal($ip)) echo "$ip local<br>\n";
+ else echo "$ip extern<br>\n";
+}
+
+?>