--- a/fhiiqm/report/rag_gefahr_massn_report.php Thu Jul 12 13:29:11 2012 +0200
+++ b/fhiiqm/report/rag_gefahr_massn_report.php Thu Aug 23 10:17:50 2012 +0200
@@ -2,7 +2,7 @@
/**
* @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 08/2011, 05/2012
+ * @copyright 05/2012
*
* Report Gefaehrdungsanalye Arbeitsbereiche (Raum-Arb.-Gruppen)
*
@@ -67,6 +67,7 @@
{
$rag["geb"] = $_GET["g"];
$rag["abt"] = $_GET["a"];
+ $rag["ag"] = $_GET["ag"];
$rag["rtyp"] = $_GET["t"];
$rag["bind"] = $_GET["b"];
$rag["sort1"] = $_GET["s1"];
@@ -77,6 +78,7 @@
$_GET["g"] = $rag["geb"];
$_GET["t"] = $rag["rtyp"];
$_GET["a"] = $rag["abt"];
+ $_GET["ag"] = $rag["ag"];
$_GET["b"] = $rag["bind"];
$_GET["s1"] = $rag["sort1"];
$_GET["s2"] = $rag["sort2"];
@@ -87,12 +89,12 @@
if ($search && $_GET['s'] != 2)
{
echo "<span class='sc'>";
- echo "<br /> <a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo "<br /> <a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Raum-Typ\" class=\"sc\">neuer Bericht Abt./AG-Gefährdungen Maßnahmen</a>\n";
echo "</span>";
}
echo "<div align='center'>\n";
- echo "<p><b>Bericht Gefährdungen -> Maßnahmen in Arbeitsgruppen</b></p>\n";
+ echo "<p><b>(7) Bericht Gefährdungen -> Maßnahmen in Arbeitsgruppen</b></p>\n";
echo "</div>\n";
if (!$search)
@@ -105,7 +107,7 @@
<tr>
<td>Abteilung</td>
<td>
- <select name="rag[abt]" size="1">
+ <select name="rag[abt]" size="1" onchange="this.form.submit();">
<?php
if ($rag["abt"] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
@@ -125,6 +127,29 @@
</td>
</tr>
<tr>
+ <td>Arbeitsgruppe</td>
+ <td>
+ <select name="rag[ag]" size="1">
+ <?php
+ if (isset($rag["abt"]) && $rag["abt"] > '-1') $wherag = " WHERE ag.abt_ID = ". $rag["abt"] . " "; else $wherag = "";
+ if ($rag["ag"] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT rag_ID,rag_bez,abt_name FROM fhiiqm.RaumArb_Gruppe ag LEFT OUTER JOIN Abteilung a ON ag.abt_ID=a.abt_ID $wherag ORDER BY 3,2";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->abt_name == $rag['ag'])
+ echo "<option selected value=\"$row->rag_ID\">$row->rag_bez - $row->abt_name</option>\n";
+ else
+ echo "<option value=\"$row->rag_ID\">$row->rag_bez - $row->abt_name</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
<td>Haus</td>
<td>
<select name="rag[geb]" size="1">
@@ -182,8 +207,8 @@
echo "$i. <select name='rag[sort$i]'>\n";
foreach ($sort as $key=>$val)
{
- $rsort = $sort . $i;
- if ($rag[$rsort] == $i) $select= " selected"; else $select = "";
+ $rsort = "sort" . $i;
+ if ($rag[$rsort] == $val) $select= " selected"; else $select = "";
echo "<option$select value='$key'>$val</option>\n";
}
echo "</select> \n";
@@ -238,16 +263,17 @@
if ($rag["geb"]> -1) $where = " geb_ID = '$rag[geb]' ";
if ($rag["abt"]> -1)
if ($where) $where .= "$bind rg.abt_ID = '$rag[abt]' "; else $where = " rg.abt_ID = '$rag[abt]' ";
+ if ($rag["ag"]> -1)
+ if ($where) $where .= "$bind rg.rag_ID = $rag[ag] "; else $where = " rg.rag_ID = $rag[ag] ";
if ($rag["rtyp"]> -1)
if ($where) $where .= "$bind r.raumtyp_ID = '$rag[rtyp]' "; else $where = " r.raumtyp_ID = '$rag[rtyp]' ";
if ($where) $where = " WHERE $where";
if ($rag["sort1"]>0 || $rag["sort2"]>0 || $rag["sort3"]>0 || $rag["sort4"]>0)
{
- if ($rag["sort1"]>0) $ord = "ORDER BY ".$rag["sort1"];
+ if ($rag["sort1"]>0) $ord = " ORDER BY ".$rag["sort1"];
if ($rag["sort2"]>0) $ord .= ",".$rag["sort2"];
if ($rag["sort3"]>0) $ord .= ",".$rag["sort3"];
- if ($rag["sort4"]>0) $ord .= ",".$rag["sort4"];
}
if ($ord) $ord .= ",3,4,6,7,8 "; else $ord = " ORDER BY 3,4,6,7,8 "; // Sortierung immer nach Haus,Raum,Apl-Typ,Gefaehrdung, Massnahmebez.
$sql .= $where . $ord . $lim;
@@ -261,6 +287,12 @@
if ($krit) $bd = " ".$bind; else $bd = "";
$krit .= $bd. " [Abteilung = '$abtn']";
}
+ if ($rag["ag"] > -1)
+ {
+ $agbez = $dbc -> querySingleItem("SELECT rag_bez FROM fhiiqm.RaumArb_Gruppe WHERE rag_ID = ".$rag['ag']);
+ if ($krit) $bd = " ".$bind; else $bd = "";
+ $krit .= $bd. " [Arbeitsgruppe = '$agbez']";
+ }
if ($rag["rtyp"] > -1)
{
if ($krit) $bd = " ".$bind; else $bd = "";
@@ -325,6 +357,7 @@
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
echo "<tr bgcolor='" . $bg . "'>";
if ($rag["bind"]=="OR" || !$rag['abt'] || $rag['abt'] == -1) echo "<td>$row->abt_name</td>";
+ if (strpos($row->rag_bez,"DynamiX")) $row->rag_bez = str_replace("X","χ",$row->rag_bez);
echo "<td>$row->rag_bez</td>";
if ($rag["bind"]=="OR" || !$rag['geb'] || $rag['geb'] == -1) echo "<td>$row->geb_ID</td>";
echo "<td>$row->raum_nr</td>";
@@ -395,7 +428,7 @@
if ($search != 2)
{
echo "<span class='sc'>";
- echo "<br /><br /> <a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo "<br /><br /> <a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Raum-Typ\" class=\"sc\">neuer Bericht Abt./AG-Gefährdungen Maßnahmen</a>\n";
echo "</span>";
}