--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/navio.css Tue Sep 13 16:32:49 2011 +0200
@@ -0,0 +1,61 @@
+/* Navigation - css
+ Basis: http://www.devinrolsen.com/pure-css-vertical-menu/
+*/
+body{behavior:url(/fhiiqm/js/cssHoverFix.htc);}
+
+#navio {
+ width:28em;
+ margin-top: 1em;
+ margin-left: 0.5em;
+ font-family:Verdana, Arial, Helvetica, Geneva, sans-serif;
+ font-size:12px;
+ font-style:normal;
+ font-weight:normal;
+ }
+
+#navio a:link {color:#000066; text-decoration:none; font-style:normal; font-weight:normal; font-size:12px;}
+#navio a:visited {color:#000066; text-decoration:none; font-style:normal; font-weight:normal; font-size:12px;}
+#navio a:active {color:#000066; text-decoration:none; font-style:normal; font-weight:normal; font-size:12px;}
+
+/*Main Menu*/
+#navio ul {margin:0px; padding:0px; background-color:#FAFAF0;}
+
+#navio ul li {
+ height:25px;
+ line-height:25px;
+ list-style:none;
+ padding-left:5px;
+ color:#000066;
+/* border:#BBDDDD solid; */
+ border-bottom:#BBDDDD solid;
+ border-width:1px;
+ cursor:pointer;
+ }
+#navio ul li:hover {background-color:#BBDDDD; position:relative;}
+#navio ul li:active {background-color:#A4D7D5; position:relative;}
+
+#navio ul li#aktuell {background-color:#D6E8F3;}
+
+/*Sub Menu*/
+#navio ul ul {
+ display:none;
+ position:absolute;
+ left:60px;
+ top:7px;
+ border-bottom:#BBDDDD solid;
+ border-width:1px;
+ background-color:#FAFAFA;
+ }
+#navio ul li:hover ul {display:block;}
+
+#navio ul ul li {
+ width:25em;
+ float:left;
+ }
+#navio ul ul li:hover {color:#000080; border:none;}
+
+/*Sub Menu2*/
+#navio li:hover ul li ul {display:none;}
+
+#navio ul ul li ul {left:110px; background-color:#EEEEEE;}
+#navio ul ul li:hover ul {display:block;}
--- a/fhiiqm/form/ma_fkt_form.inc.php Mon Sep 12 10:34:07 2011 +0200
+++ b/fhiiqm/form/ma_fkt_form.inc.php Tue Sep 13 16:32:49 2011 +0200
@@ -25,7 +25,23 @@
</td>
</tr>
<tr><td>Funktion *</td>
- <td valign="top"><input class="long20" type="text" name="fkt[func]" id="func" value="<?php echo $fkt['func']; ?>"/>
+ <td valign="top">
+ <!--<input class="long20" type="text" name="fkt[func]" id="func" value="<?php echo $fkt['func']; ?>"/> -->
+ <select name="fkt[func]">
+ <?php
+ $sql = "SELECT fkt_bez, fkt_ID FROM `fhiiqm`.`Funktion` ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->fkt_ID == $fkt['func'])
+ echo "<option selected value=\"$row->fkt_ID\">$row->fkt_bez</option>\n";
+ else
+ echo "<option value=\"$row->fkt_ID\">$row->fkt_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
</td>
</tr>
<tr><td>Geltungsbereich</td>
--- a/fhiiqm/form/produkt_form.inc.php Mon Sep 12 10:34:07 2011 +0200
+++ b/fhiiqm/form/produkt_form.inc.php Tue Sep 13 16:32:49 2011 +0200
@@ -56,7 +56,7 @@
<td><select name="prod[grp]">
<?php
$sql = "SELECT prod_group_ID, prod_group_name, prod_ber_name FROM Produkt_Gruppe g
- INNER JOIN Produkt_Bereich b ON g.prod_ber_ID=b.prod_ber_ID ORDER BY g.prod_ber_ID,2";
+ INNER JOIN Produkt_Bereich b ON g.prod_ber_ID=b.prod_ber_ID ORDER BY prod_ber_name,2";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
@@ -65,10 +65,10 @@
if (strlen($row->prod_ber_name)>35 ) $row->prod_ber_name = substr($row->prod_ber_name,0,35) . "...";
if ($row->prod_group_ID == $prod['grp'])
{
- echo "<option selected value=\"$row->prod_group_ID\">$row->prod_group_name -> $row->prod_ber_name</option>\n";
+ echo "<option selected value=\"$row->prod_group_ID\">$row->prod_ber_name: $row->prod_group_name</option>\n";
}
else
- echo "<option value=\"$row->prod_group_ID\">$row->prod_group_name -> $row->prod_ber_name</option>\n";
+ echo "<option value=\"$row->prod_group_ID\">$row->prod_ber_name: $row->prod_group_name</option>\n";
}
}
?>
@@ -89,10 +89,10 @@
{
if ($row->ag_ID == $prod['ag'])
{
- echo "<option selected value=\"$row->ag_ID\">$row->ag_name -> $row->abt_name</option>\n";
+ echo "<option selected value=\"$row->ag_ID\">$row->abt_name: $row->ag_name</option>\n";
}
else
- echo "<option value=\"$row->ag_ID\">$row->ag_name -> $row->abt_name</option>\n";
+ echo "<option value=\"$row->ag_ID\">$row->abt_name: $row->ag_name</option>\n";
}
}
?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/inc/menu.inc.html Tue Sep 13 16:32:49 2011 +0200
@@ -0,0 +1,35 @@
+<div id="navio">
+ <ul>
+
+<!-- <li><a href="/index.html">Startseite</a></li> -->
+ <li>Vertragscontrolling
+ <ul>
+ <li><a href="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">Vertragbezeichnung 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="#">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_ed.php" target="_blank" title="MA-Funktionen">Mitarbeiter - Funktion erfassen, bearbeiten</a></li>
+
+ <li><a href="#">Anleitungen</a></li>
+ </ul>
+ </li>
+ </ul>
+</div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/js/cssHoverFix.htc Tue Sep 13 16:32:49 2011 +0200
@@ -0,0 +1,14 @@
+<public:attach event="ondocumentready" onevent="CSSHover()" />
+<script>
+/**
+ * Whatever:hover - V3.00.081222
+ * --------------------------------------------------------
+ * Author - Peter Nederlof, http://www.xs4all.nl/~peterned
+ * License - http://creativecommons.org/licenses/LGPL/2.1
+ * Packed - http://dean.edwards.name/packer
+ *
+ * howto: body { behavior:url("csshover3.htc"); }
+ */
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('r.R=(8(){4 f=/(^|\\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(C|D|E))/i,S=/(.*?)\\:(C|D|E)/i,T=/[^:]+:([a-z-]+).*/i,U=/(\\.([a-V-W-]+):[a-z]+)|(:[a-z]+)/1c,X=/\\.([a-V-W-]*Y(C|D|E))/i,Z=/1d (5|6|7)/i,10=/1e/i;4 g=\'1f-\';4 h={p:[],t:{},11:8(){n(!Z.F(1g.1h)&&!10.F(r.12.1i))u;4 a=r.12.1j,l=a.v;w(4 i=0;i<l;i++){3.G(a[i])}},G:8(a){n(a.H){I{4 b=a.H,l=b.v;w(4 i=0;i<l;i++){3.G(a.H[i])}}J(13){}}I{4 c=a.1k,l=c.v;w(4 j=0;j<l;j++){3.14(c[j],a)}}J(13){}},14:8(a,b){4 c=a.1l;n(f.F(c)){4 d=a.K.1m,L=S.15(c)[1],M=c.N(T,\'Y$1\'),O=c.N(U,\'.$2\'+M),o=X.15(O)[1];4 e=L+o;n(!3.t[e]){b.16(L,g+o+\':1n(R(3, "\'+M+\'", "\'+o+\'"))\');3.t[e]=17}b.16(O,d)}},18:8(a,b,c){4 d=g+c;n(a.K[d]){a.K[d]=q}n(!a.x)a.x=[];n(!a.x[c]){a.x[c]=17;4 e=19 P(a,b,c);3.p.1o(e)}u b},y:8(){I{4 l=3.p.v;w(4 i=0;i<l;i++){3.p[i].y()}3.p=[];3.t={}}J(e){}}};r.Q(\'1p\',8(){h.y()});4 k={1q:{9:\'1r\',m:\'1s\'},1t:{9:\'1u\',m:\'1v\'},1a:{9:\'1a\',m:\'1w\'}};8 P(a,b,c){3.A=a;3.B=b;4 d=19 1x(\'(^|\\\\s)\'+c+\'(\\\\s|$)\',\'g\');3.9=8(){a.o+=\' \'+c};3.m=8(){a.o=a.o.N(d,\' \')};a.Q(k[b].9,3.9);a.Q(k[b].m,3.m)}P.1y={y:8(){3.A.1b(k[3.B].9,3.9);3.A.1b(k[3.B].m,3.m);3.9=q;3.m=q;3.A=q;3.B=q}};u 8(a,b,c){n(a){u h.18(a,b,c)}1z{h.11()}}})();',62,98,'|||this|var||||function|activator|||||||||||||deactivator|if|className|elements|null|window||callbacks|return|length|for|csshover|unload||node|type|hover|active|focus|test|parseStylesheet|imports|try|catch|style|affected|pseudo|replace|newSelect|CSSHoverElement|attachEvent|CSSHover|REG_AFFECTED|REG_PSEUDO|REG_SELECT|z0|9_|REG_CLASS|on|REG_MSIE|REG_COMPAT|init|document|securityException|parseCSSRule|exec|addRule|true|patch|new|onfocus|detachEvent|gi|msie|backcompat|csh|navigator|userAgent|compatMode|styleSheets|rules|selectorText|cssText|expression|push|onbeforeunload|onhover|onmouseenter|onmouseleave|onactive|onmousedown|onmouseup|onblur|RegExp|prototype|else'.split('|'),0,{}));
+
+</script>
\ No newline at end of file
--- a/fhiiqm/ma_fkt_ed.php Mon Sep 12 10:34:07 2011 +0200
+++ b/fhiiqm/ma_fkt_ed.php Tue Sep 13 16:32:49 2011 +0200
@@ -34,12 +34,12 @@
minLength: 2,
select: function(event,ui){$("#pid").val(ui.item.id);}
});
- $("#func").autocomplete({
+/* $("#func").autocomplete({
source: "/fhiiqm/inc/fkt_list_ac.inc.php",
minLength: 1,
select: function(event,ui){$("#fid").val(ui.item.id);}
});
-
+*/
$("#von").datepicker({
dateFormat: 'yy-mm-dd',
yearRange: '2000:2020',
@@ -60,6 +60,7 @@
<?php
$fkt = $_POST["fkt"];
+ $fkt["fid"] = $fkt["func"];
if (!$fkt["pid"]) $fkt["pid"] = $_GET["p"];
if (!$fkt["fid"]) $fkt["fid"] = $_GET["f"];
$sub = $_POST["eintragen"];
@@ -130,7 +131,7 @@
WHERE persknr=" . $fkt["pid"] . " AND fkt_ID='" . $fkt["fid"] ."'");
$stmt -> bind_param('ssss',$fkt["ber"], $fvon, $fbis, $fkt["bem"]);
$res = $stmt -> execute();
- print_r($stmt);
+// print_r($stmt);
if ($dbc->error) echo "error: " . $dbc->errno." -> ".$dbc->error . "<br><br>\n";
if ($res)
echo "<p class='green'><b>UPDATE: Daten zu '".$fkt["persknr"]."' und '".$fkt["func"]."' wurde erfolgreich gespeichert.</b></p>\n";
--- a/fhiiqm/produkt_ins.php Mon Sep 12 10:34:07 2011 +0200
+++ b/fhiiqm/produkt_ins.php Tue Sep 13 16:32:49 2011 +0200
@@ -103,17 +103,20 @@
") ";
$result=$dbc->execute($sql);
*/
+
$stmt = $dbc -> stmtinit();
if (is_object($stmt))
{
$stmt -> prepare("INSERT INTO Produkt (produkt_ID,prod_name,prod_group_ID,produkt_hier,ag_ID,imp_ID,conn_ID,Bemerkung)
- VALUES (?,?,?,?,?,?,?)");
- $stmt -> bind_param('sissiis', $prod['pname'],$prod['grp'],$prod['ag'],$phier,$prod['imp'],$prod['conn'],$prod['pbem']);
- $result -> $stmt -> execute();
+ VALUES (?,?,?,?,?,?,?,?)");
+ $stmt -> bind_param('isissiis', $prod['pnr'],$prod['pname'],$prod['grp'],$phier,$prod['ag'],$prod['imp'],$prod['conn'],$prod['pbem']);
+ $result = $stmt -> execute();
+// print_r ($stmt);
}
- if ($dbc->error) echo "error: " . $dbc->error . "<br \>sql=$sql<br \><br \>\n";
+ if ($dbc->error) echo "error: " . $dbc->error . "<br \>\n";
if ($result)
{
+
echo "<p class='green'><b>Produktdaten zu ID '" . $prod['pnr'] . "' wurden erfolgreich gespeichert.</b></p>\n";
echo "<br /><br />\n";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/start.php Tue Sep 13 16:32:49 2011 +0200
@@ -0,0 +1,24 @@
+<!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" />
+ <link href="css/navio.css" rel="STYLESHEET" type="TEXT/CSS" />
+ <meta name="author" content="Bettina Schwarzer" />
+
+ <title>FHI Administration</title>
+</head>
+
+<body>
+<div id="navi">
+<h3> Datenbank für die Administration und Infrastruktur im FHI</h3>
+
+<?php
+ include_once($_SERVER["DOCUMENT_ROOT"] . "/fhiiqm/inc/menu.inc.html");
+?>
+</div>
+<div id="renavi" align="right"><img src="img/fhi.jpg" border="0" alt="FHI" width="100%"/> </div>
+
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/vertrag_flist1.php Mon Sep 12 10:34:07 2011 +0200
+++ b/fhiiqm/vertrag_flist1.php Tue Sep 13 16:32:49 2011 +0200
@@ -83,6 +83,10 @@
<tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Vertragsdaten</td></tr>\n";
echo "</table>\n";
printf ("<p>Anzahl Verträge: %s </p>", $vanz);
+ echo "</div>\n";
+ echo "<p> <a href=\"/fhiiqm/vertrag_flist2.php?s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil\" class=\"sc\" title=\"Vertragliste 2\" onclick=\"winopen(this.href,'Vertragsliste 2'); return false\">Vertragsliste Teil 2</a></p>\n";
+ echo "<div align='center'>\n";
+
if (isset($fnum) && $fnum>1 && !$filter && !$subf)
{
@@ -108,7 +112,7 @@
echo "<tr bgcolor='#68ACBF'>";
tab_column(2,"Bezeichnung",$sort,$dir,2,$fnum,$filter,$start,$zeil);
tab_column(3,"Beschreibung",$sort,$dir,0,$fnum,$filter,$start,$zeil);
- tab_column(4,"Partner FHI",$sort,$dir,4,$fnum,$filter,$start,$zeil);
+ tab_column(4,"Bearbeiter",$sort,$dir,4,$fnum,$filter,$start,$zeil);
tab_column(5,"Dokument",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(6,"Typ",$sort,$dir,6,$fnum,$filter,$start,$zeil);
tab_column(7,"zu Produkt",$sort,$dir,7,$fnum,$filter,$start,$zeil);
--- a/fhiiqm/vertrag_flist2.php Mon Sep 12 10:34:07 2011 +0200
+++ b/fhiiqm/vertrag_flist2.php Tue Sep 13 16:32:49 2011 +0200
@@ -96,7 +96,7 @@
tab_column(2,"Bezeichnung",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(8,"Beginn",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(9,"Ende",$sort,$dir,0,$fnum,$filter,$start,$zeil);
- tab_column(10,"Autoend",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+ tab_column(10,"Verläng.",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(11,"Künd.frist",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(12,"Partner",$sort,$dir,0,$fnum,$filter,$start,$zeil);
echo "<th>Kosten/Jahr(€)</th>";
@@ -129,7 +129,7 @@
echo "<td>" . $ce->format('d.m.Y')."</td>";
}
else echo "<td> </td>";
- if ($row->cautoend) echo "<td>ja</td>"; else echo "<td> </td>";
+ if ($row->cautoend) echo "<td>automatisch</td>"; else echo "<td> </td>";
echo "<td align='right'>$row->kmon</td>";
echo "<td>$row->partfirma</td>";
echo "<td>";
--- a/fhiiqm/vertrag_upd.php Mon Sep 12 10:34:07 2011 +0200
+++ b/fhiiqm/vertrag_upd.php Tue Sep 13 16:32:49 2011 +0200
@@ -97,7 +97,7 @@
elseif ($vtr["cautoend"] && !$vtr['ejahr']) // automatische Vertragsverlaengerung und kein Endjahr angegeben
$ejahr = date("Y");
else
- $ejahr = null;
+ $ejahr = $vtr['bjahr']; // Kosten nur im Startjahr
for ($i=(int)$vtr['bjahr']; $i< (int)$ejahr +1; $i++)
{ $ayear[] = $i; }
$sql = "SELECT k_year, kosten FROM Vertrag_Kosten WHERE contract_ID = $cid ORDER BY k_year ";