Zeiterfassung: Bericht: Filter f. Auftragsnummer, Projekt und Beschreibung

[kivitendo-erp.git] / SL / Controller / TimeRecording.pm

diff --git a/SL/Controller/TimeRecording.pm b/SL/Controller/TimeRecording.pm
index aba6ff5..45c58cd 100644 (file)
--- a/SL/Controller/TimeRecording.pm
+++ b/SL/Controller/TimeRecording.pm
@@ -13,9 +13,11 @@ use SL::DB::Customer;
 use SL::DB::Employee;
 use SL::DB::Order;
 use SL::DB::Part;
+use SL::DB::Project;
 use SL::DB::TimeRecording;
 use SL::DB::TimeRecordingArticle;
 use SL::Helper::Flash qw(flash);
+use SL::Helper::Number qw(_round_number _parse_number);
 use SL::Helper::UserPreferences::TimeRecording;
 use SL::Locale::String qw(t8);
 use SL::ReportGenerator;
@@ -95,8 +97,8 @@ sub action_save {
   my ($self) = @_;
 
   if ($self->use_duration) {
-    $self->time_recording->start_date(undef);
-    $self->time_recording->end_date(undef);
+    $self->time_recording->start_time(undef);
+    $self->time_recording->end_time(undef);
   }
 
   my @errors = $self->time_recording->validate;
@@ -136,6 +138,22 @@ sub action_ajaj_get_order_info {
   $_[0]->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
 }
 
+sub action_ajaj_get_project_info {
+
+  my $project = SL::DB::Project->new(id => $::form->{id})->load;
+
+  my $data;
+  if ($project->customer_id) {
+    $data = { customer => { id    => $project->customer_id,
+                            value => $project->customer->displayable_name,
+                            type  => 'customer'
+                          },
+    };
+  }
+
+  $_[0]->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
+}
+
 sub init_time_recording {
   my ($self) = @_;
 
@@ -146,7 +164,12 @@ sub init_time_recording {
 
   my %attributes = %{ $::form->{time_recording} || {} };
 
-  if (!$self->use_duration) {
+  if ($self->use_duration) {
+    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);
+    }
+
+  } else {
     foreach my $type (qw(start end)) {
       if ($::form->{$type . '_date'}) {
         my $date = DateTime->from_kivitendo($::form->{$type . '_date'});
@@ -161,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);
 
@@ -214,8 +237,9 @@ sub init_all_time_recording_articles {
 }
 
 sub init_all_orders {
-  SL::DB::Manager::Order->get_all_sorted(query => [or             => [ closed => 0, closed => undef ],
-                                                   '!customer_id' => undef]);
+  my $orders = SL::DB::Manager::Order->get_all(query => [or             => [ closed => 0, closed => undef ],
+                                                         '!customer_id' => undef]);
+  return [ map { [$_->id, sprintf("%s %s", $_->number, $_->customervendor->name) ] } sort { $a->number <=> $b->number } @{$orders||[]} ];
 }
 
 sub init_use_duration {
@@ -297,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')     ],
   );