--- a/fhiiqm/form/ma_ed_form.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/form/ma_ed_form.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -10,7 +10,11 @@
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
$okn = true;
- if (!$ma) $ma['geb'] = 'A';
+ if (!$ma)
+ {
+ $ma['geb'] = 'A';
+ $ma['abt'][0] = $dbc -> querySingleItem("SELECT abt_ID FROM Abteilung ORDER BY abt_ID+0 LIMIT 0,1");
+ }
?>
<div align="center">
@@ -97,10 +101,12 @@
</select>
</td>
</tr>
- <tr>
+<?php
+/* // deaktiviert am 08.01.2013, Kaendler, Schwarzer
+ echo
+ "<tr>
<td>Arbeitsgruppe</td>
- <td><select name="ma[rag]">
- <?php
+ <td><select name=\"ma[rag]\">";
if ($ma['rag'] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
$sql = "SELECT rag_ID, rag_bez, abt_name FROM RaumArb_Gruppe g INNER JOIN Abteilung a
@@ -117,31 +123,35 @@
echo "<option value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
}
}
- ?>
- </select>
+ echo
+ "</select>
</td>
- </tr>
+ </tr>";
+*/
+?>
<tr>
<td>Telefon</td>
<td><div id="addtel">
<select name="ma[tel][]" size="1">
<?php
$select = null;
- $select = ( "-1"==$ma['tel'][0] ) ? ' selected' : null;
+ $select = ( "-1"==$ma['tel'][0] ) ? " selected='selected'" : "";
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT telefon_nr,geb_ID,raum_nr, telefon_typ FROM fhiiqm.Telefon t
+/* $sql = "SELECT telefon_nr,geb_ID,raum_nr, telefon_typ FROM fhiiqm.Telefon t
LEFT OUTER JOIN Raum r ON t.raum_ID=r.Raum_ID
- ORDER BY telefon_nr
-";
+ ORDER BY telefon_nr"; */
+ $sql = "SELECT telefon_nr, telefon_typ FROM fhiiqm.Telefon
+ ORDER BY telefon_nr";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
{
if ($row->telefon_typ == "fax") $teln = $row->telefon_nr." FAX"; else $teln = $row->telefon_nr;
- if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
- $select = ( $row->telefon_nr==$ma['tel'][0] ) ? ' selected' : null;
- echo "<option $select value=\"$row->telefon_nr\">$teln $telr</option>\n";
- $tel .= "'".$row->telefon_nr. "':'" . $teln ." ". $telr. "',";
+// if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
+ $select = ( $row->telefon_nr==$ma['tel'][0] ) ? " selected='selected'" : "";
+ echo "<option $select value=\"$row->telefon_nr\">$teln</option>\n";
+// $tel .= "'".$row->telefon_nr. "':'" . $teln ." ". $telr. "',";
+ $tel .= "'".$row->telefon_nr. "':'" . $teln . "',";
}
}
$tel = substr($tel,0,strlen($tel)-1);
@@ -153,6 +163,17 @@
//-->
</script>
oder neu <input name="ma[ntel][]" type="text" size="20" maxlength="20" value="<?php echo $ma['ntel'][0]; ?>" />
+ Priorität <select name="ma[so][]" size="1">
+ <?php
+ $select = ($ma["so"][0] == '-1')? " selected='selected'" : "";
+ echo "<option$select value=-1></option>\n";
+ for ($i=1; $i<10; $i++)
+ {
+ $select=($ma["so"][0] == $i)? " selected='selected'" : "";
+ echo "<option$select value=$i>$i</option>\n";
+ }
+ ?>
+ </select>
öffentlich <input name="ma[pub][]" type="checkbox" value="1" <?php if ($ma['pub'][0]) echo "checked"; ?> />
<a href="<?php echo "javascript:addInput('addtel');" ?>" title="weitere Telefon-Nr."><img src="/fhiiqm/img/add.png" /></a>
<a href="<?php echo "javascript:delInput('addtel');" ?>" title="löschen letzte Telefon-Nr."><img src="/fhiiqm/img/delete.png" /></a><br />
@@ -166,22 +187,32 @@
{
if ($i>0)
{
- echo "<select name=\"ma[tel][]\" size=\"1\">";
+ echo "<span></span><select name=\"ma[tel][]\" size=\"1\">";
$select = ( "-1" == $atel ) ? ' selected' : null;
echo "<option $select value=\"-1\"></option>\n";
foreach ($result as $row)
{
if ($row->telefon_typ == "fax") $teln = $row->telefon_nr." FAX"; else $teln = $row->telefon_nr;
- if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
+// if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
$select = ( $row->telefon_nr == $atel ) ? ' selected' : null;
- echo "<option $select value=\"$row->telefon_nr\">$teln $telr</option>\n";
+ echo "<option $select value=\"$row->telefon_nr\">$teln</option>\n";
}
echo "</select>";
echo " oder neu <input name=\"ma[ntel][]\" type=\"text\" size=\"20\" maxlength=\"20\" value=\"".$ma['ntel'][$i]."\" />";
- echo " öffentlich <input name=\"ma[pub][$i]\" type=\"checkbox\" value=\"1\"";
- $check = ($ma['pub'][$i]) ? " checked" : "" ;
- echo "$check /><br />";
+ echo " Priorität <select name=\"ma[so][]\" size=\"1\">";
+
+ $select = ( $ma["so"][$i] == "-1" ) ? " selected='selected'" : "";
+ echo "<option$select value=\"-1\"></option>\n";
+ for ($j=1; $j<10; $j++)
+ {
+ $select=($ma["so"][$i] == $j)? " selected='selected'" : "";
+ echo "<option$select value=$j>$j</option>\n";
+ }
+ echo "</select>\n";
+ echo " öffentlich <input name=\"ma[pub][$i]\" type=\"checkbox\" value=\"1\"";
+ $check = ($ma['pub'][$i]) ? " checked='checked'" : "" ;
+ echo "$check /><br />\n";
}
$i++;
}
@@ -198,25 +229,100 @@
</tr>
<?php } ?>
<tr><td>Abteilung *</td>
- <td valign="top">
- <select name="ma[abt]">
+ <td valign="top"><div id="addabt">
+ <select name="ma[abt][]" onchange="this.form.submit();">
<?php
$sql = "SELECT abt_ID, abt_name, abt_long FROM `fhiiqm`.`Abteilung` ORDER BY abt_ID+0";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
{
- if ($row->abt_ID == $ma['abt'])
+ if ($row->abt_ID == $ma['abt'][0])
echo "<option selected value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
else
echo "<option value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ $abt .= "'".$row->abt_ID. "':'" . $row->abt_name .": ". $row->abt_long . "',";
}
- }
+ $abt = substr($abt,0,strlen($abt)-1);
+ }
+ ?>
+ </select>
+
+ Arbeitsgruppe
+ <select name="ma[rag][]">
+ <?php
+ if ($ma['rag'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT rag_ID, rag_bez FROM `fhiiqm`.`RaumArb_Gruppe` WHERE abt_ID = " .$ma["abt"][0] . " ORDER BY rag_bez";
+ if ($resrag = $dbc->queryObjectArray($sql))
+ {
+ foreach ($resrag as $row)
+ {
+ if ($row->rag_ID == $ma['rag'][0])
+ echo "<option selected value=\"$row->rag_ID\">$row->rag_bez</option>\n";
+ else
+ echo "<option value=\"$row->rag_ID\">$row->rag_bez</option>\n";
+// $rag .= "'".$row->rag_ID. "':'" . $row->rag_bez . "',";
+ }
+// $rag = substr($rag,0,strlen($rag)-1);
+ }
+ $sql = "SELECT rag_ID, rag_bez, abt_name FROM RaumArb_Gruppe g INNER JOIN Abteilung a
+ ON g.abt_ID = a.abt_ID ORDER BY g.abt_ID,rag_ID";
+ if ($res = $dbc->queryObjectArray($sql))
+ {
+ foreach ($res as $row)
+ $rag .= "'".$row->rag_ID. "':'" . $row->abt_name . ": ". $row->rag_bez . "',";
+ $rag = substr($rag,0,strlen($rag)-1);
+ }
?>
</select>
- <input type="hidden" name="okn" value="<?php echo $okn; ?>" />
+ <script type="text/javascript">
+ <!--
+ arra = {<?php echo ($abt); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ arrg = {<?php echo ($rag); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ //-->
+ </script>
+ <a href="<?php echo "javascript:addInput('addabt');" ?>" title="weitere Arbeitsgruppe"><img src="/fhiiqm/img/add.png" /></a>
+ <a href="<?php echo "javascript:delInput('addabt');" ?>" title="löschen letzte Arbeitsgruppe"><img src="/fhiiqm/img/delete.png" /></a><br />
+ <?php
+ if (isset($ma) && (!$ok || $sub))
+ {
+ if (count($ma['abt'])>1 || count($ma['rag'])>1)
+ {
+ $i=0;
+ foreach ($ma['abt'] as $eabt)
+ {
+ if ($i>0)
+ {
+ echo "<span></span><select name=\"ma[abt][]\" size=\"1\">";
+
+ foreach ($result as $row)
+ {
+ $select = ( $row->abt_ID == $eabt ) ? ' selected' : null;
+ echo "<option $select value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ }
+ echo "</select>";
+ echo " Arbeitsgruppe ";
+ echo "<select name='ma[rag][]' size=1>";
+ $select = ( $ma["rag"][$i] == "-1" ) ? " selected='selected'" : "";
+ echo "<option$select value=\"-1\"></option>\n";
+ foreach ($res as $row)
+ {
+ $select = ( $row->rag_ID == $ma['rag'][$i] ) ? ' selected' : null;
+ echo "<option $select value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+ }
+ echo "</select><br />";
+ }
+ $i++;
+ }
+ }
+ }
+ ?>
+ </div>
</td>
</tr>
+ <input type="hidden" name="ma[abtm]" value="<?php echo $ma['abtm']; ?>" />
+ <input type="hidden" name="okn" value="<?php echo $okn; ?>" />
<!--
</table>
</div>