--- a/fhiiqm/report/info_report_gvp.php Thu Jul 12 13:29:11 2012 +0200
+++ b/fhiiqm/report/info_report_gvp.php Thu Aug 23 10:17:50 2012 +0200
@@ -104,7 +104,23 @@
echo "</select></td>";
echo
"</tr>\n";
- }
+ }
+ echo "<tr><td>Status Freigabe</td>";
+ echo "<td><select name='inf[stat]'>";
+ if ($inf["stat"] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT info_freigabe_ID, info_freigabe_bez FROM Info_Freigabe ORDER BY 2";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ $select = "";
+ foreach ($result as $row)
+ {
+ if (isset($inf["stat"])) $select = ($row->info_freigabe_ID == $inf["stat"] ) ? ' selected' : null;
+ echo "<option $select value=\"$row->info_freigabe_ID\">$row->info_freigabe_ID - $row->info_freigabe_bez</option>\n";
+ }
+ }
+ echo "</select></td></tr>\n";
+
/* echo "<tr><td>Sortierung nach</td>";
echo "<td><select name='inf[sort]'>";
foreach ($sort as $key=>$val)
@@ -128,18 +144,26 @@
{
// Auswertung Kriterien
// if ($inf["ityp"]) $ityp = "'" . $inf["ityp"] . "'"; else $ityp = "''";
- echo "<span class=\"sc\"><br /> <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Info 1\">neuer Bericht
- GVP Produkt</a> | <a href=\"" . $_SERVER["PHP_SELF"] . "?r=k\" target=\"_self\" title=\"Report Info 2\">GVP Kennzeichen</a></span>\n";
+ echo "<span class=\"sc\">";
+ echo "<br /> <a href=\"/fhiiqm/info_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "?r=$report\" target=\"_self\" title=\"Report Info GVP\">neuer Bericht GVP </a></span>\n";
+ if ($inf['stat'] > -1) // Status Freigabe
+ {
+ $stat = $inf['stat'];
+ $statb = $dbc -> querySingleItem("SELECT info_freigabe_bez FROM Info_Freigabe WHERE info_freigabe_ID=$stat");
+ }
+ else $stat = "''";
if ($report == 'k')
{
if ($inf["kz"] && $inf["kz"] > "!") $kz = "'".$inf["kz"]."'";
else $kz = "''";
- $sql = "CALL info_report(15,'',4,6,15,$kz,0,100,@anz)";
+ // Parameter: 4:ifotyp=6, 15:Kz, 16:freigabe
+ $sql = "CALL info_report(15,'',4,6,15,$kz,16,$stat,0,100,@anz)";
$result = $dbc ->queryObjectArray($sql);
if ($dbc -> error) echo "$sql<br />".$dbc -> error."<br />";
- $filter = "Filter : [Kennzeichen wie $kz]";
+ if ($kz > "''") $filter = "Filter: [Kennzeichen wie $kz]"; else $filter = "Filter: []";
$kz =" nach Kennzeichen";
}
else
@@ -164,8 +188,9 @@
else $prod = "''";
if ($inf["sort"] && $inf["sort"] != '-1') $sor = $inf["sort"]; else $sor=15;
- // es wird immer nach Kennzeichen Info sortiert
- $sql = "CALL info_report($sor,'',4,6,5,$prod,0,100,@anz)";
+ // Parameter: 4:ifotyp=6, 5:produkt, 16:freigabe
+ // es wird immer nach Kennzeichen Info sortiert
+ $sql = "CALL info_report($sor,'',4,6,5,$prod,16,$stat,0,100,@anz)";
$result = $dbc ->queryObjectArray($sql);
if ($dbc -> error) echo "$sql<br />".$dbc -> error."<br />";
@@ -177,8 +202,9 @@
elseif (!$prodbb && $prodgb)
$filter = "[Produktgruppe = $prodgb]";
else $filter = "[]";
- $filter = "Filter : $filter";
+ $filter = "Filter: $filter";
}
+ if ($statb) $filter = ($filter > " ") ? "$filter UND [Status Freigabe = $statb]" : "[Status Freigabe = $statb]";
echo "<div class='sc' align='center'><h3>Geschäftsverteilungsplan$kz</h3></div>\n"; // Anzeige nur Screen
echo "<div align='center'>\n";
@@ -204,6 +230,8 @@
echo "<th width='25%'>Aufgabe (prod)</th>";
echo "<th width='35%'>Teilgebiet (kurzinfo)</th>";
echo "<th>Zuständigkeit</th>";
+ if ($stat == "''") echo "<th>Status</th>";
+
$bg1 = "#F8F8F8";
$bg2 = "#DEDFE1";
$bg = "#FFFFFF";
@@ -225,7 +253,9 @@
echo "<td>$prod</td>";
// echo "<td>$row->iname</td>";
echo "<td>".nl2br($row->ilong)."</td>";
- echo "<td>".str_replace(";","<br />",$row->verantw)."</td></tr>\n";
+ echo "<td>".str_replace(";","<br />",$row->verantw)."</td>";
+ if ($stat == "''") echo "<td>$row->freigabe</td>";
+ echo "</tr>\n";
$pgv = $pg;
}
}
@@ -282,6 +312,7 @@
echo "<th width='30%'>Teilgebiet (kurzinfo)</th>";
// echo "<th width='40%'>Kurzinfo</th>";
echo "<th>Zuständigkeit</th>";
+ if ($stat == "''") echo "<th>Status</th>";
$bg1 = "#F8F8F8";
$bg2 = "#DEDFE1";
$bg = "#FFFFFF";
@@ -294,8 +325,9 @@
echo "<td>".$prod."</td>";
// echo "<td>$row->iname</td>";
echo "<td>".nl2br($row->ilong)."</td>";
- echo "<td>".str_replace(";","<br />",$row->verantw)."</td></tr>\n";
-
+ echo "<td>".str_replace(";","<br />",$row->verantw)."</td>";
+ if ($stat == "''") echo "<td>$row->freigabe</td>";
+ echo "</tr>\n";
$vprodid = $row->prodid;
$vpg = $pg;
$vpb = $pb;
@@ -312,8 +344,9 @@
else echo "<p class='red'> Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
echo "</div>\n";
- echo "<span class=\"sc\"><br /> <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Info 1\">neuer Bericht
- GVP Produkt</a> | <a href=\"" . $_SERVER["PHP_SELF"] . "?r=k\" target=\"_self\" title=\"Report Info 2\">GVP Kennzeichen</a></span>\n";
+ echo "<span class=\"sc\">";
+ echo "<br /> <a href=\"/fhiiqm/info_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "?r=$report\" target=\"_self\" title=\"Report Info GVP\">neuer Bericht GVP </a></span>\n";
}
?>