--- a/fhiiqm/anlage_flist.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/anlage_flist.php Thu Jan 12 11:41:22 2012 +0100
@@ -95,9 +95,10 @@
echo "<tr><td class='bigger'>Mittels '<img src='/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />'
können Sie nach relevanten Spalten auf- bzw. absteigend sortieren</td></tr>
<tr><td class='bigger'>'<img src='/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' ermöglicht das Filtern nach ausgewählten Spalten der Liste</td></tr>
- <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten ,
- '<img src='/fhiiqm/img/duplicate.gif' border='0' hight='11'>' - Duplizieren ,
- '<img src='/fhiiqm/img/details.gif' border='0' hight='11'>' - Prüfungen ,
+ <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten , ";
+ if (!is_null($_SESSION["recht"]) && in_array("ae",$_SESSION["recht"]))
+ echo "'<img src='/fhiiqm/img/duplicate.gif' border='0' hight='11'>' - Duplizieren , ";
+ echo "'<img src='/fhiiqm/img/details.gif' border='0' hight='11'>' - Prüfungen ,
'<img src='/fhiiqm/img/fire.png' border='0' hight='11'>' - Risiken ,
'<img src='/fhiiqm/img/document_final.png' border='0' hight='11'>' - Verträge der Anlage</td>
</tr>\n";
@@ -157,7 +158,8 @@
echo "<td>$row->raum_nr</td>";
echo "<td>$row->verantw</td>";
echo "<td><a href='/fhiiqm/anlage_ed.php?i=$row->al_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
- echo "<td><a href='/fhiiqm/anlage_ed.php?i=$row->al_ID&d=1&c=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
+ if (!is_null($_SESSION["recht"]) && in_array("ae",$_SESSION["recht"]))
+ echo "<td><a href='/fhiiqm/anlage_ed.php?i=$row->al_ID&d=1&c=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
echo "<td><a href='/fhiiqm/alpruef_flist.php?s=3&d=DESC&f=5&b=$row->al_ID&st=0&z=25'>
<img src=\"/fhiiqm/img/details.gif\" alt='Prüfungen' title='Prüfungen' border='0'/></a></td>";
echo "<td><a href='/fhiiqm/alrisk_flist.php?s=2&d=&f=5&b=$row->al_ID&st=0&z=25'>
--- a/fhiiqm/css/db.css Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/css/db.css Thu Jan 12 11:41:22 2012 +0100
@@ -116,12 +116,12 @@
text-decoration: none;
background-color: #ffffff}
-input.weiss
+input.read
{ font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12px;
color: #000000;
text-decoration: none;
- background-color: #ffffff}
+ background-color: #DAFAFA}
.red
{
--- a/fhiiqm/css/db_print.css Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/css/db_print.css Thu Jan 12 11:41:22 2012 +0100
@@ -69,12 +69,12 @@
text-decoration: none;
background-color: #ffffff}
-input.weiss
+input.read
{ font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12px;
color: #000000;
text-decoration: none;
- background-color: #ffffff}
+ background-color: #DAFAFA}
.red
{
--- a/fhiiqm/form/laser_form.inc.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/form/laser_form.inc.php Thu Jan 12 11:41:22 2012 +0100
@@ -15,7 +15,7 @@
?>
<div align="center">
<table>
-<tr><td class="bigger">Die Auswahl eines Verantwortlichen geschieht durch<br />Eingeben von mindesten 2 Zeichen in das entsprechende Feld.
+<tr><td class="bigger">Die Auswahl eines Verantwortlichen geschieht durch Eingeben von<br />mindesten 2 Zeichen in das entsprechende Feld.
</td></tr>
<tr><td class="bigger">Umlaute wie 'ä', 'ü', 'ö', 'ß' werden nicht gefunden, bitte benachbarte Zeichen eingeben.</td></tr>
<tr><td class="bigger"> </td></tr>
@@ -25,8 +25,35 @@
<div align="center">
<table border="0" cellspacing="3" cellpadding="3">
<!-- <div class="ui-widget"> -->
+ <tr>
+ <td>
+ <? if ($laid)
+ {
+ echo "Laser-ID</td>";
+ echo "<td><input class='read' name='la[lid]' type='text' size='5' value='" .$la['lid']."' readonly='readonly' />";
+ echo " ";
+ }
+ echo "gehört zu Laser ";
+ if (!$laid) echo "</td><td>";
+ echo "<select name=\"la[lidref]\">";
+ if ($la["lidref"] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ if ($laid) $wher = " WHERE las_ID <> $laid "; else $wher = "";
+ $sql = "SELECT las_ID, las_bez FROM Laser $wher ORDER BY 2";
+ if ($res = $dbc -> queryObjectArray($sql))
+ {
+ $select = "";
+ foreach ($res as $row)
+ {
+ if ($row->las_ID == $la['lidref']) $select="selected"; else $select="";
+ echo "<option $select value='$row->las_ID'>$row->las_ID - $row->las_bez</option>\n";
+ }
+ }
+ ?>
+ </td>
+ </tr>
<tr><td>Laserbezeichnung *</td>
- <td valign="top"><input type="text" name="la[lbez]" id="lbez" size="30" maxlength="250" value="<?php echo $la['lbez']; ?>"/>
+ <td valign="top"><input type="text" name="la[lbez]" id="lbez" size="50" maxlength="250" value="<?php echo $la['lbez']; ?>"/>
<?php
if (isset($la['lbez']) && $la['lbez']<'!')
{
@@ -38,29 +65,19 @@
?>
</td>
</tr>
+ <tr><td>Inventar-Nr.</td>
+ <td valign="top"><input type="text" name="la[invnr]" size="20" maxlength="20" value="<?php echo $la['invnr']; ?>"/>
+ </td>
+ </tr>
+ <tr><td>in Betrieb</td>
+ <td><input type="checkbox" name="la[akt]" value="1" <?php echo ($la["akt"] )? "checked=\"checked\"" : "";?> />
+ </td>
+ </tr>
<tr><td>Laserwelle von</td>
<td valign="top"><input type="text" name="la[wvon]" size="10" maxlength="7" value="<?php echo $la['wvon']; ?>"/>
Laserwelle bis
<input type="text" name="la[wbis]" size="10" maxlength="7" value="<?php echo $la['wbis']; ?>"/></td>
</tr>
- <tr><td>Schutzstufe</td>
- <td><select name="la[suid]">
- <?php
- if ($la['suid'] == -1) $select = " selected "; else $select = "";
- echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT schutzst_ID, schutzst_bez FROM Schutzstufe ORDER BY 2";
- if ($res = $dbc -> queryObjectArray($sql))
- {
- $select = "";
- foreach ($res as $row)
- {
- if ($row->schutzst_ID == $la['suid']) $select="selected"; else $select="";
- echo "<option $select value='$row->schutzst_ID'>$row->schutzst_bez</option>\n";
- }
- }
- ?>
- </select></td>
- </tr>
<tr><td>Laserart</td>
<td><select name="la[lart]">
<?php
@@ -77,6 +94,25 @@
}
}
?>
+ </select> oder neu
+ <input name="la[lartnew]" type="text" size="30" maxlength="50" value="<?php echo $la['lartnew']; ?>"/> </td>
+ </tr>
+ <tr><td>Lasertyp</td>
+ <td><select name="la[ltyp]">
+ <?php
+ if ($la['ltyp'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT las_typ_ID, las_typ_bez FROM Laser_Typ ORDER BY 2";
+ if ($res = $dbc -> queryObjectArray($sql))
+ {
+ $select = "";
+ foreach ($res as $row)
+ {
+ if ($row->las_typ_ID == $la['ltyp']) $select="selected"; else $select="";
+ echo "<option $select value='$row->las_typ_ID'>$row->las_typ_bez</option>\n";
+ }
+ }
+ ?>
</select></td>
</tr>
<tr><td>Laserklasse</td>
@@ -97,19 +133,35 @@
?>
</select></td>
</tr>
- <tr><td>Lasertyp</td>
- <td><select name="la[ltyp]">
+ <tr><td>Schutzstufe</td>
+ <td><select name="la[suid]">
<?php
- if ($la['ltyp'] == -1) $select = " selected "; else $select = "";
+ if ($la['suid'] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT las_typ_ID, las_typ_bez FROM Laser_Typ ORDER BY 2";
+ $sql = "SELECT schutzst_ID, schutzst_bez FROM Schutzstufe WHERE LEFT(schutzst_bez,2)<>'OD' ORDER BY 2";
if ($res = $dbc -> queryObjectArray($sql))
{
$select = "";
foreach ($res as $row)
{
- if ($row->las_typ_ID == $la['ltyp']) $select="selected"; else $select="";
- echo "<option $select value='$row->las_typ_ID'>$row->las_typ_bez</option>\n";
+ if ($row->schutzst_ID == $la['suid']) $select="selected"; else $select="";
+ echo "<option $select value='$row->schutzst_ID'>$row->schutzst_bez</option>\n";
+ }
+ }
+ ?>
+ </select> Schutzstufe OD
+ <select name="la[suodid]">
+ <?php
+ if ($la['suid'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT schutzst_ID, schutzst_bez FROM Schutzstufe WHERE LEFT(schutzst_bez,2)='OD' ORDER BY 2";
+ if ($res = $dbc -> queryObjectArray($sql))
+ {
+ $select = "";
+ foreach ($res as $row)
+ {
+ if ($row->schutzst_ID == $la['suodid']) $select="selected"; else $select="";
+ echo "<option $select value='$row->schutzst_ID'>$row->schutzst_bez</option>\n";
}
}
?>
@@ -120,7 +172,7 @@
Einheit
<select name="la[eleist]">
<?php
- $sql = "SELECT einheit_ID,einheit,einheit_beschr FROM Einheit WHERE laser=1 ORDER BY right(einheit,1),2";
+ $sql = "SELECT einheit_ID,einheit,einheit_beschr FROM Einheit WHERE laser=1 ORDER BY sort";
if ($ree = $dbc -> queryObjectArray($sql))
{
$select = "";
@@ -133,12 +185,31 @@
?>
</select></td>
</tr>
+ <tr><td>max. Leistung</td>
+ <td valign="top"><input type="text" name="la[leistmax]" size="10" maxlength="7" value="<?php echo $la['leistmax']; ?>"/>
+ Einheit
+ <select name="la[eleistmax]">
+ <?php
+ $sql = "SELECT einheit_ID,einheit,einheit_beschr FROM Einheit WHERE laser=1 ORDER BY sort";
+ if ($ree = $dbc -> queryObjectArray($sql))
+ {
+ $select = "";
+ foreach ($ree as $row)
+ {
+ if ($row->einheit_ID == $la['eleistmax']) $select="selected"; else $select="";
+ echo "<option $select value='$row->einheit_ID'>$row->einheit ($row->einheit_beschr)</option>\n";
+ }
+ }
+ ?>
+ </select></td>
+ </tr>
<tr><td>Energie</td>
<td valign="top"><input type="text" name="la[eng]" size="10" maxlength="7" value="<?php echo $la['eng']; ?>"/>
Einheit
<select name="la[eeng]">
<?php
- if ($ree)
+ $sql = "SELECT einheit_ID,einheit,einheit_beschr FROM Einheit WHERE laser=2 ORDER BY sort";
+ if ($ree = $dbc -> queryObjectArray($sql))
{
$select = "";
foreach ($ree as $row)
@@ -155,7 +226,8 @@
Einheit
<select name="la[eapt]">
<?php
- if ($ree)
+ $sql = "SELECT einheit_ID,einheit,einheit_beschr FROM Einheit WHERE laser=3 ORDER BY sort";
+ if ($ree = $dbc -> queryObjectArray($sql))
{
$select = "";
foreach ($ree as $row)
@@ -172,7 +244,8 @@
Einheit
<select name="la[efrq]">
<?php
- if ($ree)
+ $sql = "SELECT einheit_ID,einheit,einheit_beschr FROM Einheit WHERE laser=4 ORDER BY sort";
+ if ($ree = $dbc -> queryObjectArray($sql))
{
$select = "";
foreach ($ree as $row)
@@ -189,7 +262,8 @@
Einheit
<select name="la[eipb]">
<?php
- if ($ree)
+ $sql = "SELECT einheit_ID,einheit,einheit_beschr FROM Einheit WHERE laser=5 ORDER BY sort";
+ if ($ree = $dbc -> queryObjectArray($sql))
{
$select = "";
foreach ($ree as $row)
@@ -201,9 +275,6 @@
?>
</select></td>
</tr>
- <tr><td>aktiv</td>
- <td><input type="checkbox" name="la[akt] <?php echo ($la["akt"] )? "checked" : "";?>"/></td>
- </tr>
<tr>
<td>Hersteller (Firma)</td>
<td>
@@ -211,7 +282,7 @@
<?php
if ($la['hstid'] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT las_hersteller_ID, las_hersteller_bez FROM Hersteller ORDER BY 2";
+ $sql = "SELECT las_hersteller_ID, las_hersteller_bez FROM fhiiqm.Laser_Hersteller ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
@@ -265,8 +336,18 @@
<tr><td>Laser-Infos</td>
<td><textarea name="la[linfo]" cols="50" rows="4"><?php echo $la['linfo']; ?></textarea></td>
</tr>
+
+ <?php
+ if ($la["tstmp"] && $la["tstmp"]>0)
+ {
+ echo "<tr><td>letzte Änderung</td>";
+ $ts = new DateTime($la["tstmp"]);
+ echo "<td>".$ts->format('d.m.Y H:i:s')."</td></tr>\n";
+ }
+ ?>
<input type="hidden" name="la[pid]" id="pid" value="<?php echo $la['pid']; ?>"/>
+ <input type="hidden" name="la[tstmp]" value="<?php echo $la['tstmp']; ?>"/>
<input type="hidden" name="la[okn]" value="<?php echo $okn; ?>"/>
<!--
</div>
Binary file fhiiqm/img/transp.png has changed
--- a/fhiiqm/inc/anlage_dat_show.inc.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/inc/anlage_dat_show.inc.php Thu Jan 12 11:41:22 2012 +0100
@@ -8,8 +8,8 @@
*/
echo "<table>\n";
- echo "<tr><td>Anlagen-ID: </td><td>" . $alid . "<td></td></tr>\n";
- echo "<tr><td>Anlagenbezeichnung: </td><td>" . $al['bez'] . "<td></td></tr>\n";
+ echo "<tr><td>Anlagen-ID: </td><td>" . $alid . "</td></tr>\n";
+ echo "<tr><td>Anlagenbezeichnung: </td><td>" . $al['bez'] . "</td></tr>\n";
echo "<tr><td>Anlagenbeschreibung: </td><td>" . nl2br($al['beschr']) . "<td></td></tr>\n";
// Kategorie
$sql = "SELECT al_kat_ID,al_kat_bez FROM fhiiqm.A_Kategorie WHERE al_kat_ID = '" . $al["kat"] . "'";
--- a/fhiiqm/inc/func_lib.inc.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/inc/func_lib.inc.php Thu Jan 12 11:41:22 2012 +0100
@@ -206,13 +206,14 @@
}
}
- function duplicate_record ($table, $key_name, $key_value)
+ function duplicate_record ($table, $key_name, $key_value, $auto=1)
{
/** dupliziert Datensatz in table
* Parameter
* $table Tabellenname
* $key_name Name ID-Spalte
* $key_value Wert ID des DSes, der dupliziert werden soll
+ * $auto ID ist Auto-Wert
*/
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
@@ -228,23 +229,28 @@
foreach ($result as $row)
{
- if ($row->Field == $key_name) {
+ if ($row->Field == $key_name && $auto) {
$query .= 'NULL, ';
- } else {
+ }
+ elseif ($row->Field == $key_name && !$auto)
+ {$query .= '"'. $key_value . '_COPY", ';}
+ else {
$query .= $row->Field . ', ';
} // END IF
}
$query = substr($query, 0, strlen($query) - 2);
$query .= ' FROM ' . $table . ' WHERE ' . $key_name . ' = "' . $key_value . '")';
-
+// echo "$query<br />";
$ret = $dbc -> execute($query);
- if ($ret)
+ if ($ret && $auto)
{
// Return new id
$new_id = $dbc -> insertId();
return $new_id;
}
+ elseif ($ret && !$auto)
+ return $key_value . "_COPY";
else
return false;
/*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/inc/laser_dat_show.inc.php Thu Jan 12 11:41:22 2012 +0100
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 01/2012
+ *
+ * Bestaetigen Laser - INSERT/UPDATE-Daten
+ */
+
+
+ echo "<table>\n";
+ echo "<tr><td>Laser-ID: </td><td>" . $la["lid"] . "</td></tr>\n";
+ if ($la["lidref"])
+ {
+ $sql = "SELECT las_bez FROM Laser WHERE las_ID = " . $la["lidref"];
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ echo "<tr><td>zu Laser: </td><td>". $la["lidref"]." - $row->las_bez</td></tr>\n";
+ }
+ echo "<tr><td>Laserbezeichnung: </td><td>" . $la['lbez'] . "</td></tr>\n";
+ echo "<tr><td>Inventar-Nr.: </td><td>" . $la['invnr'] . "</td></tr>\n";
+ echo "<tr><td>Laserwelle von - bis: </td><td>" . $la['wvon'] . " - " . $la['wbis'] . "</td></tr>\n";
+ // Laserart
+ $sql = "SELECT las_art_bez FROM Laser_Art WHERE las_art_ID = " . $la["lart"];
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ echo "<tr><td>Laserart: </td><td>$row->las_art_bez</td></tr>\n";
+ // Lasertyp
+ $sql = "SELECT las_typ_bez FROM Laser_Typ WHERE las_typ_ID = " . $la["ltyp"];
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ echo "<tr><td>Lasertyp: </td><td>$row->las_typ_bez</td></tr>\n";
+ // Laserklasse
+ $sql = "SELECT las_klasse_bez FROM Laser_Klasse WHERE las_klasse_ID = '" . $la["lkla"] ."'";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ echo "<tr><td>Laserklasse: </td><td>$row->las_klasse_bez</td></tr>\n";
+ // Schutzstufe
+ $sql = "SELECT schutzst_bez FROM Schutzstufe WHERE schutzst_ID = '" . $la["suid"] ."'";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ echo "<tr><td>Schutzstufe: </td><td>$row->schutzst_bez</td></tr>\n";
+ $sql = "SELECT schutzst_bez FROM Schutzstufe WHERE schutzst_ID = '" . $la["suodid"] ."'";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ echo "<tr><td>Schutzstufe OD: </td><td>$row->schutzst_bez</td></tr>\n";
+
+ $sql = "SELECT einheit_ID,einheit,einheit_beschr FROM Einheit WHERE laser>0 ORDER BY right(einheit,1),2";
+ if ($ree = $dbc -> queryObjectArray($sql))
+ foreach ($ree as $row)
+ {
+ if ($row->einheit_ID == $la["eleist"]) $eleist = $row->einheit;
+ if ($row->einheit_ID == $la["eleistmax"]) $eleistmax = $row->einheit;
+ if ($row->einheit_ID == $la["eeng"]) $eeng = $row->einheit;
+ if ($row->einheit_ID == $la["eapt"]) $eapt = $row->einheit;
+ if ($row->einheit_ID == $la["efrq"]) $efrq = $row->einheit;
+ if ($row->einheit_ID == $la["eipb"]) $eipb = $row->einheit;
+ }
+ if ($la["leist"])
+ echo "<tr><td>Leistung: </td><td>".$la["leist"]." $eleist</td></tr>\n";
+ if ($la["leistmax"])
+ echo "<tr><td>max. Leistung: </td><td>".$la["leistmax"]." $eleistmax</td></tr>\n";
+ if ($la["eng"])
+ echo "<tr><td>Energie: </td><td>".$la["eng"]." $eeng</td></tr>\n";
+ if ($la["apt"])
+ echo "<tr><td>Apertur: </td><td>".$la["apt"]." $eapt</td></tr>\n";
+ if ($la["frq"])
+ echo "<tr><td>Frequenz: </td><td>".$la["frq"]." $efrq</td></tr>\n";
+ if ($la["ipb"])
+ echo "<tr><td>Impulsbreite: </td><td>".$la["ipb"]." $eipb</td></tr>\n";
+ echo "<tr><td>in Betrieb: </td><td>"; echo ($la["akt"]) ? "ja" : "nein"; echo "</td></tr>\n";
+ if ($la["hstid"])
+ {
+ $sql = "SELECT las_hersteller_bez FROM fhiiqm.Laser_Hersteller WHERE las_hersteller_ID = ".$la["hstid"];
+ if ($res = $dbc->queryObjectArray($sql))
+ foreach ($res as $row)
+ echo "<tr><td>Hersteller: </td><td>$row->las_hersteller_bez</td></tr>\n";
+ }
+ if ($la["raum"])
+ {
+ $sql = "SELECT raum_nr, raum_name FROM fhiiqm.Raum WHERE raum_ID = " . $la['raum'];
+ if ($res = $dbc->queryObjectArray($sql))
+ foreach ($res as $row)
+ echo "<tr><td>Standort: </td><td>Gebäude " . $la["geb"] .": $row->raum_nr, $row->raum_name</td></tr>\n";
+ }
+ if ($la["pid"])
+ {
+ $sql = "SELECT CONCAT (nachname, ', ',vorname) AS ma FROM fhiiqm.Mitarbeiter WHERE persknr = " . $la["pid"];
+ if ($res = $dbc->queryObjectArray($sql))
+ foreach ($res as $row)
+ echo "<tr><td>Verantwortlicher: </td><td>$row->ma</td></tr>\n";
+ }
+ if ($la["linfo"])
+ echo "<tr><td>Laserinfo: </td><td>" . nl2br($la['linfo']) . "</td></tr>\n";
+ //timestamp
+ $sql = "SELECT timestamp FROM Laser WHERE las_ID = " . $la["lid"];
+ if ($res = $dbc->queryObjectArray($sql))
+ foreach ($res as $row)
+ {
+ $ts = new DateTime($row->timestamp);
+ if ($ts && $ts>0)
+ echo "<tr><td>Letze Änderung: </td><td>" . $ts->format('d.m.Y H:i:s')."</td></tr>\n";
+ }
+
+ echo "</table>\n";
+?>
\ No newline at end of file
--- a/fhiiqm/inc/ma_list_ac.inc.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/inc/ma_list_ac.inc.php Thu Jan 12 11:41:22 2012 +0100
@@ -16,11 +16,17 @@
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
$dbc = new dbconnection();
// label = angezeigter ListenWert, val = Wert im Eingabefeld nach Klick
- $sql = "SELECT CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as label,
+/* $sql = "SELECT CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as label,
CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as val,persknr as id
FROM fhiiqm.Mitarbeiter
WHERE nachname LIKE '%".$q."%' COLLATE latin1_general_ci
ORDER BY 1";
+*/
+ $sql = "SELECT CONCAT (nachname, ', ',vorname, ', ' , abt_name,' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as label,
+ CONCAT (nachname, ', ',vorname, ', ' , abt_name, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as val,persknr as id
+ FROM fhiiqm.Mitarbeiter m LEFT OUTER JOIN fhiiqm.Abteilung a ON m.abt_tel=a.abt_ID
+ WHERE nachname LIKE '%".$q."%' COLLATE latin1_general_ci
+ ORDER BY 1";
$result = $dbc ->queryObjectArray($sql);
if ($result)
{
--- a/fhiiqm/inc/menu.inc.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/inc/menu.inc.php Thu Jan 12 11:41:22 2012 +0100
@@ -88,6 +88,17 @@
echo " </ul>\n
</li>\n";
}
+ if (is_array($arg) && in_array("l",$arg))
+ {
+ echo "<li>Laser\n
+ <ul>\n";
+ if (in_array("lr",$_SESSION["recht"]) || in_array("le",$_SESSION["recht"]))
+ echo "<li><a href=\"/fhiiqm/laser_flist.php\" target=\"_blank\" title=\"Laserliste\">Laser sortieren, filtern, bearbeiten</a></li>\n";
+ if (in_array("le",$_SESSION["recht"]))
+ echo "<li><a href=\"/fhiiqm/laser_ed.php\" target=\"_blank\" title=\"Laser erfassen\">Laser erfassen</a></li>\n";
+ echo " </ul>\n
+ </li>\n";
+ }
if (is_array($arg) && in_array("s",$arg))
{
echo "<li>Stammdaten\n
--- a/fhiiqm/laser_ed.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/laser_ed.php Thu Jan 12 11:41:22 2012 +0100
@@ -2,7 +2,9 @@
/**
* @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 12/2011
+ * @copyright 12/2011, 01/2012
+ *
+ * Laser INSERT, UPDATE, DELETE, COPY
*/
error_reporting(E_ALL ^ E_NOTICE);
@@ -35,7 +37,7 @@
$ok = $_POST["ok"];
if (!$la['okn']) $ok=false;
$duptext="";
-
+
if ($dup)
{ // Anlage duplizieren
include_once ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/func_lib.inc.php");
@@ -51,7 +53,7 @@
header("Location: $addr");
exit;
}
- else $duptext = " - Fehler beim Duplizieren von ". $al["bez"];
+ else $duptext = " - Fehler beim Duplizieren von ". $la["lbez"];
}
?>
@@ -104,47 +106,58 @@
if (!$ok || (!$sub && !$del && !$dup))
{
- if ($laid && (!$sub || !$del) && !isset($al))
+ if ($laid && (!$sub || !$del) && !isset($la))
{ // update
$sql = "SELECT las_ID, las_bez, las_welle_von, las_welle_bis,
las_art_ID, las_klasse_ID, las_typ_ID, leistung, einheit_leistung,
apertur, einheit_apertur, energie, einheit_energie, frequenz, einheit_frequenz,
impulsbreite, einheit_impulsbreite, l.las_hersteller_ID, schutzst_ID,
l.aktiv, l.persknr, l.raum_ID, geb_ID, las_info,
- CONCAT(nachname,', ',vorname) AS vname, las_hersteller_bez
+ CONCAT(nachname,', ',vorname) AS vname, las_hersteller_bez,
+ inventar_nr,maxleistung, einheit_maxleist,schutzst_od_ID,las_ref_ID,l.timestamp
FROM fhiiqm.Laser l LEFT OUTER JOIN fhiiqm.Mitarbeiter m
ON l.persknr=m.persknr LEFT OUTER JOIN fhiiqm.Laser_Hersteller h
ON l.las_hersteller_ID=h.las_hersteller_ID LEFT OUTER JOIN fhiiqm.Raum r
ON l.raum_ID=r.Raum_ID
- WHERE las_ID = $laid";
+ WHERE las_ID = '$laid'";
if ($result = $dbc -> queryObjectArray($sql))
{
foreach ($result as $row)
{
- $la["lbez"] = $row->las_bez;
- $la['wvon'] = $row->las_welle_von;
- $la['wbis'] = $row->las_welle_bis;
- $la["lart"] = $row->las_art_ID;
- $la['lkla'] = $row->las_klasse_ID;
- $la['ltyp'] = $row->las_typ_ID;
- $la['leist'] = $row->leistung;
- $la["apt"] = $row->apertur;
- $la["eapt"] = $row->einheit_apertur;
- $la["eng"] = $row->energie;
- $la["eeng"] = $row->einheit_energie;
- $la["efrq"] = $row->frequenz;
- $la["efrq"] = $row->einheit_frequenz;
- $la["ipb"] = $row->impulsbreite;
- $la["eipb"] = $row->einheit_impulsbreite;
- $la["akt"] = $row->aktiv;
- $la["hstid"] = $row->las_hersteller_ID;
- $la["suid"] = $row->schutzst_ID;
- $la["persknr"] = $row->vname;
- $la["pid"] = $row->persknr;
- $la["geb"] = $row->geb->ID;
- $la["raum"] = $row->raum_ID;
- $la["linfo"] = $row->las_info;
-
+ $la["lid"] = $laid;
+ $la["lbez"] = $row->las_bez;
+// $la['wvon'] = str_replace(".",",",$row->las_welle_von);
+ $la['wvon'] = str_replace(".",",",str_replace(".00","",$row->las_welle_von));
+ $la['wbis'] = str_replace(".",",",str_replace(".00","",$row->las_welle_bis));
+ $la["lart"] = ($row->las_art_ID) ? $row->las_art_ID : -1;
+ $la['lkla'] = ($row->las_klasse_ID) ? $row->las_klasse_ID : -1;
+ $la['ltyp'] = ($row->las_typ_ID) ? $row->las_typ_ID : -1;
+ $la['leist'] = str_replace(".",",",str_replace(".00","",$row->leistung));
+ $la['eleist'] = $row->einheit_leistung;
+ $la["apt"] = str_replace(".",",",str_replace(".00","",$row->apertur));
+ $la["eapt"] = $row->einheit_apertur;
+ $la["eng"] = str_replace(".",",",str_replace(".00","",$row->energie));
+ $la["eeng"] = $row->einheit_energie;
+ $la["frq"] = str_replace(".",",",str_replace(".00","",$row->frequenz));
+ $la["efrq"] = $row->einheit_frequenz;
+ $la["ipb"] = str_replace(".",",",str_replace(".00","",$row->impulsbreite));
+ $la["eipb"] = $row->einheit_impulsbreite;
+ $la["akt"] = $row->aktiv;
+ $la["hstid"] = $row->las_hersteller_ID;
+ if (!$la["hstid"]) $la["hstid"] = -1;
+ $la["suid"] = ($row->schutzst_ID)? $row->schutzst_ID : -1;
+ $la["akt"] = $row->aktiv;
+ $la["persknr"] = $row->vname;
+ $la["pid"] = ($row->persknr) ? $row->persknr : null;
+ $la["geb"] = $row->geb_ID;
+ $la["raum"] = ($row->raum_ID) ? $row->raum_ID : -1;
+ $la["linfo"] = $row->las_info;
+ $la["invnr"] = $row->inventar_nr;
+ $la["leistmax"] = str_replace(".",",",str_replace(".00","",$row->maxleistung));
+ $la["eleistmax"]= $row->einheit_maxleist;
+ $la["suodid"] = $row->schutzst_od_ID;
+ $la["lidref"] = $row->las_ref_ID;
+ $la["tstmp"] = $row->timestamp;
}
}
}
@@ -158,8 +171,8 @@
echo "<tr>
<td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
<td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
- if ($ok) echo "checked";
- echo "></td>\n</tr>\n";
+ if ($ok) echo "checked=\"checked\"";
+ echo " /></td>\n</tr>\n";
}
if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
{
@@ -175,7 +188,7 @@
}
echo "</table>\n";
echo "</div>\n";
- if (!is_null($_SESSION["recht"]) && !in_array("le", $_SESSION["recht"]))
+// if (!is_null($_SESSION["recht"]) && !in_array("le", $_SESSION["recht"]))
echo "<p class='sc'> <a href=\"laser_flist.php\" target=\"_self\" title=\"Laser\">« zur Laserliste</a></p>\n";
echo "</form>\n";
@@ -183,7 +196,171 @@
}
else
{
- echo "speichern";
+ echo "<div align='center'>\n";
+
+ if ($del)
+ {
+ $sql = "DELETE FROM Laser WHERE las_ID = '$laid'";
+ $retld = $dbc -> execute($sql);
+ if ($retld)
+ {
+ echo "<p class='green'><b>DELETE: Daten zu '".$la["lbez"]."' wurden erfolgreich gelöscht.</b></p>\n";
+ include ("inc/laser_dat_show.inc.php");
+ }
+ else
+ {
+ echo "<p class='red'><b>DELETE: Daten zu '".$la["lbez"]."' konnten nicht gelöscht werden!</b></p>\n";
+ echo "sql = $sql<br />";
+ echo "error DELETE: " . $dbc->error . "<br />";
+ }
+ }
+ else //INSERT oder UPDATE
+ {
+ if ($la["lbez"]) $la["lbez"] = substr($la["lbez"],0,250); else $la["lbez"] = null;
+ if ($la["linfo"]) $la["linfo"] = substr($la["linfo"],0,500); else $la["linfo"] = null;
+ if ($la["lart"] == -1) $la["lart"] = null;
+ if ($la["lkla"] == -1) $la["lkla"] = null;
+ if ($la["ltyp"] == -1) $la["ltyp"] = null;
+ if ($la["suid"] == -1) $la["suid"] = null;
+ if ($la["suodid"] == -1) $la["suodid"] = null;
+ if ($la["lidref"] == -1) $la["lidref"] = null;
+// print_r($la); echo "<br /><br />";
+
+ if ($la["hstid"] == -1)
+ {
+ if ($la["herst"] > "!") // neuer Hersteller?
+ {
+ $sql = "SELECT las_hersteller_ID FROM Laser_Hersteller WHERE las_hersteller_bez = '" . ltrim($la["herst"]) . "'";
+ if ($res = $dbc -> queryObjectArray($sql))
+ { // Hersteller vorhanden
+ foreach ($res as $row)
+ $la["hstid"] = $row->las_hersteller_ID;
+ }
+ else
+ { // Hersteller neu
+ $sql = "INSERT INTO Laser_Hersteller (las_hersteller_bez) VALUES (LEFT(TRIM('" . $la["herst"] . "'),50))";
+ $reth = $dbc -> execute($sql);
+ if ($reth) $la["hstid"] = $dbc -> insertId(); else $la["hstid"] = null;
+ }
+ }
+ else
+ $la["hstid"] = null;
+ }
+
+ if ($la["lart"] == -1)
+ {
+ if ($la["lartnew"] > "!") // neue Laserart?
+ {
+ $sql = "SELECT las_art_ID FROM Laser_Art WHERE las_art_bez = '" . ltrim($la["lartnew"]) . "'";
+ if ($res = $dbc -> queryObjectArray($sql))
+ { // Hersteller vorhanden
+ foreach ($res as $row)
+ $la["lart"] = $row->las_art_ID;
+ }
+ else
+ { // Laserart neu
+ $sql = "INSERT INTO Laser_Art (las_art_bez) VALUES (LEFT(TRIM('" . $la["lartnew"] . "'),50))";
+ $reth = $dbc -> execute($sql);
+ if ($reth) $la["lart"] = $dbc -> insertId(); else $la["lart"] = null;
+ }
+ }
+ else
+ $la["lart"] = null;
+ }
+
+ foreach ($la as $key=>$value)
+ {
+ if (is_null($value) || $value < "!") $la["$key"] = null;
+ }
+ if (is_null($la["persknr"])) $la[pid] = null;
+ if (is_numeric(str_replace(",",".",$la["wvon"]))) $la["wvon"] = round(str_replace(",",".",$la["wvon"]),2);
+ if (is_numeric(str_replace(",",".",$la["wbis"]))) $la["wbis"] = round(str_replace(",",".",$la["wbis"]),2);
+ if (is_numeric(str_replace(",",".",$la["leist"]))) $la["leist"] = round(str_replace(",",".",$la["leist"]),2);
+ if (is_numeric(str_replace(",",".",$la["leistmax"]))) $la["leistmax"] = round(str_replace(",",".",$la["leistmax"]),2);
+ if (is_numeric(str_replace(",",".",$la["eng"]))) $la["eng"] = round(str_replace(",",".",$la["eng"]),2);
+ if (is_numeric(str_replace(",",".",$la["apt"]))) $la["apt"] = round(str_replace(",",".",$la["apt"]),2);
+ if (is_numeric(str_replace(",",".",$la["frq"]))) $la["frq"] = round(str_replace(",",".",$la["frq"]),2);
+ if (is_numeric(str_replace(",",".",$la["ipb"]))) $la["ipb"] = round(str_replace(",",".",$la["ipb"]),2);
+
+ $stmt = $dbc -> stmtinit();
+ if (is_object($stmt))
+ {
+ if ($laid)
+ {
+ //update
+ $stmt -> prepare("UPDATE fhiiqm.Laser SET
+ las_bez = ?,
+ las_welle_von = ?,
+ las_welle_bis = ?,
+ las_art_ID = ?,
+ las_klasse_ID = ?,
+ las_typ_ID = ?,
+ leistung = ?,
+ einheit_leistung = ?,
+ energie = ?,
+ einheit_energie = ?,
+ apertur = ?,
+ einheit_apertur = ?,
+ frequenz = ?,
+ einheit_frequenz = ?,
+ impulsbreite = ?,
+ einheit_impulsbreite = ?,
+ las_hersteller_ID = ?,
+ schutzst_ID = ?,
+ aktiv = ?,
+ persknr = ?,
+ raum_ID = ?,
+ las_info = ?,
+ inventar_nr = ?,
+ maxleistung = ?,
+ einheit_maxleist = ?,
+ schutzst_od_ID = ?,
+ las_ref_ID = ?
+ WHERE las_ID = '$laid'");
+ $stmt -> bind_param('sddisidididididiiiiiissdiii',$la["lbez"],$la['wvon'],$la['wbis'],$la["lart"],$la['lkla'],
+ $la['ltyp'],$la['leist'],$la["eleist"],$la["eng"],$la["eeng"],$la["apt"],$la["eapt"],$la["frq"],$la["efrq"],
+ $la["ipb"],$la["eipb"],$la["hstid"],$la["suid"],$la["akt"],$la["pid"],$la["raum"],$la["linfo"],
+ $la["invnr"],$la["leistmax"],$la["eleistmax"],$la["suodid"],$la["lidref"]);
+
+ $res = $stmt -> execute();
+ if ($stmt->error) echo "UPDATE Laser, error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
+ if ($res)
+ echo "<p class='green'><b>UPDATE: Daten zu '".$la["lbez"]."' wurden erfolgreich gespeichert.</b></p>\n";
+ else
+ echo "<p class='red'><b>UPDATE: Daten zu '".$la["lbez"]."' konnten nicht gespeichert werden!</b></p>\n";
+
+ }
+ else
+ {
+ //insert
+ $stmt -> prepare("INSERT INTO fhiiqm.Laser (las_bez, las_welle_von, las_welle_bis, las_art_ID,
+ las_klasse_ID, las_typ_ID, leistung, einheit_leistung, energie, einheit_energie,
+ apertur, einheit_apertur, frequenz, einheit_frequenz, impulsbreite, einheit_impulsbreite,
+ las_hersteller_ID, schutzst_ID, aktiv, persknr, raum_ID, las_info,
+ inventar_nr,maxleistung, einheit_maxleist,schutzst_od_ID,las_ref_ID)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+ $stmt -> bind_param('sddisidididididiiiiiissdiii',$la["lbez"],$la['wvon'],$la['wbis'],$la["lart"],$la['lkla'],
+ $la['ltyp'],$la['leist'],$la["eleist"],$la["eng"],$la["eeng"],$la["apt"],$la["eapt"],$la["frq"],$la["efrq"],
+ $la["ipb"],$la["eipb"],$la["hstid"],$la["suid"],$la["akt"],$la["pid"],$la["raum"],$la["linfo"],
+ $la["invnr"],$la["leistmax"],$la["eleistmax"],$la["suodid"],$la["lidref"]);
+ $res = $stmt -> execute();
+// print_r($stmt); echo "<br /><br />";
+ if ($stmt->error) echo "INSERT Laser, error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
+ if ($res)
+ {
+ $la["lid"] = $dbc -> insertId();
+ echo "<p class='green'><b>INSERT: Daten zu '".$la["lbez"]."' wurden erfolgreich gespeichert.</b></p>\n";
+ }
+ else
+ echo "<p class='red'><b>INSERT: Daten zu '".$la["lbez"]."' konnten nicht gespeichert werden!</b></p>\n";
+ }
+ if ($res) include ("inc/laser_dat_show.inc.php");
+ }
+
+ }
+ echo "</div>\n";
+ echo "<p class=\"sc\"> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Laser erfassen\">Weiteren Laser erfassen</a></p>\n";
+ echo "<p class=\"sc\"> <a href=\"laser_flist.php\" target=\"_self\" title=\"Laser\">Laserliste</a></p>\n";
}
?>
</body>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/laser_flist.php Thu Jan 12 11:41:22 2012 +0100
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 01/2012
+ *
+ * Laser-Liste
+ */
+
+ 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("lr",$_SESSION["recht"]) && !in_array("le",$_SESSION["recht"])))
+ {
+ header("Location: start.php");
+ exit;
+ }
+
+ include_once($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+?>
+
+<!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 type="text/css" href="/fhiiqm/css/db.css" rel="Stylesheet" media="screen"/>
+ <link type="text/css" href="/fhiiqm/css/db_print.css" rel="Stylesheet" media="print"/>
+ <title>Liste Laser</title>
+ </head>
+
+ <body onload="document.ffilter.filter.focus();">
+
+<?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/laser.png\" border=\"0\" alt=\"Laser\" title=\"Laser\"/></div>\n";
+
+ // Felder, nach denen gefiltert werden kann
+ $fields = array(2=>"ID",3=>"Bezeichnung",4=>"Art",5=>"Klasse",6=>"Typ",7=>"Schutzstufe",8=>"Hersteller",9=>"'in Betrieb'",
+ 10=>"Haus",11=>"Raum-Nr.",12=>"Verantwortlicher",13=>"Referenz-ID");
+
+ $zeil = $_GET["z"];
+ if (!$zeil) $zeil = $_POST["z"];
+ if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
+ $start = $_GET["st"];
+ if (!$start) $start=0;
+
+ $sort = $_GET["s"]; // Sortierung nach Spalte
+ if (!isset($sort) && !$sort) $sort = $_POST["s"];
+
+ $dir = $_GET["d"]; // Sortierrichtung
+ if (!isset($dir) && !$dir) $dir = $_POST["d"];
+
+ $fnum = $_GET["f"]; // Spaltennummer, nach der aktuell gefiltert wird
+ if (!isset($fnum) && !$fnum) $fnum = $_POST["f"];
+
+ $filter = $_POST["filter"];
+ if (!isset($filter) && !$filter) $filter = $_GET["b"];
+
+ $subf = $_POST["subf"]; // submit
+
+ if (!isset($fnum) && !$fnum) $fnum = 1;
+ if (!isset($filter) && !$filter) $filter = "";
+ if (!isset($sort) && !$sort) $sort = 2;
+ if (!isset($dir) && !$dir) $dir = "";
+
+ include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+
+ // Filter 'aktiv'
+ if ($fnum == 9)
+ {
+ if ($filter == "ja") $filter = "1";
+ elseif ($filter == "nein") $filter = "0";
+ else $filter = "";
+ }
+ $sql = "CALL laser_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,@anz,@anzpl);";
+ // Parameter: Nr. Sortfeld, Sortierrichtung, Nr. Filterfeld, Filterbegriff, Startsatz(0), Anzahl zu liefernde DS, Anzahl gefundener Laser
+ $result = $dbc ->queryObjectArray($sql);
+
+ if ($result)
+ {
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+
+ echo "<div align='center'>\n";
+ echo "<p><b>Laser</b></p>\n";
+
+ echo "<table border='0' cellspacing='0'>\n";
+ echo "<tr><td class='bigger'>Mittels '<img src='/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />'
+ können Sie nach relevanten Spalten auf- bzw. absteigend sortieren</td></tr>
+ <tr><td class='bigger'>'<img src='/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' ermöglicht das Filtern nach ausgewählten Spalten der Liste</td></tr>
+ <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten ";
+ if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
+ echo ", '<img src='/fhiiqm/img/duplicate.gif' border='0' hight='11'>' - Duplizieren";
+ echo " des Lasers</td></tr>\n";
+ echo "</table>\n";
+
+ $anz = $dbc -> querySingleItem("SELECT @anz");
+ $anzpl = $dbc -> querySingleItem("SELECT @anzpl");
+
+ printf ("<p>Anzahl Laser: %s, Anzahl physischer Laser: %s </p>", $anz, $anzpl);
+
+ if (isset($fnum) && $fnum>1 && !$filter && !$subf)
+ {
+ // Formular anzeigen fuer Filterbegriff
+ $text = $fields[$fnum];
+ echo "<form action=" . $_SERVER['PHP_SELF'] . " method='post' enctype='application/x-www-form-urlencoded' id='ffilter' name='ffilter' target='_self'>\n";
+ echo "<input type='hidden' name='s' value='$sort'>";
+ echo "<input type='hidden' name='d' value='$dir'>";
+ echo "<input type='hidden' name='f' value='$fnum'>";
+ echo "<table width=\"25%\" border=\"0\">\n";
+ echo "<tr><td>filtern nach $text: </td>";
+ echo "<td><input id='filter' name='filter' type=\"text\" size=\"10\" maxlength=\"30\" value=\"$filter\"/></td>";
+
+ echo "<td><input class=\"button\" type=\"submit\" value=\"finden\" name=\"subf\" title=\"subf\" /></td></tr></table>\n";
+ echo "</form>\n";
+ echo "<p> </p>\n";
+ }
+ echo "<table width='99%'>\n";
+
+ if ($filter>'!') echo "<tr><td class='bigger' colspan=6>Filter: ". $fields["$fnum"] . " wie '$filter'</td><tr>\n";
+
+ // Listenkopf generieren
+ echo "<tr bgcolor='#68ACBF'>";
+ tab_column(2,"ID",$sort,$dir,2,$fnum,$filter,$start,$zeil);
+ tab_column(13,"ref-ID",$sort,$dir,13,$fnum,$filter,$start,$zeil);
+ tab_column(3,"Bezeichnung",$sort,$dir,3,$fnum,$filter,$start,$zeil);
+ echo "<th>Welle</th>";
+ tab_column(4,"Art",$sort,$dir,4,$fnum,$filter,$start,$zeil);
+ tab_column(6,"Typ",$sort,$dir,6,$fnum,$filter,$start,$zeil);
+ tab_column(5,"Klasse",$sort,$dir,5,$fnum,$filter,$start,$zeil);
+ tab_column(7,"Schutzst.",$sort,$dir,7,$fnum,$filter,$start,$zeil);
+ tab_column(8,"Hersteller",$sort,$dir,8,$fnum,$filter,$start,$zeil);
+ tab_column(9,"Betrieb",$sort,$dir,9,$fnum,$filter,$start,$zeil);
+ tab_column(10,"Haus",$sort,$dir,10,$fnum,$filter,$start,$zeil);
+ tab_column(11,"Raum",$sort,$dir,11,$fnum,$filter,$start,$zeil);
+ tab_column(12,"Verantw.",$sort,$dir,12,$fnum,$filter,$start,$zeil);
+
+ echo "<th> </th>";
+ if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
+ echo "<th> </th></tr>\n";
+
+ foreach ($result as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'><td>$row->las_ID</td>";
+ echo "<td>$row->las_ref_ID</td>";
+ echo "<td>$row->las_bez</td>";
+ echo "<td>" .str_replace(".",",",str_replace(".00","",$row->las_welle_von))." - ".str_replace(".",",",str_replace(".00","",$row->las_welle_bis))."</td>";
+ echo "<td>$row->las_art_bez</td>";
+ echo "<td>$row->las_typ_bez</td>";
+ echo "<td>$row->las_klasse_bez</td>";
+ echo "<td>$row->schutzst_bez</td>";
+ echo "<td>$row->las_hersteller_bez</td>";
+ echo "<td>"; echo ($row->aktiv) ? "ja" : "nein"; echo "</td>";
+ echo "<td>$row->geb_ID</td>";
+ echo "<td>$row->raum_nr</td>";
+ echo "<td>$row->vma</td>";
+ echo "<td><a href='/fhiiqm/laser_ed.php?i=$row->las_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
+ if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
+ echo "<td><a href='/fhiiqm/laser_ed.php?i=$row->las_ID&d=1&c=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
+ }
+ echo "</table></div>\n";
+
+ echo "<br /> ";
+
+ // Sortierung und Filter aus $_GET fuer weitere Seiten
+ foreach ($_GET as $key=>$val)
+ {
+ if ($key != "st") $liste .= "&" . $key ."=".$val;
+ }
+ // Sortierung und Filter aus $_POST fuer weitere Seiten
+ if ($subf)
+ foreach ($_POST as $key=>$val)
+ {
+ if ($key != "st" && $key != "subf" && $key != "filter") $liste .= "&" . $key ."=".$val;
+ if ($key == "filter") $liste .= "&b=" . $val;
+ }
+
+ // Links auf andere Seiten generieren
+ liste_links($start,$zeil,$panz,$liste);
+
+ }
+ else
+ {
+ if ($dbc -> error)
+ echo "error: " . $dbc -> error . "<br />\n";
+ {
+ echo "<p class='red'> Leider nichts gefunden für ". $fields["$fnum"] . " wie '$filter'!</p><br />";
+ echo " <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Laserliste\" class=\"sc\">Laserliste</a></p>\n";
+ }
+
+ }
+ $dbc -> close();
+ if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
+ echo "<p> <a href=\"/fhiiqm/laser_ed.php\" target=\"_self\" title=\"Laser erfassen\" class=\"sc\">Weiteren Laser erfassen</a></p>\n";
+
+?>
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/recht_list.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/recht_list.php Thu Jan 12 11:41:22 2012 +0100
@@ -4,7 +4,7 @@
* @author Bettina Schwarzer, Fritz-Haber-Institut
* @copyright 10/2011
*
- * INSERT Rechte
+ * Liste User fhiiqm
*/
error_reporting(E_ALL ^ E_NOTICE);
@@ -46,10 +46,13 @@
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+ echo "<div align='center'>\n";
+ echo "<table><tr><td class='valignb'>";
+
$sql = "SELECT u.persknr, CONCAT (nachname, ', ',vorname) AS ma, userid,
CASE WHEN ISNULL(pwd) THEN '-' ELSE 'ja' END AS pw
FROM fhiiqm.userweb u INNER JOIN fhiiqm.Mitarbeiter m ON u.persknr = m.persknr
- ORDER BY ma";
+ ORDER BY userid";
if ($result = $dbc -> queryObjectArray($sql))
{
$bg1 = "#F8F8F8";
@@ -74,6 +77,91 @@
}
echo "</table></div>\n";
}
+ echo "</td><td class='valignb'>";
+ // Liste der Rechte je userid
+ $sql = "SELECT userid,
+ count(CASE recht_ID WHEN 'ar' THEN 1 END) AS anlage_read,
+ COUNT(CASE recht_ID WHEN 'ae' THEN 1 END) AS anlage_edit,
+ COUNT(CASE recht_ID WHEN 'fmr' THEN 1 END) AS funkt_ma_read,
+ COUNT(CASE recht_ID WHEN 'fme' THEN 1 END) AS funkt_ma_edit,
+ COUNT(CASE recht_ID WHEN 'ir' THEN 1 END) AS info_read,
+ COUNT(CASE recht_ID WHEN 'ie' THEN 1 END) AS info_edit,
+ COUNT(CASE recht_ID WHEN 'lr' THEN 1 END) AS laser_read,
+ COUNT(CASE recht_ID WHEN 'le' THEN 1 END) AS laser_edit,
+ COUNT(CASE recht_ID WHEN 'pr' THEN 1 END) AS prod_read,
+ COUNT(CASE recht_ID WHEN 'pe' THEN 1 END) AS prod_edit,
+ COUNT(CASE recht_ID WHEN 'rr' THEN 1 END) AS raum_read,
+ COUNT(CASE recht_ID WHEN 're' THEN 1 END) AS raum_edit,
+ COUNT(CASE recht_ID WHEN 'rtr' THEN 1 END) AS recht_read,
+ COUNT(CASE recht_ID WHEN 'rte' THEN 1 END) AS recht_edit,
+ COUNT(CASE recht_ID WHEN 'vr' THEN 1 END) AS vertrag_read,
+ COUNT(CASE recht_ID WHEN 've' THEN 1 END) AS vertrag_edit,
+ COUNT(CASE recht_ID WHEN 'vpr' THEN 1 END) AS vertr_part_read,
+ COUNT(CASE recht_ID WHEN 'vpe' THEN 1 END) AS vertr_part_edit
+ FROM `fhiiqm`.`user_recht`
+ GROUP BY userid";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+
+ echo "<div align='center'>\n";
+ echo "<p><br /><b>fhiiqm-Nutzer und zugeordnete Rechte</b> ('edit' impliziert 'read')</p>\n";
+
+ echo "<table cellpadding='2' cellspacing='2'>\n";
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ echo "<th> </th>
+ <th colspan='2'>Anlage</th>
+ <th colspan='2'>Funkt.-MA</th>
+ <th colspan='2'>Info</th>
+ <th colspan='2'>Laser</th>
+ <th colspan='2'>Produkt</th>
+ <th colspan='2'>Raum</th>
+ <th colspan='2'>Recht</th>
+ <th colspan='2'>Vertrag</th>
+ <th colspan='2'>Vertr.Partner</th></tr>\n";
+ echo "<tr bgcolor='#68ACBF'>";
+ echo "<th>userid</th><th>read</th><th>edit</th>
+ <th>read</th><th>edit</th>
+ <th>read</th><th>edit</th>
+ <th>read</th><th>edit</th>
+ <th>read</th><th>edit</th>
+ <th>read</th><th>edit</th>
+ <th>read</th><th>edit</th>
+ <th>read</th><th>edit</th>
+ <th>read</th><th>edit</th>
+ </tr>\n";
+ foreach ($result as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'><td><b>$row->userid</b><img src=\"/fhiiqm/img/transp.png\" width=\"2\" height=\"12\" border='0'/></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->anlage_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->anlage_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->funkt_ma_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->funkt_ma_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->info_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->info_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->laser_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->laser_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->prod_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->prod_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->raum_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->raum_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->recht_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->recht_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->vertrag_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->vertrag_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->vertr_part_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->vertr_part_edit)) ."</b></td>";
+ echo "</tr>\n";
+ }
+ echo "</table></div>\n";
+ }
+
+ echo "</td></tr></table></div>\n";
+
if (!is_null($_SESSION["recht"]) && in_array("re",$_SESSION["recht"]))
echo "<p class=\"sc\"> <a href=\"/fhiiqm/recht_ed.php\" target=\"_self\" title=\"Nutzer erfassen\">Weiteren Nutzer & Rechte erfassen</a></p>\n";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/user_recht_list.php Thu Jan 12 11:41:22 2012 +0100
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 01/2012
+ *
+ * Liste Rechte je Nutzer
+ */
+
+
+ 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("rte",$_SESSION["recht"]) && !in_array("rtr",$_SESSION["recht"])))
+ {
+ 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 type="text/css" href="/fhiiqm/css/db.css" rel="Stylesheet" media="screen"/>
+ <link type="text/css" href="/fhiiqm/css/db_print.css" rel="Stylesheet" media="print"/>
+ <title>Nutzer-Recht fhiiqm</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/user_go.png\" border=\"0\" alt=\"User, Rechte eingeben\" title=\"User, Rechte eingeben\"/></div>\n";
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+ $sql = "SELECT userid,
+ count(CASE recht_ID WHEN 'ar' THEN 1 END) AS anlage_read,
+ COUNT(CASE recht_ID WHEN 'ae' THEN 1 END) AS anlage_edit,
+ COUNT(CASE recht_ID WHEN 'fmr' THEN 1 END) AS funkt_ma_read,
+ COUNT(CASE recht_ID WHEN 'fme' THEN 1 END) AS funkt_ma_edit,
+ COUNT(CASE recht_ID WHEN 'ir' THEN 1 END) AS info_read,
+ COUNT(CASE recht_ID WHEN 'ie' THEN 1 END) AS info_edit,
+ COUNT(CASE recht_ID WHEN 'lr' THEN 1 END) AS laser_read,
+ COUNT(CASE recht_ID WHEN 'le' THEN 1 END) AS laser_edit,
+ COUNT(CASE recht_ID WHEN 'pr' THEN 1 END) AS prod_read,
+ COUNT(CASE recht_ID WHEN 'pe' THEN 1 END) AS prod_edit,
+ COUNT(CASE recht_ID WHEN 'rr' THEN 1 END) AS raum_read,
+ COUNT(CASE recht_ID WHEN 're' THEN 1 END) AS raum_edit,
+ COUNT(CASE recht_ID WHEN 'rtr' THEN 1 END) AS recht_read,
+ COUNT(CASE recht_ID WHEN 'rte' THEN 1 END) AS recht_edit,
+ COUNT(CASE recht_ID WHEN 'vr' THEN 1 END) AS vertrag_read,
+ COUNT(CASE recht_ID WHEN 've' THEN 1 END) AS vertrag_edit,
+ COUNT(CASE recht_ID WHEN 'vpr' THEN 1 END) AS vertr_part_read,
+ COUNT(CASE recht_ID WHEN 'vpe' THEN 1 END) AS vertr_part_edit
+ FROM `fhiiqm`.`user_recht`
+ GROUP BY userid";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+
+ echo "<div align='center'>\n";
+ echo "<p><b>Liste der fhiiqm-Nutzer und Rechte</b></p>\n";
+ echo "<p>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Sichten/Bearbeiten der Nutzer-Rechte</p>";
+
+ echo "<table cellpadding='2' cellspacing='2'>\n";
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ echo "<th>userid</th><th>Anlage read</th><th>Anlage edit</th>
+ <th>FktMa read</th><th>FktMa edit</th>
+ <th>Info read</th><th>Info edit</th>
+ <th>Laser read</th><th>Laser edit</th>
+ <th>Prod read</th><th>Prod edit</th>
+ <th>Raum read</th><th>Raum edit</th>
+ <th>Recht read</th><th>Recht edit</th>
+ <th>Vertrag read</th><th>Vertrag edit</th>
+ <th>VtrPart read</th><th>VtrPart edit</th>
+ </tr>\n";
+ foreach ($result as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'><td><b>$row->userid</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->anlage_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->anlage_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->funkt_ma_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->funkt_ma_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->info_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->info_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->laser_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->laser_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->prod_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->prod_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->raum_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->raum_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->recht_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->recht_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->vertrag_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->vertrag_edit)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->vertr_part_read)) ."</b></td>";
+ echo "<td class='center'><b>" . str_replace("0"," ",str_replace("1","x",$row->vertr_part_edit)) ."</b></td>";
+ echo "</tr>\n";
+ }
+ echo "</table></div>\n";
+ }
+ if (!is_null($_SESSION["recht"]) && in_array("re",$_SESSION["recht"]))
+ echo "<p class=\"sc\"> <a href=\"/fhiiqm/recht_ed.php\" target=\"_self\" title=\"Nutzer erfassen\">Weiteren Nutzer & Rechte erfassen</a></p>\n";
+
+?>
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/vertrag_flist1.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/vertrag_flist1.php Thu Jan 12 11:41:22 2012 +0100
@@ -105,6 +105,8 @@
$bg2 = "#DEDFE1";
$bg = "#FFFFFF";
+ $heute = new DateTime();
+
$vanz = $dbc -> querySingleItem("SELECT @anz");
echo "<p><b>Verträge - Übersicht</b></p>\n";
@@ -164,7 +166,14 @@
foreach ($result as $row)
{
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
- echo "<tr bgcolor='" . $bg . "'><td width='17%'><b>$row->cname</b></td>";
+ echo "<tr bgcolor='" . $bg . "'>";
+ if ($row->cend)
+ {
+ $ce = new DateTime($row->cend);
+ if ((!$row->cauto || is_null($row->cauto)) && $heute > $ce) $class="class='red'"; else $class="";
+ }
+ else $class="";
+ echo "<td width='17%' $class><b>$row->cname<br /></b></td>";
// echo "<td>$row->contract_s</td>";
echo "<td width='22%'>" . nl2br($row->clong) . "</td>";
echo "<td>$row->typ</td>";
--- a/fhiiqm/vertrag_flist2.php Fri Dec 23 15:03:37 2011 +0100
+++ b/fhiiqm/vertrag_flist2.php Thu Jan 12 11:41:22 2012 +0100
@@ -85,6 +85,8 @@
$bg2 = "#DEDFE1";
$bg = "#FFFFFF";
+ $heute = new DateTime();
+
$vanz = $dbc -> querySingleItem("SELECT @anz");
$ganz = $dbc -> querySingleItem("SELECT @ganz");
@@ -123,7 +125,13 @@
if ($row->contract_ID != $cid)
{ // Anzeigen der nur einmal relevanten Daten
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
- echo "<tr bgcolor='" . $bg . "'><td><b>$row->cname</b></td>";
+ if ($row->cend)
+ {
+ $ce = new DateTime($row->cend);
+ if ((!$row->cautoend || is_null($row->cautoend)) && $heute > $ce) $class="class='red'"; else $class="";
+ }
+ else $class="";
+ echo "<tr bgcolor='" . $bg . "'><td $class><b>$row->cname</b></td>";
// echo "<td>$row->contract_s</td>";
if ($row->cbegin)
{
@@ -132,10 +140,7 @@
}
else echo "<td> </td>";
if ($row->cend)
- {
- $ce = new DateTime($row->cend);
echo "<td>" . $ce->format('d.m.Y')."</td>";
- }
else echo "<td> </td>";
if ($row->cautoend) echo "<td>automatisch</td>"; else echo "<td> </td>";
echo "<td class='center'>$row->kmon</td>"; 
