Projekt-Picker: Stil der Beschreibung angeben können

[mfinanz.git] / SL / Controller / TimeRecording.pm

diff --git a/SL/Controller/TimeRecording.pm b/SL/Controller/TimeRecording.pm
index 84f1814bd2f4d4342f0876a9b0de43467161cb4d..45c58cd44ba2dd842ee7b013837a672ac704924c 100644 (file)
--- a/SL/Controller/TimeRecording.pm
+++ b/SL/Controller/TimeRecording.pm
@@ -165,7 +165,7 @@ sub init_time_recording {
   my %attributes = %{ $::form->{time_recording} || {} };
 
   if ($self->use_duration) {
-    if ($::form->{duration_h} || $::form->{duration_m}) {
+    if (exists $::form->{duration_h} || exists $::form->{duration_m}) {
       $attributes{duration} = _round_number(_parse_number($::form->{duration_h}) * 60 + _parse_number($::form->{duration_m}), 0);
     }
 
@@ -184,10 +184,10 @@ sub init_time_recording {
   }
 
   # do not overwrite staff member if you do not have the right
-  delete $attributes{staff_member_id} if !$_[0]->can_edit_all;
-  $attributes{staff_member_id} = SL::DB::Manager::Employee->current->id if $is_new;
+  delete $attributes{staff_member_id}                                     if !$_[0]->can_edit_all;
+  $attributes{staff_member_id} ||= SL::DB::Manager::Employee->current->id if $is_new;
 
-  $attributes{employee_id}     = SL::DB::Manager::Employee->current->id;
+  $attributes{employee_id}       = SL::DB::Manager::Employee->current->id;
 
   $time_recording->assign_attributes(%attributes);
 
@@ -321,13 +321,17 @@ sub make_filter_summary {
   my $filter = $::form->{filter} || {};
   my @filter_strings;
 
-  my $staff_member = $filter->{staff_member_id} ? SL::DB::Employee->new(id => $filter->{staff_member_id})->load->safe_name : '';
+  my $staff_member = $filter->{staff_member_id} ? SL::DB::Employee->new(id => $filter->{staff_member_id})->load->safe_name        : '';
+  my $project      = $filter->{project_id}      ? SL::DB::Project->new (id => $filter->{project_id})     ->load->displayable_name : '';
 
   my @filters = (
-    [ $filter->{"date:date::ge"},                              t8('From Date')      ],
-    [ $filter->{"date:date::le"},                              t8('To Date')        ],
+    [ $filter->{"date:date::ge"},                              t8('From Date')       ],
+    [ $filter->{"date:date::le"},                              t8('To Date')         ],
     [ $filter->{"customer"}->{"name:substr::ilike"},           t8('Customer')        ],
     [ $filter->{"customer"}->{"customernumber:substr::ilike"}, t8('Customer Number') ],
+    [ $filter->{"order"}->{"ordnumber:substr::ilike"},         t8('Order Number')    ],
+    [ $project,                                                t8('Project')         ],
+    [ $filter->{"description:substr::ilike"},                  t8('Description')     ],
     [ $staff_member,                                           t8('Mitarbeiter')     ],
   );