Format name differently

[misc/kostenrechnung] / masks / arbeitsberichte.php

diff --git a/masks/arbeitsberichte.php b/masks/arbeitsberichte.php
index f2a5ffc..601535d 100644 (file)
--- a/masks/arbeitsberichte.php
+++ b/masks/arbeitsberichte.php
@@ -13,7 +13,7 @@ function get_number(name)
 
 function select_gebiet_callback(data)
 {
-    select_update('edit_kostenstelle',data.info);
+    select_update('edit_kostenstelle',data.info,1);
 }
 
 function select_gebiet(obj)
@@ -41,10 +41,10 @@ function select_geraet(obj)
 function form_onload()
 {
     get_info('gebiete', {}, function (data) { select_update('edit_gebiet',data.info, 1); });
-    get_info('ordnungen', {}, function (data) { select_update('edit_ordnung',data.info); });
-    get_info('mitarbeiter', {}, function (data) { select_update('edit_personal',data.info); });
+    get_info('ordnungen', {}, function (data) { select_update('edit_ordnung',data.info,1); });
+    get_info('mitarbeiter', {}, function (data) { select_update('edit_personal',data.info, 1); });
     get_info('geraete', {}, function (data) { select_update('edit_geraet',data.info, 1); });
-    get_info('arbeitsarten', {}, function (data) { select_update('edit_arbeitsart',data.info); });
+    get_info('arbeitsarten', {}, function (data) { select_update('edit_arbeitsart',data.info,1); });
 }
 
 function replicate_personal()
@@ -61,8 +61,9 @@ function replicate_personal()
     elem = document.createElement('select');
     elem.id = 'edit_personal:' + number;
     elem.name = 'personal:' + number;
+    elem.options[0] = new Option('Bitte wählen Sie','',false,false);
     personal.parentNode.appendChild(elem);
-    get_info('mitarbeiter', {}, function (data) { select_update('edit_personal:'+number,data.info); });
+    get_info('mitarbeiter', {}, function (data) { select_update('edit_personal:'+number,data.info, 1); });
 
     elem = document.createElement('br');
     stunden.parentNode.appendChild(elem);
@@ -124,6 +125,9 @@ function einsatz_check()
        datum: 'Datum',
        gebiet: 'Gebiet',
        kostenstelle: 'Gewässer',
+       ordnung: 'Gewässerordnung',
+       arbeitsart: 'Arbeiten',
+       personal: 'Mitarbeiter',
        stunden: 'Stunden',
        geraet: 'Gerät',
        geraetstunden: 'Gerätestunden'};
@@ -154,6 +158,7 @@ function einsatz_check()
 function einsatz_callback(data)
 {
     info('Neuer Arbeitsbericht gespeichert');
+    window.location.reload();
 }
 
 function einsatz_submit()
@@ -187,8 +192,8 @@ $formular = <<<EOC
 <tr>
  <td width="25%"><input id="edit_datum" name="datum" size="8">&nbsp;<img class="calendar" src="images/icons/calendar.gif" onclick="calendar('edit_datum',event)"></td>
  <td width="25%"><select id="edit_gebiet" name="gebiet" onchange="select_gebiet(this)"><option value="">Bitte wählen Sie</option></select></td>
- <td width="25%"><select id="edit_kostenstelle" name="kostenstelle"></select></td>
- <td width="25%"><select id="edit_ordnung" name="ordnung"></select></td>
+ <td width="25%"><select id="edit_kostenstelle" name="kostenstelle"><option value="">Bitte wählen Sie</option></select></td>
+ <td width="25%"><select id="edit_ordnung" name="ordnung"><option value="">Bitte wählen Sie</option></select></td>
 </tr>
 </table>
 
@@ -200,7 +205,7 @@ $formular = <<<EOC
  <td width="10%">&nbsp;</td>
 </tr>
 <tr>
- <td width="30%"><select id="edit_personal" name="personal"></select></td>
+ <td width="30%"><select id="edit_personal" name="personal"><option value="">Bitte wählen Sie</option></select></td>
  <td width="30%"><input id="edit_stunden" name="stunden" size="5" type="text"></td>
   <td width="30%">&nbsp;</td>
  <td width="10%" align="right"valign="bottom"><button onclick="return replicate_personal()" style="color: red; font-weight: bold;">+&nbsp;</button></td>
@@ -230,7 +235,7 @@ $formular = <<<EOC
 </tr>
 <tr>
  <td width="50%" valign="top"><textarea id="edit_bemerkung" name="bemerkung" cols="66" rows="5"></textarea></td>
- <td width="25%" valign="top"><select id="edit_arbeitsart" name="arbeitsart"></select></td>
+ <td width="25%" valign="top"><select id="edit_arbeitsart" name="arbeitsart"><option value="">Bitte wählen Sie</option></select></td>
  <td width="25%" valign="top"><input id="edit_akkord" name="akkord" type="checkbox"></td>
 </tr>
 </table>
@@ -311,8 +316,8 @@ function einsatz_insert($mask)
                   "VALUES (%d,%d,%s,%.2f,'%s',now())",
                   $einsatz,
                   $_POST['geraet'.$app],
-                  $_POST['anbaugeraet'.$app],
-                  empty($_POST['stunden'.$app]) ? 'NULL' : intval($_POST['stunden'.$app]),
+                  empty($_POST['anbaugeraet'.$app]) ? 'NULL' : intval($_POST['anbaugeraet'.$app]),
+                  $_POST['stunden'.$app],
                   pg_escape_string($_SESSION['sys']['login']));
 
     $sth = pg_query($sql);
@@ -342,7 +347,7 @@ $mask = array(
                                            'sql' => 'SELECT id,name AS text FROM ordnungen ORDER BY id',
                                            ),
                              'mitarbeiter' => array(
-                                           'sql' => 'SELECT id,vorname || \' \' || name AS text FROM personal WHERE aktiv = 1 ORDER BY text',
+                                           'sql' => 'SELECT id,name || \', \' || vorname AS text FROM personal WHERE aktiv = 1 ORDER BY text',
                                            ),
                              'geraete' => array(
                                            'sql' => 'SELECT id,geraet AS text FROM gerate ORDER BY text',
@@ -351,12 +356,12 @@ $mask = array(
                                            'sql' => 'SELECT id,arbeitsart AS text FROM arbeitsarten ORDER BY text',
                                            ),
                              'kostenstellen' => array(
-                                           'sql' => 'SELECT id,kostenstelle AS text FROM kostenstellen WHERE gebiet = {gebiet}',
+                                           'sql' => 'SELECT id,kostenstelle AS text FROM kostenstellen WHERE gebiet = {gebiet} ORDER BY text',
                                            ),
                              'anbaugeraete' => array(
-                                           'sql' => 'SELECT anbaugeraete.id,anbaugeraet as TEXT FROM anbaugeraete ' .
+                                           'sql' => 'SELECT anbaugeraete.id,anbaugeraet as text FROM anbaugeraete ' .
                                                     'JOIN gerate ON anbaugeraete.geraetetyp = gerate.geraetetyp ' .
-                                                    'WHERE gerate.id = {geraet}',
+                                                    'WHERE gerate.id = {geraet} ORDER BY text',
                                            ),
                                   ),
              );