From: Joey Schulze <joey@infodrom.org>
Date: Mon, 13 Dec 2010 11:24:55 +0000 (+0100)
Subject: Display Akkord and don't exclude vacation etc.
X-Git-Url: https://git.infodrom.org/?p=misc%2Fkostenrechnung;a=commitdiff_plain;h=bf9e5f4096d04b4ea6ed71f2a63df5f12db05487

Display Akkord and don't exclude vacation etc.
---

diff --git a/masks/overview_kosten.php b/masks/overview_kosten.php
index c3724cd..ffdb20a 100644
--- a/masks/overview_kosten.php
+++ b/masks/overview_kosten.php
@@ -24,8 +24,9 @@ $mask = array(
 			      'gebiet ON einsatz.gebiet = gebiet.id',
 			      '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'],
+#	      'where' => "arbeitsarten.arbeitsart <> 'Urlaub' AND arbeitsarten.arbeitsart <> 'Krank' AND arbeitsarten.arbeitsart <> 'Sonstige Fehltage'"
+#		       . " AND date_part('year', datum) = " . $_SESSION['overview_kosten.year'],
+	      'where' => "date_part('year', datum) = " . $_SESSION['overview_kosten.year'],
 	      'select' => array(
 				'title' => 'Auswahl',
 				'options' => discover_years(),
@@ -48,6 +49,12 @@ $mask = array(
 					    'type' => 'date',
 					    'width' => 70,
 					    ),
+			      'akkord' => array(
+					    'name' => 'Akkord',
+					    'control' => "new Rico.TableColumn.checkbox('1','0','0',true)",
+					    'width' => 50,
+					    'specs' => "ClassName: 'aligncenter'",
+					    ),
 			      'gebiet' => array(
 					    'name' => 'Gebiet',
 					    'sql' => "gebiet.gebiet",
diff --git a/masks/overview_stunden.php b/masks/overview_stunden.php
index a86a60e..440fae4 100644
--- a/masks/overview_stunden.php
+++ b/masks/overview_stunden.php
@@ -29,8 +29,9 @@ $mask = array(
 			      'LEFT gerate ON einsatzgeraete.geraet = gerate.id',
 			      'LEFT anbaugeraete ON einsatzgeraete.anbaugeraet = anbaugeraete.id',
 			      ),
-	      'where' => "arbeitsarten.arbeitsart <> 'Urlaub' AND arbeitsarten.arbeitsart <> 'Krank' AND arbeitsarten.arbeitsart <> 'Sonstige Fehltage'"
-		       . " AND date_part('year', datum) = " . $_SESSION['overview_stunden.year'],
+#	      'where' => "arbeitsarten.arbeitsart <> 'Urlaub' AND arbeitsarten.arbeitsart <> 'Krank' AND arbeitsarten.arbeitsart <> 'Sonstige Fehltage'"
+#		       . " AND date_part('year', datum) = " . $_SESSION['overview_stunden.year'],
+	      'where' => "date_part('year', datum) = " . $_SESSION['overview_stunden.year'],
 	      'select' => array(
 				'title' => 'Auswahl',
 				'options' => discover_years(),
@@ -53,6 +54,12 @@ $mask = array(
 					    'type' => 'date',
 					    'width' => 70,
 					    ),
+			      'akkord' => array(
+					    'name' => 'Akkord',
+					    'control' => "new Rico.TableColumn.checkbox('1','0','0',true)",
+					    'width' => 50,
+					    'specs' => "ClassName: 'aligncenter'",
+					    ),
 			      'gebiet' => array(
 					    'name' => 'Gebiet',
 					    'sql' => "gebiet.gebiet",