Adjustment of list according to mail specification
authorJoey Schulze <joey@infodrom.org>
Fri, 12 Mar 2010 14:59:52 +0000 (15:59 +0100)
committerJoey Schulze <joey@infodrom.org>
Fri, 12 Mar 2010 14:59:52 +0000 (15:59 +0100)
masks/overview_kosten.php

index 5b7bd1d..bb25533 100644 (file)
@@ -29,8 +29,7 @@ $mask = array(
                              'kostenstellen ON einsatz.kostenstelle = kostenstellen.id',
                              ),
              'where' => "arbeitsarten.arbeitsart <> 'Urlaub' AND arbeitsarten.arbeitsart <> 'Krank' AND arbeitsarten.arbeitsart <> 'Sonstige Fehltage'"
-                      . " AND date_part('year', datum) = " . $_SESSION['overview_kosten.year']
-                      . " GROUP BY einsatz.id,gebiet.gebiet,kostenstellen.kostenstelle,kostenstellen.id,personal.name,personal.vorname,gerate.geraet,laenge",
+                      . " AND date_part('year', datum) = " . $_SESSION['overview_kosten.year'],
              'select' => array(
                                'title' => 'Auswahl',
                                'options' => discover_years(),
@@ -65,6 +64,12 @@ $mask = array(
                                            'width' => 250,
                                            'specs' => "filterUI: 's'",
                                            ),
+                             'arbeitsart' => array(
+                                           'name' => 'Arbeiten',
+                                           'sql' => "arbeitsarten.arbeitsart",
+                                           'width' => 250,
+                                           'specs' => "filterUI: 's'",
+                                           ),
                              'personal' => array(
                                            'name' => 'Mitarbeiter',
                                            'sql' => "personal.name || ', ' || personal.vorname",
@@ -88,31 +93,31 @@ $mask = array(
                                            'type' => 'number',
                                            'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: '&nbsp;', canSort: false",
                                            'width' => 90,
-                                           'sql' => 'sum(einsatzpersonal.stunden * personal.persstdsatz)',
+                                           'sql' => 'einsatzpersonal.stunden * personal.persstdsatz',
                                            ),
                              'geraetkosten' => array(
                                            'name' => 'Ger├Ątkosten',
                                            'type' => 'number',
                                            'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: '&nbsp;', canSort: false",
                                            'width' => 90,
-                                           'sql' => 'sum(einsatzgeraete.stunden * gerate.geraetkst_intern + ' .
-                                                    'einsatzgeraete.stunden * anbaugeraete.anbkst_intern)',
+                                           'sql' => 'einsatzgeraete.stunden * gerate.geraetkst_intern + ' .
+                                                    'einsatzgeraete.stunden * anbaugeraete.anbkst_intern',
                                            ),
                              'gesamtkosten' => array(
                                            'name' => 'Gesamtkosten',
                                            'type' => 'number',
                                            'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: '&nbsp;', canSort: false",
                                            'width' => 90,
-                                           'sql' => 'sum(einsatzpersonal.stunden * personal.persstdsatz + ' . 
+                                           'sql' => 'einsatzpersonal.stunden * personal.persstdsatz + ' . 
                                                     'einsatzgeraete.stunden * gerate.geraetkst_intern + ' .
-                                                    'einsatzgeraete.stunden * anbaugeraete.anbkst_intern)',
+                                                    'einsatzgeraete.stunden * anbaugeraete.anbkst_intern',
                                            ),
                              'prolfdm' => array(
                                            'name' => 'pro lfdm',
                                            'type' => 'number',
                                            'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: '&nbsp;', canSort: false",
                                            'width' => 60,
-                                           'sql' => 'sum(einsatzpersonal.stunden * personal.persstdsatz + ' . 
+                                           'sql' => '(einsatzpersonal.stunden * personal.persstdsatz + ' . 
                                                     'einsatzgeraete.stunden * gerate.geraetkst_intern + ' .
                                                     'einsatzgeraete.stunden * anbaugeraete.anbkst_intern) / laenge',
                                            ),