Zeiterfassung: Bericht: "gebucht" anzeigen und danach filtern können

diff --git a/SL/Controller/TimeRecording.pm b/SL/Controller/TimeRecording.pm
index 1e4ef45..92e5253 100644 (file)
--- a/SL/Controller/TimeRecording.pm
+++ b/SL/Controller/TimeRecording.pm
@@ -37,6 +37,7 @@ my %sort_columns = (
   description  => t8('Description'),
   staff_member => t8('Mitarbeiter'),
   duration     => t8('Duration'),
+  booked       => t8('Booked'),
 );
 
 #
@@ -194,7 +195,7 @@ sub prepare_report {
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 
-  my @columns  = qw(start_time end_time customer part project description staff_member duration);
+  my @columns  = qw(start_time end_time customer part project description staff_member duration booked);
 
   my %column_defs = (
     start_time   => { text => t8('Start'),        sub => sub { $_[0]->start_time_as_timestamp },
@@ -210,6 +211,7 @@ sub prepare_report {
     staff_member => { text => t8('Mitarbeiter'),  sub => sub { $_[0]->staff_member->safe_name } },
     duration     => { text => t8('Duration'),     sub => sub { $_[0]->duration_as_duration_string },
                       align => 'right'},
+    booked       => { text => t8('Booked'),       sub => sub { $_[0]->booked ? t8('Yes') : t8('No') } },
   );
 
   $report->set_options(

diff --git a/locale/de/all b/locale/de/all
index 5332f70..6f8153c 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -485,6 +485,7 @@ $self->{texts} = {
   'Bis Konto: '                 => 'bis Konto: ',
   'Body'                        => 'Text',
   'Body:'                       => 'Text:',
+  'Booked'                      => 'gebucht',
   'Booking group'               => 'Buchungsgruppe',
   'Booking group #1 needs a valid expense account' => 'Buchungsgruppe #1 braucht ein gültiges Aufwandskonto',
   'Booking group #1 needs a valid income account' => 'Buchungsgruppe #1 braucht ein gültiges Erfolgskonto',

diff --git a/locale/en/all b/locale/en/all
index 5d55a84..0078c5c 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -485,6 +485,7 @@ $self->{texts} = {
   'Bis Konto: '                 => '',
   'Body'                        => '',
   'Body:'                       => '',
+  'Booked'                      => '',
   'Booking group'               => '',
   'Booking group #1 needs a valid expense account' => '',
   'Booking group #1 needs a valid income account' => '',

diff --git a/templates/webpages/time_recording/_filter.html b/templates/webpages/time_recording/_filter.html
index b47b55d..f63d370 100644 (file)
--- a/templates/webpages/time_recording/_filter.html
+++ b/templates/webpages/time_recording/_filter.html
@@ -41,6 +41,11 @@
   </tr>
   [%- END -%]
 
+  <tr>
+    <th align="right">[% 'Booked' | $T8 %]</th>
+    <td>[% L.select_tag('filter.booked', [ [ '1', LxERP.t8('Yes') ], [ '0', LxERP.t8('No') ] ], default=filter.booked, with_empty=1, style="width: 200px") %]</td>
+  </tr>
+
  </table>
 
 [% L.hidden_tag('sort_by', FORM.sort_by) %]