--- a/fhiiqm/css/db.css Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/css/db.css Tue Sep 27 14:59:40 2011 +0200
@@ -226,4 +226,3 @@
font-style: normal;
color: #000066;
}
-
--- a/fhiiqm/form/produkt_form.inc.php Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/form/produkt_form.inc.php Tue Sep 27 14:59:40 2011 +0200
@@ -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_ber_name: $row->prod_group_name</option>\n";
+ echo "<option selected value=\"$row->prod_group_ID\" title=\"$row->prod_group_ID\">$row->prod_ber_name: $row->prod_group_name</option>\n";
}
else
- echo "<option value=\"$row->prod_group_ID\">$row->prod_ber_name: $row->prod_group_name</option>\n";
+ echo "<option value=\"$row->prod_group_ID\" title=\"$row->prod_group_ID\">$row->prod_ber_name: $row->prod_group_name</option>\n";
}
}
?>
--- a/fhiiqm/form/vertrag_report_form.inc.php Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/form/vertrag_report_form.inc.php Tue Sep 27 14:59:40 2011 +0200
@@ -22,17 +22,17 @@
<table width="50%" border="0" cellspacing="3" cellpadding="3">
<tr>
<td>Produktgruppe</td>
- <td><select name="vr[prodg]">
+ <td><select name="vr[prodg]" <?php if ($rvnr == 1) echo "onchange=\"this.form.submit();\""; ?>>
<?php
- $select = null;
if ($vr["prodg"] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
$sql = "SELECT prod_group_ID, prod_group_name FROM Produkt_Gruppe ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
+ $select = "";
foreach ($result as $row)
{
- if (is_array($vr["prodg"])) $select = in_array( $row->prod_group_ID, $vr["prodg"] ) ? ' selected' : null;
+ if (isset($vr["prodg"])) $select = ($row->prod_group_ID == $vr["prodg"] ) ? ' selected' : null;
echo "<option $select value=\"$row->prod_group_ID\">$row->prod_group_name</option>\n";
}
}
@@ -40,19 +40,22 @@
</select>
</td>
</tr>
+ <?php if ($rvnr == 1)
+ { ?>
<tr>
<td>Produkt</td>
<td><select name="vr[prod]">
<?php
- $select = null;
if ($vr["prod"] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT produkt_ID, prod_name FROM Produkt ORDER BY 2";
+ if (isset($vr["prodg"]) && $vr["prodg"] > -1) $where = " WHERE prod_group_ID = $vr[prodg] "; else $where = "";
+ $sql = "SELECT produkt_ID, prod_name FROM Produkt $where ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
- foreach ($result as $row)
+ $select = null;
+ foreach ($result as $row)
{
- if (is_array($vr["prod"])) $select = in_array( $row->produkt_ID, $vr["prod"] ) ? ' selected' : null;
+ if (isset($vr["prod"])) $select = ( $row->produkt_ID == $vr["prod"] ) ? ' selected' : null;
echo "<option $select value=\"$row->produkt_ID\">$row->prod_name</option>\n";
}
}
@@ -60,19 +63,21 @@
</select>
</td>
</tr>
+ <?php
+ } ?>
<tr>
<td>Vertrag-Typ</td>
<td><select name="vr[vtyp]">
<?php
- $select = null;
if ($vr['vtyp'] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
$sql = "SELECT vtyp_ID, vtyp_bezeichnung FROM Vertrag_Typ ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
+ $select = null;
foreach ($result as $row)
{
- if (is_array($vr["vtyp"])) $select = in_array( $row->vtyp_ID, $vr["vtyp"] ) ? ' selected' : null;
+ if (isset($vr["vtyp"])) $select = ( $row->vtyp_ID == $vr["vtyp"] ) ? ' selected' : null;
echo "<option $select value=\"$row->vtyp_ID\">$row->vtyp_bezeichnung</option>\n";
}
}
@@ -80,6 +85,16 @@
</select>
</td>
</tr>
+ <?php if ($rvnr == 2)
+ { ?>
+ <tr><td>gewünschtes<br />Kündigungsdatum</td>
+ <td valign="top"><input type="text" name="vr[kd]" id="kd" value="<?php echo $vr['kd']; ?>"/>
+ </td>
+ </tr>
+ <?php
+ } ?>
+ <?php if ($rvnr == 1)
+ { ?>
<tr>
<td>Jahr</td>
<td>
@@ -91,8 +106,8 @@
echo "<option value=\"-1\"></option>\n";
$ja = $vr['jahr'];
for ($i=2000; $i<2031; $i++)
- { if ($i==intval($j1))
- echo "<option selected>$ja1</option>\n";
+ { if ($i==intval($ja))
+ echo "<option selected>$ja</option>\n";
else
echo "<option>$i</option>\n";
}
@@ -100,6 +115,8 @@
</select>
</td>
</tr>
+ <?php
+ } ?>
<tr>
<td>Verknüpfung</td>
<td>UND
@@ -110,14 +127,16 @@
<tr>
<td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
<?php
- $sort = array("-1"=>"","2"=>"Vertragsbezeichnung","10"=>"Kosten","11"=>"Kostenjahr");
- for ($i=1; $i<4; $i++)
+ if ($rvnr == 1)
+ $sort = array("-1"=>"","2"=>"Vertragsbezeichnung","10"=>"Kosten","11"=>"Jahr");
+ elseif ($rvnr ==2)
+ $sort = array("-1"=>"","2"=>"Vertragsbezeichnung","12"=>"Partner","13"=>"Kündigungstermin");
+ for ($i=1; $i<count($sort); $i++)
{
echo "$i. <select name='vr[sort$i]'>\n";
foreach ($sort as $key=>$val)
{
- $rsort = $sort . $i;
- if ($rag[$rsort] == $i) $select= " selected"; else $select = "";
+ if ($vr["sort$i"] == $key) $select= " selected"; else $select = "";
echo "<option$select value='$key'>$val</option>\n";
}
echo "</select> \n";
--- a/fhiiqm/inc/func_lib.inc.php Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/inc/func_lib.inc.php Tue Sep 27 14:59:40 2011 +0200
@@ -136,6 +136,7 @@
if ($pwdmd5 == md5($log["pass"]))
{
// hier fehlt noch Recht!
+ $_SESSION['recht'] = array('s'=>1,'u'=>1,'i'=>1,'d'=>1);
if ( ! isset($_SESSION["userid"]) ) $_SESSION["userid"] = "";
$_SESSION["userid"] = $userid;
header("Location: $target");
--- a/fhiiqm/login.php Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/login.php Tue Sep 27 14:59:40 2011 +0200
@@ -9,6 +9,6 @@
include_once ("inc/func_lib.inc.php");
-login("vertrag_menu.html");
+login("start.php");
?>
\ No newline at end of file
--- a/fhiiqm/report/vertrag_report_kost.php Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/report/vertrag_report_kost.php Tue Sep 27 14:59:40 2011 +0200
@@ -26,6 +26,7 @@
$vr = $_POST["vr"]; // Parameter aus Form
$create = $_POST["create"];
+ $rvnr = 1; // Report-Kz
// print_r($vr); echo "<br /><br />";
@@ -34,7 +35,7 @@
{
include($_SERVER["DOCUMENT_ROOT"]. "/fhiiqm/form/vertrag_report_form.inc.php");
echo "<p> </p><p> </p><p> </p><p> </p><p> </p><p> </p><p> </p><p> </p>";
- echo "<p> <a href=\"/fhiiqm/vertrag_report.html\" target=\"_self\" title=\"Berichte\">« zur Berichtsübersicht</a></p>\n";
+ echo "<p> <a href=\"/fhiiqm/vertrag_report.html\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a></p>\n";
}
else
{
@@ -49,18 +50,26 @@
$sql1 = "SELECT v.contract_ID,contract_name,contract_l,contract_begin,contract_end,v.vtyp_ID,
pv.produkt_ID,prod_name,prod_group_ID,kosten,k_year,vtyp_kurz
FROM fhiiqm.Vertrag v
- INNER JOIN fhiiqm.Vertrag_Kosten k ON v.contract_ID=k.contract_ID
- INNER JOIN fhiiqm.Produkt_Vertrag pv ON v.contract_ID=pv.contract_ID
- INNER JOIN fhiiqm.Produkt p ON pv.produkt_ID=p.produkt_ID
- INNER JOIN fhiiqm.Vertrag_Typ t ON v.vtyp_ID=t.vtyp_ID
- WHERE (contract_end IS NULL OR YEAR(contract_end)>=YEAR(Current_Date()))";
+ LEFT OUTER JOIN fhiiqm.Vertrag_Kosten k ON v.contract_ID=k.contract_ID
+ LEFT OUTER JOIN fhiiqm.Produkt_Vertrag pv ON v.contract_ID=pv.contract_ID
+ LEFT OUTER JOIN fhiiqm.Produkt p ON pv.produkt_ID=p.produkt_ID
+ LEFT OUTER JOIN fhiiqm.Vertrag_Typ t ON v.vtyp_ID=t.vtyp_ID ";
+// WHERE (contract_end IS NULL OR YEAR(contract_end)>=YEAR(Current_Date()))";
$sql2 = "SELECT SUM(kosten) AS sumkosten, k_year
FROM fhiiqm.Vertrag v
- INNER JOIN fhiiqm.Vertrag_Kosten k ON v.contract_ID=k.contract_ID
- INNER JOIN fhiiqm.Produkt_Vertrag pv ON v.contract_ID=pv.contract_ID
- INNER JOIN fhiiqm.Produkt p ON pv.produkt_ID=p.produkt_ID
- WHERE (contract_end IS NULL OR YEAR(contract_end)>=YEAR(Current_Date()))";
+ LEFT OUTER JOIN fhiiqm.Vertrag_Kosten k ON v.contract_ID=k.contract_ID
+ LEFT OUTER JOIN fhiiqm.Produkt_Vertrag pv ON v.contract_ID=pv.contract_ID
+ LEFT OUTER JOIN fhiiqm.Produkt p ON pv.produkt_ID=p.produkt_ID
+ LEFT OUTER JOIN fhiiqm.Vertrag_Typ t ON v.vtyp_ID=t.vtyp_ID ";
+
+
+ $sql3 = "SELECT COUNT(DISTINCT v.contract_ID) AS anzv
+ FROM fhiiqm.Vertrag v
+ LEFT OUTER JOIN fhiiqm.Vertrag_Kosten k ON v.contract_ID=k.contract_ID
+ LEFT OUTER JOIN fhiiqm.Produkt_Vertrag pv ON v.contract_ID=pv.contract_ID
+ LEFT OUTER JOIN fhiiqm.Produkt p ON pv.produkt_ID=p.produkt_ID
+ LEFT OUTER JOIN fhiiqm.Vertrag_Typ t ON v.vtyp_ID=t.vtyp_ID ";
if (!$vr["bind"]) $bind = " AND "; else $bind = $vr["bind"];
@@ -90,7 +99,7 @@
$sql = "SELECT vtyp_bezeichnung FROM Vertrag_Typ WHERE vtyp_ID = " . $vr["vtyp"];
$res = $dbc -> querySingleItem($sql);
$krit .= $bd." [Vertragtyp = '$res']";
- }
+ }
if ($vr["jahr"]> -1)
{
if ($where) $where .= " $bind k_year = $vr[jahr] "; else $where = " k_year = $vr[jahr] ";
@@ -99,7 +108,7 @@
if ($krit) $bd = " ".$bind; else $bd = "";
$krit .= $bd." [Kostenjahr = '" . $vr["jahr"] ."']";
}
- if ($where) $where = " AND $where";
+ if ($where) $where = " WHERE $where";
if ($vr["sort1"]>0 || $rag["sort2"]>0)
{
@@ -126,7 +135,7 @@
echo "<th width='3%'>Typ</th>";
echo "<th width='15%'>zu Produkt</th>";
echo "<th width='12%'>Kosten (€)</th>";
- echo "<th width='5%'>Kosten-Jahr</th></tr>\n";
+ echo "<th width='5%'>Jahr</th></tr>\n";
foreach ($result as $row)
@@ -148,15 +157,23 @@
if ($dbc->error) echo $dbc->error . "<br />";
if ($result)
{
+ // Anzahl gefilterter Vertraege
+ if ($where) $sql3 .= " $where";
+// echo "sql3 = $sql3<br /><br />";
+ $rc = $dbc -> querySingleItem($sql3);
+ $i = 0;
foreach ($result as $row)
{
- if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
echo "<tr bgcolor='" . $bg . "'>";
- echo "<td colspan='3'> </td>";
+ if ($rc && $i == 0)
+ echo "<td colspan='3'><b>Anzahl Verträge: $rc</b></td>";
+ else
+ echo "<td colspan='3'> </td>";
echo "<td><b>∑ Kosten</b></td>";
echo "<td class='right'><b>". number_format($row->sumkosten,2,",",".") ."</b></td>";
echo "<td class='center'><b>$row->k_year</b></td></tr>\n";
-
+ $i++;
}
}
@@ -172,7 +189,7 @@
echo "<br /><br /> <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\"
title=\"Report Vertrag-Kosten\" class=\"sc\">neuer Bericht Vertrag - Kosten</a></p>\n";
- echo "<p> <a href=\"/fhiiqm/vertrag_report.html\" target=\"_self\" title=\"Berichte\">« zur Berichtsübersicht</a></p>\n";
+ echo "<p> <a href=\"/fhiiqm/vertrag_report.html\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a></p>\n";
}
?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/report/vertrag_report_kuend.php Tue Sep 27 14:59:40 2011 +0200
@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 09/2011
+ *
+ * Report Vertrag Kündigungstermin
+ *
+ */
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+ <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness/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>Bericht Vertrag-Kündigungstermin</title>
+</head>
+
+<body >
+ <div class="float-r"><img src="/fhiiqm/img/document_mark_as_final.png" border="0" alt="Bericht" title="Bericht"/></div>
+
+ <script>
+ $(document).ready(function() {
+ $("#kd").datepicker({
+ dateFormat: 'yy-mm-dd',
+ yearRange: '2000:2030',
+ 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']
+// beforeShowDay: $.datepicker.noWeekends
+ });
+ $("input").filter("long20").addClass("long20");
+ $("input").filter("long30").addClass("long30");
+ $("input").filter("long50").addClass("long50");
+ });
+ </script>
+
+<?php
+ error_reporting(E_ALL ^ E_NOTICE);
+
+ $vr = $_POST["vr"]; // Parameter aus Form
+ $create = $_POST["create"];
+ $rvnr = 2; // Report-Kz
+
+// print_r($vr); echo "<br /><br />";
+
+ echo "<div align='center'>
+ <h3>Bericht: Vertrag - Kündigungstermin</h3>\n";
+ echo "<table border='0' cellspacing='0'>\n";
+ echo "<tr><td class='bigger'>Annahmen:</td></tr>\n
+ <tr><td> – wenn keine Kündigungsfrist angegeben ist, wird eine Frist von 3 Monaten angenommen</td></tr>\n
+ <tr><td> – wenn keine Kündigungsdatum gesetzt wird, wird das aktuelle Datum angenommen</td></tr>\n
+ <tr><td> – wenn kein Vertragsende und keine automatische Verlängerung angegeben sind, erfolgt keine Berechnung</td></tr>\n
+ <tr><td> – wenn das Vertragsende vor dem gewählten Kündigungsdatum liegt, erfolgt keine Berechnung</td></tr>\n
+ <tr><td> – frühestmöglicher Kündigungstermin ist der letzter Tag des Monats, zu dem die Kündigung erfolgt</td></tr>\n";
+ echo "</table></div>\n";
+
+ if (!isset($create) || !$create)
+ {
+ include($_SERVER["DOCUMENT_ROOT"]. "/fhiiqm/form/vertrag_report_form.inc.php");
+ echo "<p> </p><p> </p><p> </p><p> </p><p> </p><p> </p><p> </p><p> </p>";
+ echo "<p> <a href=\"/fhiiqm/vertrag_report.html\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a></p>\n";
+ }
+ else
+ {
+ // Kriterien sind klar
+ echo "<div align='center'>\n";
+
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+// include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+
+ if ($vr["sort1"]>0) $sort = $vr["sort1"];
+ if ($vr["sort2"]>0) if ($sort) $sort .= ",".$vr["sort2"]; else $sort = $vr["sort2"];
+ if ($vr["sort3"]>0) if ($sort) $sort .= ",".$vr["sort3"]; else $sort = $vr["sort3"];
+ if ($sort) $sort = "'" . $sort . "'"; else $sort="''";
+
+ if ($vr["prodg"] == -1) $vr["prodg"]=0;
+ if ($vr["vtyp"] == -1) $vr["vtyp"]=0;
+ if (!$vr["kd"]) $vr["kd"]=0;
+
+ if (!$vr["bind"]) $bind = " AND "; else $bind = $vr["bind"];
+ $sqlr = "CALL fhiiqm.vertrag_kuendtermin($vr[prodg],$vr[vtyp],'$vr[kd]','$vr[bind]',$sort)";
+// echo $sqlr;
+ $dbc = new dbconnection();
+ if ($vr["prodg"]>0 || $vr["vtyp"]>0 || $vr["kd"]>0)
+ {
+ if ($vr["kd"]>0)
+ {
+ $kd = new DateTime($vr["kd"]);
+ $krit1 .= $bd. " [gewähltes Kündigungsdatum = '<b>" . $kd->format('d.m.Y') ."</b>']";
+ }
+ else $krit1 .= $bd. " [gesetztes Kündigungsdatum = '<b>" . date('d.m.Y') . "</b>']";
+
+ if ($vr["prodg"]>0 || $vr["vtyp"]>0) $krit1 .= " AND (";
+ if ($vr["prodg"]>0)
+ {
+ if ($krit) $bd = " ".$bind; else $bd = "";
+ $sql = "SELECT prod_group_name FROM Produkt_Gruppe WHERE prod_group_ID = " . $vr["prodg"];
+ $res = $dbc -> querySingleItem($sql);
+ $krit .= $bd. " [Produktgruppe = '$res']";
+ }
+ if ($vr["vtyp"]> 0)
+ {
+ if ($krit) $bd = " ".$bind; else $bd = "";
+ $sql = "SELECT vtyp_bezeichnung FROM Vertrag_Typ WHERE vtyp_ID = " . $vr["vtyp"];
+ $res = $dbc -> querySingleItem($sql);
+ $krit .= $bd. " [Vertragtyp = '$res']";
+ }
+ if ($vr["prodg"]>0 || $vr["vtyp"]>0) $krit = $krit1 . $krit ." )";
+ }
+ else
+ $krit .= " [gesetztes Kündigungsdatum = '<b>" . date('d.m.Y') . "</b>']";
+ if ($krit )echo "<p>Filter: $krit</p>";
+
+ $result = $dbc ->queryObjectArray($sqlr);
+ if ($dbc->error) echo $dbc->error . "<br />";
+
+ if ($result)
+ {
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+ echo "<table border='1' cellspacing='0' cellpadding='2' width=65%>\n";
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ echo "<th>Bezeichnung</th>";
+ echo "<th>Beginn</th>";
+ echo "<th>Ende</th>";
+ echo "<th>Verlängerung</th>";
+ echo "<th>Künd.frist (mon)</th>";
+ echo "<th>Produktgruppe</th>";
+ echo "<th>Vertragstyp</th>";
+ echo "<th>Partnerfirma</th>";
+ echo "<th>Kündigung frühestens zum</th></tr>\n";
+ foreach ($result as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'>";
+ echo "<td>$row->cname</td>";
+ if ($row->cbegin)
+ {
+ $cb = new DateTime($row->cbegin);
+ echo "<td>" . $cb->format('d.m.Y')."</td>";
+ }
+ 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->cautov) echo "<td>automatisch</td>"; else echo "<td> </td>";
+ echo "<td class='center'>$row->ckmon</td>";
+ echo "<td>$row->prodg_name</td>";
+ echo "<td>$row->vtypk</td>";
+ echo "<td>$row->partfirma</td>";
+ if ($row->fkdat)
+ {
+ $kd = new DateTime($row->fkdat);
+ if ($kd->format('Y') == '1111') echo "<td class='red'>Kündigungsfrist zu lang!</td>\n";
+ elseif ($kd->format('Y') == '1010') echo "<td>Künd.dat. > VEnde!</td>\n";
+ else echo "<td class='green'>" . $kd->format('d.m.Y')."</td></tr>\n";
+ }
+ else echo "<td> </td></tr>\n";
+ }
+ echo "</table>\n";
+
+ echo "<p></p><table width=65%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+ <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+
+ }
+ else echo "<p class='red'> Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+
+ echo "</div>\n";
+ echo "<br /><br /> <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\"
+ title=\"Report Vertrag-Kündigungstermin\" class=\"sc\">neuer Bericht Vertrag - Kündigungstermin</a></p>\n";
+
+ echo "<p> <a href=\"/fhiiqm/vertrag_report.html\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a></p>\n";
+ }
+
+?>
+
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/start.php Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/start.php Tue Sep 27 14:59:40 2011 +0200
@@ -16,6 +16,8 @@
<?php
include_once($_SERVER["DOCUMENT_ROOT"] . "/fhiiqm/inc/menu.inc.html");
+// session_start();
+// print_r ($_SESSION['recht']);
?>
</div>
<div id="renavi" align="right"><img src="img/fhi.jpg" border="0" alt="FHI" width="100%"/> </div>
--- a/fhiiqm/vertrag_flist1.php Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/vertrag_flist1.php Tue Sep 27 14:59:40 2011 +0200
@@ -98,7 +98,18 @@
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 id='filter' name='filter' type=\"text\" size=\"30\" maxlength=\"30\" value=\"$filter\"";
+ if ($fnum == 6)
+ {
+ $sql = "SELECT vtyp_kurz, vtyp_bezeichnung FROM Vertrag_Typ ORDER BY 1";
+ if ($res = $dbc->queryObjectArray($sql))
+ {
+ foreach ($res as $row)
+ $title .= ", " . $row->vtyp_kurz." - ".$row->vtyp_bezeichnung;
+ echo "title='".substr($title,2)."' ";
+ }
+ }
+ echo "/></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";
--- a/fhiiqm/vertrag_flist2.php Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/vertrag_flist2.php Tue Sep 27 14:59:40 2011 +0200
@@ -97,7 +97,7 @@
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,"Verläng.",$sort,$dir,0,$fnum,$filter,$start,$zeil);
- tab_column(11,"Künd.frist",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+ tab_column(11,"Künd.frist (mon)",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(12,"Partner",$sort,$dir,0,$fnum,$filter,$start,$zeil);
echo "<th>Kosten/Jahr(€)</th>";
echo "<th>Bemerkung</th>";
@@ -130,7 +130,7 @@
}
else echo "<td> </td>";
if ($row->cautoend) echo "<td>automatisch</td>"; else echo "<td> </td>";
- echo "<td align='right'>$row->kmon</td>";
+ echo "<td class='center'>$row->kmon</td>";
echo "<td>$row->partfirma</td>";
echo "<td>";
$bem = nl2br($row->bem);
--- a/fhiiqm/vertrag_report.html Fri Sep 16 16:15:15 2011 +0200
+++ b/fhiiqm/vertrag_report.html Tue Sep 27 14:59:40 2011 +0200
@@ -25,8 +25,10 @@
</tr>
<tr>
<td class="bigger">
- <a href="#" title="Verträge - Kündigungsfrist">Verträge - Kündigungsfrist</a>
- <br /> Auswahl: Produktgruppe, Produkt, Vertragstyp
+ <a href="/fhiiqm/report/vertrag_report_kuend.php" title="Verträge - Kündigungstermin">Verträge - Kündigungstermin</a>
+ <br /> Auswahl: Produktgruppe, Vertragstyp, gewünschtes Kündigungsdatum
+ <br /> Ansicht: Vertragsbezeichnung, -beginn, -ende, Verlängerung, Kündigungsfrist(mon),
+ Produktgruppe, Vertragstyp, Partner, Kündigung zum
</td>
</tr>
</table>