--- a/fhiiqm/alvtr_flist.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/alvtr_flist.php Mon Feb 06 13:44:00 2012 +0100
@@ -198,7 +198,7 @@
}
$dbc -> close();
if (!is_null($_SESSION["recht"]) && in_array("ae",$_SESSION["recht"]))
- echo "<p> <a href=\"/fhiiqm/anlage_ed.php\" target=\"_self\" title=\"Anlage-Vertrag erfassen\" class=\"sc\">Vertrag zu Anlage erfassen</a></p>\n";
+ echo "<p> <a href=\"/fhiiqm/alvtr_ed.php\" target=\"_self\" title=\"Anlage-Vertrag erfassen\" class=\"sc\">Vertrag Anlage zuordnen</a></p>\n";
echo "<p> <a href=\"/fhiiqm/anlage_flist.php\" target=\"_self\" title=\"Anlagenliste\" class=\"sc\">Anlagenliste</a>";
echo " | <a href=\"/fhiiqm/vertrag_flist1.php\" target=\"_self\" title=\"Vertragsliste\" class=\"sc\">Vertragsliste</a></p>\n";
--- a/fhiiqm/anlage_ed.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/anlage_ed.php Mon Feb 06 13:44:00 2012 +0100
@@ -24,7 +24,8 @@
include_once($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/dbconnect.inc.php");
if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-
+ $kat = $_GET["k"]; // nur fuer bestimmte Kategorie
+
$al = $_POST["al"];
$alid = $_GET["i"];
$copy = $_GET["c"];
@@ -96,9 +97,17 @@
<?php
// print_r($al);
+ if (isset($kat) && $kat)
+ {
+ $sql = "SELECT al_kat_bez FROM fhiiqm.A_Kategorie WHERE al_kat_ID=$kat";
+ $kat_bez = $dbc->querySingleItem($sql);
+ }
if ($alid) $text = "editieren"; else $text = "erfassen";
if ($copy) $duptext = " (Kopie)";
- echo "<h3>Anlage $text$duptext<h3>";
+ if ($kat_bez)
+ echo "<h3>$kat_bez $text$duptext<h3>";
+ else
+ echo "<h3>Anlage $text$duptext<h3>";
echo "</div>\n";
@@ -130,8 +139,9 @@
}
}
- elseif (!$alid && !$sub && isset($al))
+ elseif (!$alid && !$sub && (isset($al) || $kat))
{ // Default-Einstellung abhaengig von Anlagenkategorie bei Erfassen
+ if ($kat) $al["kat"] = $kat;
$sql = "SELECT al_kat_ID,al_befgrad_ID,al_pruefart_ID,al_pruefintv_ID
FROM fhiiqm.A_kat_std
WHERE al_kat_ID = " . $al["kat"];
@@ -274,7 +284,13 @@
}
echo "</div>\n";
echo "<p class=\"sc\"> <a href=\"anlage_flist.php\" target=\"_self\" title=\"Anlagen\">Anlagenenliste</a>\n";
- echo " | <a href=\"anlage_ed.php\" target=\"_self\" title=\"Anlage erfassen\">Weitere Anlage erfassen</a></p>";
+ if ($kat)
+ $parm = "?k=$kat";
+ else
+ {
+ $parm = ""; $kat_bez = "Anlage";
+ }
+ echo " | <a href=\"anlage_ed.php$parm\" target=\"_self\" title=\"$kat_bez erfassen\">Weitere $kat_bez erfassen</a></p>";
echo "<p class=\"sc\"> <a href=\"/fhiiqm/alpruef_flist.php\" target=\"_self\" title=\"Anlagenpruefung-Liste\">Liste Anlagenprüfungen</a>";
echo " | <a href=\"/fhiiqm/alpruef_ed.php\" target=\"_self\" title=\"Anlagenpruefung erfassen\">Anlagenprüfung erfassen</a></p>\n";
echo "<p class=\"sc\"> <a href=\"/fhiiqm/alrisk_flist.php\" target=\"_self\" title=\"Anlagenrisiko-Liste\">Liste Anlagenrisiken</a>";
--- a/fhiiqm/css/navio.css Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/css/navio.css Mon Feb 06 13:44:00 2012 +0100
@@ -49,7 +49,7 @@
#navio ul li:hover ul {display:block;}
#navio ul ul li {
- width:25em;
+ width:28em; /* Breit Untermenu (Ebene 2) */
float:left;
}
#navio ul ul li:hover {border:none; position:relative;} /* andere background-color hier angeben */
--- a/fhiiqm/form/anlage_form.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/form/anlage_form.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -15,7 +15,7 @@
?>
<div align="center">
<table>
-<tr><td class="bigger">Die Auswahl eines Anlagenverantwortlichen geschieht durch<br />Eingeben von mindesten 2 Zeichen in das 'Verantwortlicher'-Feld.
+<tr><td class="bigger">Die Auswahl eines Verantwortlichen geschieht durch Eingeben von<br />mindesten 2 Zeichen in das 'Verantwortlicher'-Feld.
</td></tr>
<tr><td class="bigger">Umlaute wie 'ä', 'ü', 'ö', 'ß' werden nicht gefunden, bitte benachbarte Zeichen eingeben.</td></tr>
<tr><td class="bigger"> </td></tr>
@@ -46,8 +46,14 @@
<select name="al[kat]" onchange="this.form.submit();">
<?php
if ($al['kat'] == -1) $select = " selected "; else $select = "";
- echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT al_kat_bez, al_kat_ID FROM `fhiiqm`.`A_Kategorie` ORDER BY 2";
+ if (isset($kat) && $kat)
+ $wher = " WHERE al_kat_ID = $kat";
+ else
+ {
+ $wher = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ }
+ $sql = "SELECT al_kat_bez, al_kat_ID FROM `fhiiqm`.`A_Kategorie` $wher ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
@@ -63,7 +69,7 @@
</td>
</tr>
<?php
- if ($al["kat"] != 6) // Gasflaschen
+// if ($al["kat"] != 6) // Gasflaschen
{
?>
<tr><td>Befähigungsgrad</td>
--- a/fhiiqm/form/laser_form.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/form/laser_form.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -21,7 +21,7 @@
<tr><td class="bigger"> </td></tr>
</table>
</div>
-<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="fanl">
+<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="flas">
<div align="center">
<table border="0" cellspacing="3" cellpadding="3">
<!-- <div class="ui-widget"> -->
--- a/fhiiqm/form/raum_form.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/form/raum_form.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -84,6 +84,26 @@
?>
</select>
</td>
+ <tr>
+ <td>Reinigungs-Typ</td>
+ <td><select name="raum[reityp]">
+ <?php
+ if ($raum['reityp'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT reinigung_typ_ID, reinigung_typ_bez FROM fhiiqm.Reinigung_Typ ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->reinigung_typ_ID == $raum['reityp'])
+ echo "<option selected value=\"$row->reinigung_typ_ID\">$row->reinigung_typ_ID: $row->reinigung_typ_bez</option>\n";
+ else
+ echo "<option value=\"$row->reinigung_typ_ID\">$row->reinigung_typ_ID: $row->reinigung_typ_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
</tr>
<tr>
<td>Raum-Fläche (m<sup>2</sup>)</td>
--- a/fhiiqm/form/vertrag_form.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/form/vertrag_form.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -146,7 +146,7 @@
else
echo "<option></option>\n";
$ja1 = $vtr['bjahr'];
- for ($i=2000; $i<2036; $i++)
+ for ($i=1990; $i<2036; $i++)
{ if ($i==intval($ja1))
echo "<option selected>$ja1</option>\n";
else
@@ -299,7 +299,7 @@
if ($vtr['bjahr'])
{
echo "<tr>
- <td>jährliche Kosten (€)</td><br />
+ <td>jährliche Teilbrutto-Kosten (€)</td><br />
<td>";
$j=0;
if ($vtr['ejahr'])
@@ -313,14 +313,14 @@
for ($i=(int)$vtr['bjahr']; $i<(int)$ejahr+1; $i++ )
{
echo "<input name=\"vertrag[kjahr][$j]\" type=\"text\" size=\"4\" value=\"$i\"/> ";
- echo "<input name=\"vertrag[kost][$j]\" type=\"text\" value=\"" . $vtr['kost'][$j] . "\"/><br />\n";
+ echo "<input class='right' name=\"vertrag[kost][$j]\" type=\"text\" value=\"" . $vtr['kost'][$j] . "\"/><br />\n";
$j++;
}
}
else
{
echo "<input name=\"vertrag[kjahr][$j]\" type=\"text\" size=\"4\" value=\"" . $vtr['bjahr'] . "\"/> ";
- echo "<input name=\"vertrag[kost][$j]\" type=\"text\" value=\"" . $vtr['kost'][$j] . "\"/>";
+ echo "<input class='right' name=\"vertrag[kost][$j]\" type=\"text\" value=\"" . $vtr['kost'][$j] . "\"/>";
}
echo "</td>
Binary file fhiiqm/img/script_edit.png has changed
--- a/fhiiqm/inc/anlage_dat_show.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/inc/anlage_dat_show.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -33,12 +33,15 @@
echo "<tr><td>Prüfart: </td><td>" . $row->al_pruefart_ID.": " . $row->al_pruefart_bez . "</td></tr>\n";
}
// Pruefintervall
- $sql = "SELECT al_pruefintv_ID,al_pruefintv_bez FROM fhiiqm.A_PruefIntv WHERE al_pruefintv_ID = '" . $al["pintv"] . "'";
- if ($result = $dbc->queryObjectArray($sql))
+ if (!is_null($al["pintv"]))
{
- foreach ($result as $row)
- echo "<tr><td>Prüfintervall: </td><td>" . $row->al_pruefintv_bez . "</td></tr>\n";
- }
+ $sql = "SELECT al_pruefintv_ID,al_pruefintv_bez FROM fhiiqm.A_PruefIntv WHERE al_pruefintv_ID = '" . $al["pintv"] . "'";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ echo "<tr><td>Prüfintervall: </td><td>" . $row->al_pruefintv_bez . "</td></tr>\n";
+ }
+ }
// Raum
$sql = "SELECT raum_nr,raum_name,r.geb_ID,geb_name
FROM fhiiqm.Raum r INNER JOIN fhiiqm.Haus h ON r.geb_ID = h.geb_ID
--- a/fhiiqm/inc/dbconnect.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/inc/dbconnect.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -87,8 +87,10 @@
return $result_arr;
}
else
- {
+ { //kein Ergebnis
$this->error = "";
+ $this->result->free();
+ $this->_connid->next_result(); // wegen OUT-Parameter in stored procedures
return false;
}
}
--- a/fhiiqm/inc/func_lib.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/inc/func_lib.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -7,7 +7,7 @@
*
*/
- function tab_column($colnum=2,$bez,$sort,$dir,$fcol=0,$fanr=0,$filtb="",$start="",$anzds="25")
+ function tab_column($colnum=2,$bez,$sort,$dir,$fcol=0,$fanr=0,$filtb="",$start="",$anzds="25",$id="")
{
/** beliebige Tabellenspalte mit Sortier-/Filtersymbolen und Links generieren
* Parameter
@@ -20,6 +20,7 @@
* $filtb Filterbegriff
* $start ab Datensatz $start+1
* $anzds Anzahl angezeigter Datensaetze
+ * $id fuer spezielle ID als zusaetzl. Filter (Laser-Log))
*/
if ($colnum == $sort)
@@ -43,11 +44,11 @@
if ($fcol>0 && $fanr>0) // Filtern nach Spalte moeglich
{
if ($fcol == $fanr) $filt = "filter_activ"; else $filt = "filter";
- $filt = " <a href='".$_SERVER['PHP_SELF']."?f=$fcol&s=$sort&d=$dir&st=$start&z=$anzds'><img src='/fhiiqm/img/$filt.gif' border='0' width='14' hight='11' alt='$tip' title='$tip'></a>";;
+ $filt = " <a href='".$_SERVER['PHP_SELF']."?f=$fcol&s=$sort&d=$dir&st=$start&z=$anzds&i=$id'><img src='/fhiiqm/img/$filt.gif' border='0' width='14' hight='11' alt='$tip' title='$tip'></a>";;
}
else
$filt="";
- if ($filtb>'!') $where = "&f=$fanr&b=$filtb"; else $where="";
+ if ($filtb>'!') $where = "&f=$fanr&b=$filtb&i=$id"; else $where="&i=$id";
echo "<th>$bez <a href='".$_SERVER['PHP_SELF']."?s=$colnum$where&st=$start&z=$anzds'><img src='/fhiiqm/img/$auf.gif' border='0' width='11' hight='11' alt='sort aufsteigend' title='sort aufsteigend'></a>
<a href='".$_SERVER['PHP_SELF']."?s=$colnum&d=DESC$where&st=$start&z=$anzds'><img src='/fhiiqm/img/$ab.gif' border='0' width='11' hight='11' alt='sort absteigend' title='sort absteigend'></a>$filt</th>\n";
}
@@ -256,6 +257,51 @@
/*
return $query;
*/
+ }
+
+ function dbformat_wert($wert)
+ {
+ /** wandelt Dezimalzahl mit Komma und Tausender-Trennzeichen in Datenbankformat
+ *
+ * Parameter
+ * $wert - zu konvertierende Zahl
+ */
+
+ if (isset($wert) && $wert<>0)
+ {
+ if (strpos($wert,',') >0)
+ {
+ $wert = str_replace(',','.',$wert);
+ $aw = explode('.',$wert);
+ if (count($aw) > 2) // mit Dezimalpunkt und Tausendertrennzeichen
+ {
+ for ($i=0; $i<count($aw)-1; $i++)
+ {
+ $dbw .= $aw[$i];
+ }
+ $dbw .= "." .$aw[count($aw)-1];
+ }
+ else // kein Dezimalpunkt,nur Kommastellen
+ $dbw = $wert;
+ }
+ else
+ {
+ $aw = explode('.',$wert);
+ if (strlen($aw[count($aw)-1]) == 2)
+ {
+ for ($i=0; $i<count($aw)-1; $i++)
+ {
+ $dbw .= $aw[$i];
+ }
+ $dbw .= "." .$aw[count($aw)-1];
+ }
+ else
+ $dbw = str_replace('.','',$wert);
+ }
+ return $dbw;
+ }
+ else
+ return 0;
}
?>
\ No newline at end of file
--- a/fhiiqm/inc/ma_list_ac.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/inc/ma_list_ac.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -22,8 +22,8 @@
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
+ $sql = "SELECT CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as label,
+ CONCAT (nachname, ', ',vorname, ', ' , IFNULL(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";
--- a/fhiiqm/inc/menu.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/inc/menu.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -73,6 +73,8 @@
echo "<li><a href=\"/fhiiqm/anlage_flist.php\" target=\"_blank\" title=\"Anlagenliste\">Anlagen sortieren, filtern, bearbeiten</a></li>\n";
if (in_array("ae",$_SESSION["recht"]))
echo "<li><a href=\"/fhiiqm/anlage_ed.php\" target=\"_blank\" title=\"Anlage erfassen\">Anlage erfassen</a></li>\n";
+ if (in_array("ae",$_SESSION["recht"]))
+ echo "<li><a href=\"/fhiiqm/anlage_ed.php?k=6\" target=\"_blank\" title=\"Gasflasche erfassen\">Gasflasche erfassen</a></li>\n";
if (in_array("ar",$_SESSION["recht"]) || in_array("ae",$_SESSION["recht"]))
echo "<li><a href=\"/fhiiqm/alpruef_flist.php\" target=\"_blank\" title=\"Anlagenprüfungen\">Anlagenprüfungen sortieren, filtern, bearbeiten</a></li>\n";
if (in_array("ae",$_SESSION["recht"]))
@@ -94,13 +96,22 @@
<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";
+ echo "<li><a href=\"/fhiiqm/laser_log_flist_ed.php\" target=\"_blank\" title=\"Laser-Logbuch\">Laser-Logbuch 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>Bewegungsdaten\n
+ <ul>\n"; // Bearbeitung von ausgewaehlten Stamm-Daten
+ if (in_array("re",$_SESSION["recht"]))
+ echo "<li><a href=\"/fhiiqm/raum_flist_ed.php\" target=\"_blank\" title=\"Raumliste edit\">Räume sortieren, filtern, Reinigungs-Typ bearbeiten</a></li>\n";
+ echo " </ul>\n
+ </li>\n";
+
echo "<li>Stammdaten\n
<ul>\n";
if (in_array("pr",$_SESSION["recht"]) || in_array("pe",$_SESSION["recht"]))
--- a/fhiiqm/inc/raum_dat_show.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/inc/raum_dat_show.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -26,6 +26,14 @@
foreach ($result as $row)
echo "<tr><td>Raumtyp: </td><td>" . $row->raumtyp_bez . "</td></tr>\n";
}
+ // Reinigungtyp
+ $sql = "SELECT reinigung_typ_ID, reinigung_typ_bez FROM fhiiqm.Reinigung_Typ
+ WHERE reinigung_typ_ID = '" . $raum['reityp'] . "'";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ echo "<tr><td>Reinigungstyp: </td><td>" . $row->reinigung_typ_ID." - ".$row->reinigung_typ_bez . "</td></tr>\n";
+ }
if ($raum["rflae"] == "NULL") $raum["rflae"] = " ";
echo "<tr><td>Raum-Fläche (m<sup>2</sup>): </td><td>" . str_replace(".",",",$raum['rflae']) . "<td></td></tr>\n";
if (file_exists("raeume/$rfile"))
--- a/fhiiqm/inc/vertragtab_ins.inc.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/inc/vertragtab_ins.inc.php Mon Feb 06 13:44:00 2012 +0100
@@ -114,7 +114,8 @@
{
if ($vtr['kost'][$j])
{
- $kost = str_replace(',','.',$vtr['kost'][$j]);
+// $kost = str_replace(',','.',$vtr['kost'][$j]);
+ $kost = dbformat_wert($vtr['kost'][$j]);
$sql = "INSERT INTO Vertrag_Kosten (contract_ID,k_year,kosten) VALUES($cid,$i,$kost)";
$retk = $dbc -> execute($sql);
}
@@ -125,7 +126,8 @@
{
if ($vtr['kost'][0])
{
- $kost = str_replace(',','.',$vtr['kost'][0]);
+// $kost = str_replace(',','.',$vtr['kost'][0]);
+ $kost = dbformat_wert($vtr['kost'][0]);
$sql = "INSERT INTO Vertrag_Kosten (contract_ID,k_year,kosten) VALUES($cid,".(int)$vtr['bjahr'].",$kost)";
$retk = $dbc -> execute($sql);
}
--- a/fhiiqm/laser_ed.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/laser_ed.php Mon Feb 06 13:44:00 2012 +0100
@@ -224,6 +224,7 @@
if ($la["suid"] == -1) $la["suid"] = null;
if ($la["suodid"] == -1) $la["suodid"] = null;
if ($la["lidref"] == -1) $la["lidref"] = null;
+ if ($la["raum"] == -1) $la["raum"] = null;
// print_r($la); echo "<br /><br />";
if ($la["hstid"] == -1)
@@ -272,6 +273,7 @@
{
if (is_null($value) || $value < "!") $la["$key"] = null;
}
+ // "," -> "." fuer decimal-Felder
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);
@@ -281,7 +283,15 @@
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);
-
+
+ // Einheiten = NULL, wenn decimal-Felder NULL
+ if (is_null($la['leist'])) $la['eleist'] = null;
+ if (is_null($la['leistmax'])) $la['eleistmax'] = null;
+ if (is_null($la['eng'])) $la['eeng'] = null;
+ if (is_null($la['apt'])) $la['eapt'] = null;
+ if (is_null($la['frq'])) $la['efrq'] = null;
+ if (is_null($la['ipb'])) $la['eipb'] = null;
+
$stmt = $dbc -> stmtinit();
if (is_object($stmt))
{
--- a/fhiiqm/laser_flist.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/laser_flist.php Mon Feb 06 13:44:00 2012 +0100
@@ -105,6 +105,7 @@
<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 ", '<img src='/fhiiqm/img/script_edit.png' border='0' hight='11'>' - Log-Buch";
echo " des Lasers</td></tr>\n";
echo "</table>\n";
@@ -136,7 +137,7 @@
// 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(13,"zu 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);
@@ -151,8 +152,9 @@
echo "<th> </th>";
if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
- echo "<th> </th></tr>\n";
-
+ echo "<th> </th>";
+ echo "<th> </th></tr>\n";
+
foreach ($result as $row)
{
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
@@ -172,6 +174,7 @@
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 "<td><a href='/fhiiqm/laser_log_flist_ed.php?i=$row->las_ID'><img src=\"/fhiiqm/img/script_edit.png\" alt='log' title='log' border='0'/></a></td>";
}
echo "</table></div>\n";
@@ -191,7 +194,7 @@
}
// Links auf andere Seiten generieren
- liste_links($start,$zeil,$panz,$liste);
+ liste_links($start,$zeil,$anz,$liste);
}
else
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/laser_log_flist_ed.php Mon Feb 06 13:44:00 2012 +0100
@@ -0,0 +1,354 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 01/2012
+ *
+ * Laser-Logbuch-Liste & Form
+ */
+
+ 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();
+ include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+
+?>
+
+<!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"/>
+ <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness/jquery-ui-1.8.16.custom.css" rel="Stylesheet" />
+ <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.6.2.min.js"></script>
+ <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
+ <title>Laser-Logbuch</title>
+ </head>
+
+ <body onload="document.ffilter.filter.focus();">
+
+ <script>
+ $(document).ready(function() {
+ $("#lid").focus();
+ $("#ldat").datepicker({
+ dateFormat: 'yy-mm-dd 00:00:00', //damit kann auch Uhrzeit angegeben werden
+ yearRange: '2000:2020',
+ changeMonth: true,
+ changeYear: true,
+ firstDay: 1,
+ dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
+ monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez']
+ });
+ $("input").ldat("long10").addClass("long10");
+ });
+ </script>
+
+<?php
+ // Eingabeformular
+ $la = $_POST["la"];
+ $laid = $_GET["i"];
+ if (!$laid) $laid = $_POST["i"];
+ if (!$laid) $laid=0;
+ $sub = $_POST["eintragen"]; // submit Log-Form
+ $ok = $_POST["ok"];
+ if (!$la['okn']) $ok=false;
+
+ $ldat = urldecode($_GET["ld"]); // Log-Datum aus edit
+ if (!$ldat) $ldat = $_POST["ld"];
+ if (!$ldat) $ldat = "0";
+// echo "ldat: $ldat, " . urlencode($ldat) . ", ". urldecode($ldat). "<br />";
+
+ // Felder, nach denen gefiltert werden kann
+ $fields = array(2=>"Laser-ID",3=>"Laser",4=>"Log-Datum");
+
+ // Anzahl der gezeigten Zeilen, Start ab Zeile
+ $zeil = $_GET["z"];
+ if (!$zeil) $zeil = $_POST["z"];
+ if (!$zeil) $zeil = 10;
+ $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 Filter
+
+ if (!isset($fnum) && !$fnum) $fnum = 1;
+ if (!isset($filter) && !$filter) $filter = "";
+ if (!isset($sort) && !$sort) $sort = 2;
+ if (!isset($dir) && !$dir) $dir = "";
+
+
+ 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";
+
+ if ($ok && $sub) // Daten Laser-Logbuch speichern
+ {
+ if (!$ldat)
+ {
+ try
+ {
+ $logdate = new DateTime($la["ldat"]);
+ $ok=1;
+ }
+ catch(Exception $e)
+ {
+ echo "<p class='red'>fehlerhaftes Datum-Zeit-Feld: ".$e->getMessage(). "</p>";
+ $la["ldat"] = null;
+ $ok=0;
+ }
+ }
+ if ($ok)
+ {
+ $la["bem"] = substr($la["bem"],0,500);
+ $stmt = $dbc -> stmtinit();
+ if (is_object($stmt))
+ {
+ if (!$ldat)
+ { // neuer Eintrag
+ $stmt -> prepare("INSERT INTO fhiiqm.Laser_Logbuch (las_ID,log_date,log_bem) VALUES (?,?,?)");
+ $stmt -> bind_param('iss',$la["lid"],$la["ldat"],$la["bem"]);
+ $res = $stmt -> execute();
+ // print_r($stmt); echo "<br /><br />";
+ if ($stmt->error) echo "INSERT Laser-Logbuch, error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
+ }
+ else
+ { // log-bem aendern
+ $stmt -> prepare("UPDATE fhiiqm.Laser_Logbuch SET log_bem = ? WHERE las_ID=? AND log_date=?");
+ $stmt -> bind_param('sis',$la["bem"],$laid,$ldat);
+ $res = $stmt -> execute();
+ if ($stmt->error) echo "UPDATE Laser-Logbuch, error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
+ }
+ $stmt -> free_result(); // wegen weiterer query
+ if (!$la["lid"])
+ {
+ $la["lid"]=$laid;
+ $savetxt = "UPDATE";
+ $ldat = "0"; // neue Eingabe ermoeglichen
+ }
+ else $savetxt = "INSERT";
+ $sql = "SELECT las_bez FROM fhiiqm.Laser WHERE las_ID = " . $la["lid"];
+ $lbez = $dbc -> querySingleItem($sql);
+ if ($res)
+ {
+ echo "<p class='green'><b>$savetxt: Daten zu '".$lbez."' wurden erfolgreich gespeichert.</b></p>\n";
+ unset($la);
+ $sub = 0;
+ }
+ else
+ echo "<p class='red'><b>$savetxt: Daten zu '".$lbez."' konnten nicht gespeichert werden!</b></p>\n";
+ }
+ }
+ }
+
+ // Log-Eintraege holen
+ $sql = "CALL laser_log_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,$laid,@anz);";
+ // Parameter: Nr. Sortfeld, Sortierrichtung, Nr. Filterfeld, Filterbegriff, Startsatz(0), Anzahl zu liefernde DS, Laser-ID, Anzahl gefundener Laser
+ // liefert: las_ID, las_ID,las_bez, log_date,log_bem
+/* $sql = "SELECT b.las_ID,las_bez, log_date,log_bem
+ FROM `fhiiqm`.`Laser_Logbuch` b INNER JOIN Laser l
+ ON b.las_ID=l.las_ID";
+*/
+ $result = $dbc ->queryObjectArray($sql);
+ if ($dbc -> error)
+ echo "error: " . $dbc -> error . "<br />\n";
+
+ if (!$result)
+ {
+ echo "<p class='red'> Leider nichts gefunden für ". $fields["$fnum"] . " wie '$filter'!<br />";
+ }
+
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+
+ echo "<div align='center'>\n";
+ echo "<p><b>Laser - Logbuch</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>\n";
+ echo "</table>\n";
+
+ if ($result) $anz = $dbc -> querySingleItem("SELECT @anz"); else $anz = 0;
+ if ($dbc -> error) echo "error Anzahl: " . $dbc -> error . "<br />\n";
+ if ($laid) $laser = " für Laser-ID=$laid"; else $laser = "";
+ printf ("<p>Anzahl Logbucheinträge$laser: %s</p>", $anz);
+
+ if (isset($fnum) && $fnum>1 && !$filter && !$subf)
+ {
+ // Formular anzeigen fuer Filterbegriff
+ $text = $fields[$fnum];
+ if ($fnum == 4) $tip = "vollständiges Datum in der Form 'yyyy-mm-tt' angeben"; else $tip = "";
+ 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 "<input type='hidden' name='i' value='$laid'>"; // nur gewaehlte Laser-ID
+ echo "<table width=\"30%\" 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\"/>";
+ echo "<td><input class=\"button\" type=\"submit\" value=\"finden\" name=\"subf\" title=\"subf\" /></td></tr>";
+ echo "<tr><td colspan='3'>$tip</td></tr></table>\n";
+ echo "</form>\n";
+ echo "<p> </p>\n";
+ }
+
+ echo "<table width='60%'>\n";
+
+ if ($filter>'!') echo "<tr><td class='bigger' colspan='5'>Filter: ". $fields["$fnum"] . " wie '$filter'</td><tr>\n";
+
+ // Listenkopf generieren
+ echo "<tr bgcolor='#68ACBF'>";
+ tab_column(2,"Las-ID",$sort,$dir,2,$fnum,$filter,$start,$zeil,$laid);
+ tab_column(3,"Laser",$sort,$dir,3,$fnum,$filter,$start,$zeil,$laid);
+ tab_column(4,"Log-Datum",$sort,$dir,4,$fnum,$filter,$start,$zeil,$laid);
+ echo "<th width='60%'>Eintrag</th>";
+ echo "<th> </th></tr>\n";
+
+ if ($result)
+ {
+ // Logdaten anzeigen
+ foreach ($result as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ if ($laid == $row->las_ID && $ldat == $row->log_date) $bg = "#D6E6E6";
+ echo "<tr bgcolor='" . $bg . "'><td class='right'>$row->las_ID </td>";
+ echo "<td>$row->las_bez</td>";
+ if ($row->log_date)
+ {
+ $ld = new DateTime($row->log_date);
+ echo "<td>" . $ld->format('d.m.Y H:i:s')."</td>";
+ }
+ if ($laid == $row->las_ID && $ldat == $row->log_date)
+ { //Aenderungsform, nur Log-Eintrag
+ $okn = true;
+ if (!$la['bem']) $la['bem'] = $row->log_bem;
+ echo "<form action='". $_SERVER['PHP_SELF'] ."' method='post' enctype='application/x-www-form-urlencoded' name='flas'>\n";
+ echo "<td class='red'><textarea name=\"la[bem]\" id=\"bem\" rows=\"5\" cols=\"100\">" . $la['bem'] ."</textarea><br />";
+ echo "<input type=\"hidden\" name=\"la[okn]\" value=\"$okn\"/>\n";
+ echo "<input type=\"hidden\" name=\"i\" value=\"$laid\"/>\n"; // nur gewaehlte Laser-ID
+ echo "<input type=\"hidden\" name=\"ld\" value=\"$ldat\"/>";
+ if ($sub)
+ {
+ $frage = "Alle Angaben ok?";
+ echo "$frage<input type=\"checkbox\" name=\"ok\" value=\"1\"";
+ if ($ok) echo "checked=\"checked\"";
+ echo "/> ";
+ }
+ echo "<input class=\"button\" type=\"submit\" name=\"eintragen\" value=\"eintragen\" /></td>";
+ echo "</form>\n";
+ echo "<td> </td>";
+ }
+ else
+ {
+ echo "<td>".nl2br($row->log_bem)."</td>";
+ if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
+ echo "<td><a href='" . $_SERVER["PHP_SELF"]."?i=$row->las_ID&ld=" . urlencode($row->log_date) . // &f=$fnum&b=$filter&s=$sort&d=$dir&st=$st&z=$zeil
+ "'><img src=\"/fhiiqm/img/edit.gif\" alt='edit Log-Eintrag' title='edit Log-Eintrag' border='0'/></a></td>";
+ else echo "<td> </td>";
+ }
+ echo "</tr>\n";
+ }
+// $dbc->result->free();
+ }
+
+ if ((!$ok || !$sub) && !$ldat && !is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
+ {
+ // Eingabe neuer Logbuch-Eintrag
+ $okn = true;
+ echo "<form action='". $_SERVER['PHP_SELF'] ."' method='post' enctype='application/x-www-form-urlencoded' name='flas'>\n";
+ echo "<tr bgcolor='#D6E6E6'><td> </td><td>";
+ echo "<select name=\"la[lid]\" id='lid'>";
+ 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['lid']) $select="selected"; else $select="";
+ echo "<option $select value='$row->las_ID'>$row->las_ID - $row->las_bez</option>\n";
+ }
+ }
+ if ($dbc->error) echo "error Laserliste: ".$dbc -> error."</br>";
+ echo "</td><td valign=\"top\"><input class=\"long10\" type=\"text\" name=\"la[ldat]\" id=\"ldat\" value=\"" . $la['ldat']. "\"/>";
+ echo "<br />Uhrzeitangabe notwendig, falls für LaserID Eintrag am selben Tag vorhanden.";
+ if (isset($la['ldat']) && $la['ldat']< "!")
+ {
+ echo "<br><span class=\"red\">Log-Datum ist erforderlich!</span>\n";
+ $okn = false;
+ }
+ echo "</td><td class='red'><textarea name=\"la[bem]\" id=\"bem\" rows=\"5\" cols=\"100\">" . $la['bem'] ."</textarea><br />";
+ echo "<input type=\"hidden\" name=\"la[okn]\" value=\"$okn\"/>\n";
+ echo "<input type=\"hidden\" name=\"i\" value=\"$laid\"/>\n"; // nur gewaehlte Laser-ID
+ if ($sub)
+ {
+ $frage = "Alle Angaben ok?";
+ echo "$frage<input type=\"checkbox\" name=\"ok\" value=\"1\"";
+ if ($ok) echo "checked=\"checked\"";
+ echo "/> ";
+ }
+ echo "<input class=\"button\" type=\"submit\" name=\"eintragen\" value=\"eintragen\" /></td>";
+ echo "<td> </td></tr>\n";
+ echo "</form>\n";
+ }
+
+ echo "</table>\n";
+ echo "</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,$anz,$liste);
+
+ $dbc -> close();
+ echo "<p> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Laser-Log\" class=\"sc\">Log-Buch alle Laser</a></p>\n";
+ echo "<p> <a href=\"/fhiiqm/laser_flist.php\" target=\"_self\" title=\"Laserliste\" class=\"sc\">Laserliste</a></p>\n";
+
+
+?>
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/raum_flist.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/raum_flist.php Mon Feb 06 13:44:00 2012 +0100
@@ -45,7 +45,7 @@
echo "<div class=\"float-r\"><img src=\"img/house.png\" border=\"0\" alt=\"Raumdaten\" title=\"Raumdaten\"/></div>\n";
// Felder, nach denen gefiltert werden kann
- $fields = array(4=>"Gebäude",5=>"Raum-Typ");
+ $fields = array(4=>"Gebäude",5=>"Raum-Typ",8=>"Reinigung-Typ");
$zeil = $_GET["z"];
if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
@@ -85,7 +85,7 @@
$sql = "CALL raum_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,@anz);";
// Parameter: Nr. Sortfeld, Sortierrichtung, Nr. Filterfeld, Filterbegriff, (StartNr DS) -1, Anzahl Zeilen=DS, Anzahl gefundener Raeume
- // liefert: raum_ID, raum_nr, raum_name, geb_ID, raumtyp_bez, raum_flaeche, raum_file
+ // liefert: raum_ID, raum_nr, raum_name, geb_ID, raumtyp_bez, raum_flaeche, raum_file, reinigung_typ_ID, reinigung_typ_bez
// echo "sql = $sql<br />";
$result = $dbc ->queryObjectArray($sql);
@@ -133,6 +133,7 @@
tab_column(3,"Bezeichnung",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(4,"Haus",$sort,$dir,4,$fnum,$filter,$start,$zeil);
tab_column(5,"Raum-Typ",$sort,$dir,5,$fnum,$filter,$start,$zeil);
+ tab_column(8,"Reinigungs-Typ",$sort,$dir,8,$fnum,$filter,$start,$zeil);
tab_column(6,"Fläche (m<sup>2</sup>)",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(7,"Raumplan",$sort,$dir,0,$fnum,$filter,$start,$zeil);
echo "<th> </th></tr>\n";
@@ -146,6 +147,9 @@
echo "<td>$row->raum_name</td>";
echo "<td>$row->geb_ID</td>";
echo "<td>$row->raumtyp_bez</td>";
+ if ($row->reinigung_typ_ID)
+ echo "<td>$row->reinigung_typ_ID: $row->reinigung_typ_bez</td>";
+ else echo "<td> </td>";
echo "<td class='right'>" . str_replace(".",",",$row->raum_flaeche) . "</td>";
if (file_exists("raeume/".$row->raum_file))
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/raum_flist_ed.php Mon Feb 06 13:44:00 2012 +0100
@@ -0,0 +1,289 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 02/2012
+ *
+ * Liste Raeume + Aenderungsform
+ */
+
+ 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("rr",$_SESSION["recht"]) && !in_array("re",$_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 href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+
+ <title>Raumliste edit</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/house.png\" border=\"0\" alt=\"Raumdaten\" title=\"Raumdaten\"/></div>\n";
+
+ // Aenderungsformular
+ $raum = $_POST["raum"];
+ $rid = $_GET["i"];
+ if (!$rid) $rid = $_POST["i"];
+ if (!$rid) $rid=0;
+ $sub = $_POST["eintragen"]; // submit Raum-Form
+ $ok = $_POST["ok"];
+ if (!$raum['okn']) $ok=false;
+
+ // Felder, nach denen gefiltert werden kann
+ $fields = array(4=>"Gebäude",5=>"Raum-Typ",8=>"Reinigung-Typ");
+
+ $zeil = $_GET["z"];
+ if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
+ $start = $_GET["st"];
+ if (!$start) $start = $_POST["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 = "";
+
+/*
+ $sql = "SELECT COUNT(*) AS anzr FROM fhiiqm.Raum";
+ $anz = $dbc -> querySingleItem($sql);
+
+ $sql = "SELECT raum_ID, raum_nr, raum_name, geb_ID, r.raumtyp_ID, raumtyp_bez, raum_flaeche, raum_file
+ FROM `fhiiqm`.`Raum` r LEFT OUTER JOIN fhiiqm.Raum_Typ t ON r.raumtyp_ID = t.raumtyp_ID
+ ORDER BY geb_ID, raum_nr LIMIT $start,20 ";
+*/
+
+ include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ $dbc = new dbconnection();
+
+ if ($ok && $sub) // Daten Raum - Reinigungstyp speichern
+ {
+ $stmt = $dbc -> stmtinit();
+ if (is_object($stmt))
+ {
+ if ($raum['reityp']== -1) $raum['reityp'] = null;
+ // reinigung_typ_ID aendern
+ $stmt -> prepare("UPDATE fhiiqm.Raum SET reinigung_typ_ID = ? WHERE raum_ID=?");
+ $stmt -> bind_param('si',$raum['reityp'],$rid);
+ $res = $stmt -> execute();
+ if ($stmt->error) echo "UPDATE Raum, error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
+ $stmt -> free_result(); // wegen weiterer query
+ $sql = "SELECT raum_nr, raum_name, geb_ID FROM fhiiqm.Raum WHERE raum_ID = " . $rid;
+ $result = $dbc -> queryObjectArray($sql);
+ foreach ($result as $ro)
+ {
+ if ($res)
+ {
+ echo "<p class='green'><b>UPDATE: Daten zu Haus '".$ro->geb_ID.", ".$ro->raum_nr.", ".$ro->raum_name."' wurden erfolgreich gespeichert.</b></p>\n";
+ unset($raum);
+ $rid = 0;
+ $sub = 0;
+ }
+ else
+ echo "<p class='red'><b>UPDATE: Daten zu Haus '".$ro->geb_ID.", ".$ro->raum_nr.", ".$ro->raum_name."' konnten nicht gespeichert werden!</b></p>\n";
+ }
+ }
+ }
+// echo "sort=$sort, dir=$dir, fnum=$fnum, filter=$filter, start=$start, zeil=$zeil<br />";
+ $sql = "CALL raum_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,@anz);";
+ // Parameter: Nr. Sortfeld, Sortierrichtung, Nr. Filterfeld, Filterbegriff, (StartNr DS) -1, Anzahl Zeilen=DS, Anzahl gefundener Raeume
+ // liefert: raum_ID, raum_nr, raum_name, geb_ID, raumtyp_bez, raum_flaeche, raum_file, reinigung_typ_ID, reinigung_typ_bez
+// echo "sql = $sql<br />";
+ $result = $dbc ->queryObjectArray($sql);
+
+ if ($result)
+ {
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+
+ echo "<div align='center'>\n";
+ echo "<p><b>Liste der erfassten Räume</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 jeder Spalte 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> </td></tr>
+ <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten des Reinigungs-Typs</td></tr>\n";
+ echo "</table>\n";
+
+ $ranz = $dbc -> querySingleItem("SELECT @anz");
+ printf ("<p>Es wurden %s Räume gefunden.</p>", $ranz);
+
+ 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=\"30%\" border=\"0\">\n";
+ echo "<tr><td>filtern nach $text: </td>";
+ echo "<td><input id='filter' name='filter' type=\"text\" size=\"30\" maxlength=\"30\" value=\"$filter\"/></td>";
+ echo "<td><input class=\"button\" type=\"submit\" value=\"finden\" name=\"subf\" title=\"subf\" /></td></tr></table>\n";
+ echo "</form>\n";
+ echo "<p> </p>\n";
+ }
+ echo "<table>\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,"Raum-Nr.",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+ tab_column(3,"Bezeichnung",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+ tab_column(4,"Haus",$sort,$dir,4,$fnum,$filter,$start,$zeil);
+ tab_column(5,"Raum-Typ",$sort,$dir,5,$fnum,$filter,$start,$zeil);
+ tab_column(8,"Reinigungs-Typ",$sort,$dir,8,$fnum,$filter,$start,$zeil);
+ tab_column(6,"Fläche (m<sup>2</sup>)",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+ tab_column(7,"Raumplan",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+ echo "<th> </th></tr>\n";
+
+// echo "<tr bgcolor='#68ACBF'><th>Raum-Nr.</th><th>Bezeichnung</th><th>Haus</th><th>Typ</th><th>Fläche (m<sup>2</sup>)</th><th>Raumplan</th><th> </th>
+// </tr>\n";
+ foreach ($result as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ if ($rid == $row->raum_ID) $bg = "#D6E6E6";
+ echo "<tr bgcolor='" . $bg . "'><td class='left'><b>$row->raum_nr</b></td>";
+ echo "<td>$row->raum_name</td>";
+ echo "<td>$row->geb_ID</td>";
+ echo "<td>$row->raumtyp_bez</td>";
+ if ($rid == $row->raum_ID)
+ { //Aenderungsform, nur Reinigungstyp-Eintrag
+ $okn = true;
+ if (!$raum['reityp']) $raum['reityp'] = $row->reinigung_typ_ID;
+ echo "<form action='". $_SERVER['PHP_SELF'] ."' method='post' enctype='application/x-www-form-urlencoded' name='frr'>\n";
+ echo "<td class='red'><select name='raum[reityp]'>";
+ if ($raum['reityp'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT reinigung_typ_ID, reinigung_typ_bez FROM fhiiqm.Reinigung_Typ ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $ro)
+ {
+ if ($ro->reinigung_typ_ID == $raum['reityp'])
+ echo "<option selected value=\"$ro->reinigung_typ_ID\">$ro->reinigung_typ_ID: $ro->reinigung_typ_bez</option>\n";
+ else
+ echo "<option value=\"$ro->reinigung_typ_ID\">$ro->reinigung_typ_ID: $ro->reinigung_typ_bez</option>\n";
+ }
+ }
+ echo "</select><br />";
+ echo "<input type=\"hidden\" name=\"raum[okn]\" value=\"$okn\"/>\n";
+ echo "<input type=\"hidden\" name=\"i\" value=\"$rid\"/>\n"; // nur gewaehlte Raum-ID
+ 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 "<input type='hidden' name='filter' value='$filter'>";
+ echo "<input type='hidden' name='st' value='$start'>";
+ echo "<input type='hidden' name='subf' value='finden'>";
+ if ($sub)
+ {
+ $frage = "Alle Angaben ok?";
+ echo "$frage<input type=\"checkbox\" name=\"ok\" value=\"1\"";
+ if ($ok) echo "checked=\"checked\"";
+ echo "/> ";
+ }
+ echo "<input class=\"button\" type=\"submit\" name=\"eintragen\" value=\"eintragen\" /></td>";
+ echo "</form>\n";
+ }
+ else
+ {
+ if ($row->reinigung_typ_ID)
+ echo "<td>$row->reinigung_typ_ID: $row->reinigung_typ_bez</td>";
+ else echo "<td> </td>";
+ }
+ echo "<td class='right'>" . str_replace(".",",",$row->raum_flaeche) . "</td>";
+ if (file_exists("raeume/".$row->raum_file))
+ {
+ $raum_file = substr($row->raum_file,strpos($row->raum_file,"_")+1);
+ echo "<td><a href=\"raeume/$row->raum_file\">$raum_file</td>";
+ }
+ else
+ echo "<td>$row->raum_file</td>";
+ if ($rid == $row->raum_ID)
+ echo "<td> </td></tr>\n";
+ else
+ echo "<td><a href='".$_SERVER["PHP_SELF"]."?i=$row->raum_ID&s=$sort&d=$dir&f=$fnum&b=$filter&st=$start'>
+ <img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
+ }
+ echo "</table></div>\n";
+
+ echo "<br /> ";
+
+ // Sortierung und Filter aus $_GET fuer weitere Seiten
+ foreach ($_GET as $key=>$val)
+ {
+ 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,$ranz,$liste);
+
+ }
+ else
+ {
+ if ($dbc -> error)
+ echo "error: " . $dbc -> error . "<br />\n";
+ else
+ {
+ echo "<p class='red'> Leider nichts gefunden für ". $fields["$fnum"] . " wie '$filter'!</p><br />";
+ echo " <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Raumliste\">Raumliste</a></p>\n";
+ }
+
+ }
+ $dbc -> close();
+
+ if (!is_null($_SESSION["recht"]) && in_array("re",$_SESSION["recht"]))
+ echo "<p> <a href=\"raum_ins.php\" target=\"_self\" title=\"Raum erfassen\" class=\"sc\">Weiteren Raum erfassen</a></p>\n";
+
+?>
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/raum_ins.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/raum_ins.php Mon Feb 06 13:44:00 2012 +0100
@@ -97,6 +97,7 @@
$raum['rbez'] = substr($raum['rbez'],0,50);
$raum['rnum'] = substr($raum['rnum'],0,10);
if ($raum['rtyp']== -1) $rtyp = "NULL"; else $rtyp = "'" . $raum['rtyp'] . "'";
+ if ($raum['reityp']== -1) $raum['reityp'] = null;
// Filename Vertrag
$raum['rfname'] = substr($raum['rfname'],0,50);
if (isset($raum['rflae']) && $raum['rflae']>"0")
@@ -124,11 +125,11 @@
if (is_object($stmt))
{
if ($raum['rtyp']== -1) $raum['rtyp']=null;
- $stmt -> prepare ("INSERT INTO Raum (raum_nr,raum_name,geb_ID,raumtyp_ID,raum_flaeche) VALUES (?,?,?,?,?)");
- $stmt -> bind_param('ssssd', $raum['rnum'], $raum['rbez'], $raum['geb'], $raum['rtyp'], $raum['rflae']);
+ $stmt -> prepare ("INSERT INTO Raum (raum_nr,raum_name,geb_ID,raumtyp_ID,reinigung_typ_ID,raum_flaeche) VALUES (?,?,?,?,?,?)");
+ $stmt -> bind_param('sssssd', $raum['rnum'], $raum['rbez'], $raum['geb'], $raum['rtyp'], $raum["reityp"], $raum['rflae']);
$result = $stmt -> execute();
}
- if ($dbc->error) echo "error: " . $dbc->error . "<br><br>\n";
+ if ($stmt->error) echo "error: " . $stmt->error . "<br><br>\n";
if ($result)
{ // INSERT o.k.
// raum_ID ermitteln
--- a/fhiiqm/raum_upd.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/raum_upd.php Mon Feb 06 13:44:00 2012 +0100
@@ -63,7 +63,7 @@
{
if (!$upd && !$del)
{
- $sql = "SELECT raum_ID,raum_nr,raum_name,geb_ID,raumtyp_ID,raum_flaeche,raum_file
+ $sql = "SELECT raum_ID,raum_nr,raum_name,geb_ID,raumtyp_ID,reinigung_typ_ID,raum_flaeche,raum_file
FROM fhiiqm.Raum WHERE raum_ID = $rid";
if ($result = $dbc ->queryObjectArray($sql))
{
@@ -73,6 +73,7 @@
$raum['rbez'] = $row->raum_name;
$raum['geb'] = $row->geb_ID;
$raum['rtyp'] = $row->raumtyp_ID;
+ $raum['reityp'] = $row->reinigung_typ_ID;
$raum['rflae'] = str_replace(".",",",$row->raum_flaeche);
$raum['rfname'] = $row->raum_file;
}
@@ -130,6 +131,7 @@
$raum['rbez'] = substr($raum['rbez'],0,50);
$raum['rnum'] = substr($raum['rnum'],0,10);
if ($raum['rtyp']== -1) $raum['rtyp'] = null;
+ if ($raum['reityp']== -1) $raum['reityp'] = null;
// Filename Vertrag
$raum['rfname'] = substr($raum['rfname'],0,50);
if (isset($raum['rflae']) && $raum['rflae']>"0")
@@ -175,14 +177,15 @@
raum_name = ?,
geb_ID = ?,
raumtyp_ID = ?,
+ reinigung_typ_ID = ?,
raum_flaeche = ?,
raum_file = ? WHERE raum_ID = $rid");
- $stmt -> bind_param('ssssds',$raum["rnum"],$aum["rbez"],$raum["geb"],$raum["rtyp"],$raum["rflae"],$rfile);
+ $stmt -> bind_param('sssssds',$raum["rnum"],$aum["rbez"],$raum["geb"],$raum["rtyp"],$raum["reityp"],$raum["rflae"],$rfile);
$retr = $stmt -> execute();
}
// echo "UPDATE-sql = $sql<br />\n";
- if (!$retr) echo "error update" . $dbc -> error ."<br />\n";
+ if (!$retr) echo "error update" . $stmt -> error ."<br />\n";
if ($retr)
{//Eingabe Daten, Upload File erfolgreich
echo "<p class='green'><b>Raumdaten zu ID '$rid' wurden erfolgreich gespeichert.</b></p>\n";
--- a/fhiiqm/recht_list.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/recht_list.php Mon Feb 06 13:44:00 2012 +0100
@@ -49,9 +49,10 @@
echo "<div align='center'>\n";
echo "<table><tr><td class='valignb'>";
- $sql = "SELECT u.persknr, CONCAT (nachname, ', ',vorname) AS ma, userid,
+ $sql = "SELECT u.persknr, CONCAT (nachname, ', ',vorname) AS ma, abt_name, 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
+ LEFT OUTER JOIN fhiiqm.Abteilung a ON m.abt_tel=a.abt_ID
ORDER BY userid";
if ($result = $dbc -> queryObjectArray($sql))
{
@@ -66,11 +67,12 @@
echo "<table cellpadding='2' cellspacing='2'>\n";
// Listenkopf
echo "<tr bgcolor='#68ACBF'>";
- echo "<th>Mitarbeiter</th><th>userid</th><th>passwort?</th><th> </th></tr>\n";
+ echo "<th>Mitarbeiter</th><th>Abt.</th><th>userid</th><th>passwort?</th><th> </th></tr>\n";
foreach ($result as $row)
{
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
echo "<tr bgcolor='" . $bg . "'><td><b>$row->ma</b></td>";
+ echo "<td>$row->abt_name</td>";
echo "<td>$row->userid</td>";
echo "<td class='center'>$row->pw</td>";
echo "<td><a href='/fhiiqm/recht_ed.php?pid=$row->persknr'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/test/dbformat_wert.php Mon Feb 06 13:44:00 2012 +0100
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 02/2012
+ */
+
+
+
+?>
+<!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="../css/db.css" rel="STYLESHEET" type="TEXT/CSS" />
+ <meta name="author" content="Bettina Schwarzer" />
+
+ <title>Test Betrag mit Tausendertrennzeichen</title>
+</head>
+
+<body>
+<h3> Test Betrag mit Tausendertrennzeichen</h3>
+<?php
+ include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+
+ echo " 20.222,11; dw=" . dbformat_wert("20.222,11") . "<br />";
+ echo " 20.222.11; dw=" . dbformat_wert("20.222.11") . "<br />";
+ echo " 20.222; dw=" . dbformat_wert("20.222") . "<br />";
+ echo " 1.120.222,11; dw=" . dbformat_wert("1.120.222,11") . "<br />";
+ echo " 1.120.222.11; dw=" . dbformat_wert("1.120.222.11") . "<br />";
+ echo " 1.120.222; dw=" . dbformat_wert("1.120.222") . "<br />";
+ echo " 120222,11; dw=" . dbformat_wert("120222,11") . "<br />";
+ echo " 11120222; dw=" . dbformat_wert("11120222") . "<br />";
+?>
+</body></html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/test/menu.inc.html Mon Feb 06 13:44:00 2012 +0100
@@ -0,0 +1,36 @@
+<div id="navio">
+ <ul>
+
+<!-- <li><a href="/index.html">Startseite</a></li> -->
+ <li>Vertragscontrolling
+ <ul>
+ <li><a href="/fhiiqm/vertrag_flist1.php" target="_blank" title="Vertragsliste">Verträge sortieren, filtern, bearbeiten</a></li>
+ <li><a href="vertrag_search.php" target="_blank" title="Vertrag suchen">Vertrag suchen, bearbeiten</a></li>
+ <li><a href="vertrag_ins.php" target="_blank" title="Vertrag erfassen">Vertrag erfassen</a></li>
+ <li><a href="partner_flist.php" target="_blank" title="Partnerliste">Vertragspartner sortieren, filtern, bearbeiten</a></li>
+ <li><a href="partner_ins.php" target="_blank" title="Partner erfassen">Vertragspartner erfassen</a></li>
+ <li><a href="vertrag_report.html" target="_blank" title="Berichte">Berichte</a></li>
+
+ </ul>
+ </li>
+ <li>Informationen zu FHI-Leistungen und Produkten
+ <ul>
+ <li><a href="info_flist.php" target="_blank" title="Infoliste">Informationen sortieren, filtern, bearbeiten</a></li>
+ <li><a href="info_ins.php" target="_blank" title="Info erfassen">Information erfassen</a></li>
+
+ </ul>
+ </li>
+ <li>Stammdaten
+ <ul>
+ <li><a href="prod_hier.php" target="_blank" title="Produkthierarchie">Produkthierarchie</a></li>
+ <li><a href="produkt_ins.php" target="_blank" title="Produkt erfassen">Produkt erfassen</a></li>
+ <li><a href="raum_flist.php" target="_blank" title="Raumliste">Räume sortieren, filtern, bearbeiten</a></li>
+ <li><a href="raum_ins.php" target="_blank" title="Raum erfassen">Raum erfassen</a></li>
+ <li><a href="ma_fkt_flist.php" target="_blank" title="MA-Funktionen-Liste">Mitarbeiter - Funktion sort., filtern, bearbeiten</a></li>
+ <li><a href="ma_fkt_ed.php" target="_blank" title="MA-Funktionen">Mitarbeiter - Funktion erfassen</a></li>
+
+ <li><a href="#">Anleitungen</a></li>
+ </ul>
+ </li>
+ </ul>
+</div>
--- a/fhiiqm/vertrag_flist2.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/vertrag_flist2.php Mon Feb 06 13:44:00 2012 +0100
@@ -148,8 +148,11 @@
echo "<td>";
$bem = nl2br($row->bem);
}
- // Anzeigen Kosten pro Jahr -> 1 Zeile des Resultsets
- if ($row->kosten) echo "$row->kyear: " . str_replace(' ',' ',str_replace('.',',',sprintf('%10.2f',$row->kosten))) . "<br />";
+ // Anzeigen Kosten pro Jahr -> 1 Zeile des Resultsets (Kosten fast rechtsbuendig!))
+ if ($row->kosten)
+ {
+ echo "<br />$row->kyear: " . str_replace(" "," ",sprintf("%' 10s",number_format($row->kosten,2,",","."))) . "";
+ }
$cid = $row->contract_ID;
}
echo "</td>";
--- a/fhiiqm/vertrag_ins.php Thu Jan 12 11:41:22 2012 +0100
+++ b/fhiiqm/vertrag_ins.php Mon Feb 06 13:44:00 2012 +0100
@@ -154,9 +154,9 @@
if (is_object($stmt))
{
$stmt -> prepare("INSERT INTO Vertrag (contract_name, contract_l,vtyp_ID,contract_begin, contract_end, contract_autoend,
- contract_mon_notice, contract_file, bemerkung)
- VALUES(?,?,?,?,?,?,?,?,?)");
- $stmt -> bind_param('ssissiiss',$vtr["cname"],$vtr["clong"],$vtr['vtyp'],$vbegin,$vend,$vtr['cautoend'],$vtr['cnot'],$cfile,$vtr['cbem']);
+ contract_mon_notice, bemerkung)
+ VALUES(?,?,?,?,?,?,?,?)");
+ $stmt -> bind_param('ssissiis',$vtr["cname"],$vtr["clong"],$vtr['vtyp'],$vbegin,$vend,$vtr['cautoend'],$vtr['cnot'],$vtr['cbem']);
$result = $stmt -> execute();
}
if ($stmt->error) echo "INSERT Vertrag, error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
@@ -188,6 +188,7 @@
else
{ // upload failed
//UPDATE des Filenamens
+ echo "<p class='red'>Upload von '" . $vtr['cfname'] . "' ist fehlgeschlagen. (max. 6 MB)</p>";
$sql = "UPDATE Vertrag SET contract_file = NULL WHERE contract_ID=$cid";
$retv=$dbc->execute($sql);
if (!$retv) 
