--- a/fhiiqm/form/ma_ed_form.inc.php	Fri Nov 16 10:40:03 2012 +0100
+++ b/fhiiqm/form/ma_ed_form.inc.php	Fri Dec 21 15:31:50 2012 +0100
@@ -19,9 +19,17 @@
 <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_ma">
 <div align="center"> 
 <table width="60%" border="0" cellspacing="3" cellpadding="3">
+    <tr>
+        <td>
+            <u>Mitarbeiter</u> FHI?
+        </td>
+        <td><input name="ma[fhi]" type="checkbox" value="1" <?php if ($ma['fhi']) echo "checked=\"checked\""; ?> onchange="this.form.submit();" />
+        </td>    
+    </tr>        
 	<tr>
-	   <td>Name *</td>
-	   <td><input name="ma[name]" type="text" size="30" maxlength="30" value="<?php echo $ma['name']; ?>" />
+        <?php if (!$ma["fhi"]) echo "<td>Bezeichnung 1 *</td>\n";
+	           else echo "<td>Name *</td>\n"; ?>
+	   <td><input name="ma[name]" type="text" size="30" maxlength="50" value="<?php echo $ma['name']; ?>" />
         <?php
 			     if (isset($ma['name']) && $ma['name']<'!')
 				{
@@ -32,8 +40,9 @@
         </td>
     </tr>
 	<tr>
-	   <td>Vorname</td>
-	   <td><input name="ma[vname]" type="text" size="30" maxlength="30" value="<?php echo $ma['vname']; ?>" />
+        <?php if (!$ma["fhi"]) echo "<td>Bezeichnung 2 </td>\n";
+	           else echo "<td>Vorname </td>\n"; ?>
+	   <td><input name="ma[vname]" type="text" size="30" maxlength="50" value="<?php echo $ma['vname']; ?>" />
         <?php
 		/*	     if (isset($ma['vname']) && $ma['vname']<'!')
 				{
@@ -43,10 +52,12 @@
         ?>
         </td>
     </tr>
+    <?php if ($ma["fhi"]) {   ?>   
 	<tr>
 	   <td>Titel</td>
 	   <td><input name="ma[titel]" type="text" size="30" maxlength="30" value="<?php echo $ma['titel']; ?>" /></td>
     </tr>
+    <?php } ?>
     <tr><td>Ort</td>
         <td valign="top">Haus&nbsp;
              <select name="ma[geb]" onchange="this.form.submit();">
@@ -87,6 +98,30 @@
         </td>
     </tr>
     <tr>
+        <td>Arbeitsgruppe</td>
+        <td><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, 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 ($result = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($result as $row)
+                    {
+                        if ($row->rag_ID == $ma['rag'])
+                        {
+    					   echo "<option selected value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+                        }  
+    				    else
+    					   echo "<option value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+                    }
+            }
+            ?>
+            </select>
+        </td>
+    </tr>
+    <tr>
         <td>Telefon</td>
         <td><div id="addtel">
         <select name="ma[tel][]" size="1">
@@ -156,10 +191,12 @@
         </div>
         </td>   
     </tr>
+    <?php if ($ma["fhi"]) {   ?>   
 	<tr>
 	   <td>E-Mail</td>
 	   <td><input name="ma[email]" type="text" size="30" maxlength="100" value="<?php echo $ma['email']; ?>" /></td>
     </tr>
+    <?php } ?>
     <tr><td>Abteilung *</td>
         <td valign="top">
              <select name="ma[abt]">
@@ -177,7 +214,6 @@
             }
             ?>
             </select>
-            &nbsp;&nbsp;&nbsp;Mitarbeiter FHI?&nbsp;&nbsp;&nbsp;<input name="ma[fhi]" type="checkbox" value="1" <?php if ($ma['fhi']) echo "checked"; ?> />
             <input type="hidden" name="okn" value="<?php echo $okn; ?>" />
         </td>   
     </tr>