Adjust table to new table structure
authorJoey Schulze <joey@infodrom.org>
Wed, 10 Mar 2010 16:02:22 +0000 (17:02 +0100)
committerJoey Schulze <joey@infodrom.org>
Wed, 10 Mar 2010 16:02:22 +0000 (17:02 +0100)
masks/arbeitsberichte.php

index e571928..b98b48c 100644 (file)
@@ -60,10 +60,13 @@ $mask = array(
              'table' => 'einsatz',
              'title' => 'Arbeitsberichte',
              'subtitle' => 'Eingabe und √úbersicht',
-             'join' => array('personal ON einsatz.personal = personal.id',
+             'join' => array(
+                             'einsatzpersonal ON einsatzpersonal.einsatz = einsatz.id',
+                             'personal ON einsatzpersonal.personal = personal.id',
+                             'einsatzgeraete ON einsatzgeraete.einsatz = einsatz.id',
                              'gebiet ON einsatz.gebiet = gebiet.id',
-                             'gerate ON einsatz.geraet = gerate.id',
-                             'anbaugeraete ON einsatz.anbaugeraet = anbaugeraete.id',
+                             'gerate ON einsatzgeraete.geraet = gerate.id',
+                             'anbaugeraete ON einsatzgeraete.anbaugeraet = anbaugeraete.id',
                              'arbeitsarten ON einsatz.arbeiten = arbeitsarten.id',
                              'kostenstellen ON einsatz.kostenstelle = kostenstellen.id',
                              ),
@@ -115,10 +118,11 @@ $mask = array(
                                            'width' => 150,
                                            'specs' => "filterUI: 's'",
                                            ),
-                             'stunden' => array(
-                                           'name' => 'Stunden',
+                             'personalstunden' => array(
+                                           'name' => 'Mitarbeiterstunden',
                                            'type' => 'number',
                                            'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: '&nbsp;', canSort: false",
+                                           'sql' => 'einsatzpersonal.stunden',
                                            'width' => 60,
                                            'visible' => false,
                                            ),
@@ -126,6 +130,7 @@ $mask = array(
                                            'name' => 'Ger√§tstunden',
                                            'type' => 'number',
                                            'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: '&nbsp;', canSort: false",
+                                           'sql' => 'einsatzgeraete.stunden',
                                            'width' => 60,
                                            'visible' => false,
                                            ),