DeliveryPlan-Controller auf Paginate-Controller-Helper umstellen

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

diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm
index b7e322640531f772d7117855b5e0114f59481b18..cc6ec4f7ead9b2551cc260f42444d48e863371d6 100644 (file)
--- a/SL/Controller/DeliveryPlan.pm
+++ b/SL/Controller/DeliveryPlan.pm
@@ -5,23 +5,43 @@ use parent qw(SL::Controller::Base);
 
 use Clone qw(clone);
 use SL::DB::OrderItem;
+use SL::Controller::Helper::GetModels;
+use SL::Controller::Helper::Paginated;
 use SL::Controller::Helper::ParseFilter;
 use SL::Controller::Helper::ReportGenerator;
 
+use Rose::Object::MakeMethods::Generic
+(
+  scalar => [ qw(db_args) ],
+);
+
 __PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); });
 
+__PACKAGE__->get_models_url_params(sub {
+  my ($self) = @_;
+  return (
+    %{ $self->{flat_filter} || {} },
+    sort_dir => $self->{sort_dir},
+    sort_by  => $self->{sort_by},
+  );
+});
+__PACKAGE__->make_paginated(
+  MODEL         => 'OrderItem',
+  PAGINATE_ARGS => 'db_args',
+  ONLY          => [ qw(list) ],
+);
+
 sub action_list {
   my ($self) = @_;
   my %list_params = (
     sort_by  => $::form->{sort_by} || 'reqdate',
     sort_dir => $::form->{sort_dir},
     filter   => $::form->{filter},
-    page     => $::form->{page},
   );
 
-  my $db_args = $self->setup_for_list(%list_params);
-  $self->{pages} = SL::DB::Manager::OrderItem->paginate(%list_params, args => $db_args);
+  $self->db_args($self->setup_for_list(%list_params));
   $self->{flat_filter} = { map { $_->{key} => $_->{value} } $::form->flatten_variables('filter') };
+  $self->make_filter_summary;
 
   my $top    = $::form->parse_html_template('delivery_plan/report_top', { FORM => $::form, SELF => $self });
   my $bottom = $::form->parse_html_template('delivery_plan/report_bottom', { SELF => $self });
@@ -35,10 +55,9 @@ sub action_list {
     report_generator_export_options => [
       'list', qw(filter sort_by sort_dir),
     ],
-    db_args => $db_args,
   );
 
-  $self->{orderitems} = SL::DB::Manager::OrderItem->get_all(%$db_args);
+  $self->{orderitems} = $self->get_models(%{ $self->db_args });
 
   $self->list_objects;
 }
@@ -55,7 +74,6 @@ sub setup_for_list {
       launder_to => $self->{filter},
     ),
     sort_by => $self->set_sort_params(%params),
-    page    => $params{page},
   );
 
   $args{query} = [ @{ $args{query} || [] },
@@ -159,12 +177,9 @@ sub prepare_report {
 
 
   for my $col (@sortable) {
-    $column_defs{$col}{link} = $self->url_for(
-      action   => 'list',
+    $column_defs{$col}{link} = $self->get_callback(
       sort_by  => $col,
       sort_dir => ($self->{sort_by} eq $col ? 1 - $self->{sort_dir} : $self->{sort_dir}),
-      page     => $self->{pages}{cur},
-      %{ $self->{flat_filter} },
     );
   }
 
@@ -183,7 +198,7 @@ sub prepare_report {
   );
   $report->set_options_from_form;
 
-  SL::DB::Manager::OrderItem->disable_paginating(args => $params{db_args}) if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
+  $self->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
 
   $self->{report_data} = {
     column_defs => \%column_defs,
@@ -215,9 +230,32 @@ sub list_objects {
 sub make_filter_summary {
   my ($self) = @_;
 
-  my $filter = $::form->{filter};
+  my $filter = $::form->{filter} || {};
   my @filter_strings;
-  push @filter_strings, $::locale->text('Search Style') . ' ' . ($filter->{searchstyle} eq 'open' ? $::locale->text('Search for undelivered parts') : $::locale->text('Search for delivered parts')) if $filter->{searchstyle} =~ /open|delivered/;
+
+  my @filters = (
+    [ $filter->{order}{"ordnumber:substr::ilike"}, $::locale->text('Number') ],
+    [ $filter->{part}{"partnumber:substr::ilike"}, $::locale->text('Part Number') ],
+    [ $filter->{"description:substr::ilike"}, $::locale->text('Part Description') ],
+    [ $filter->{"reqdate:date::ge"}, $::locale->text('Delivery Date') . " " . $::locale->text('From Date') ],
+    [ $filter->{"reqdate:date::le"}, $::locale->text('Delivery Date') . " " . $::locale->text('To Date') ],
+    [ $filter->{"qty:number"}, $::locale->text('Quantity') ],
+    [ $filter->{order}{customer}{"name:substr::ilike"}, $::locale->text('Customer') ],
+    [ $filter->{order}{customer}{"customernumber:substr::ilike"}, $::locale->text('Customer Number') ],
+  );
+
+  my @flags = (
+    [ $filter->{part}{type}{part}, $::locale->text('Parts') ],
+    [ $filter->{part}{type}{service}, $::locale->text('Services') ],
+    [ $filter->{part}{type}{assembly}, $::locale->text('Assemblies') ],
+  );
+
+  for (@flags) {
+    push @filter_strings, "$_->[1]" if $_->[0];
+  }
+  for (@filters) {
+    push @filter_strings, "$_->[1]: $_->[0]" if $_->[0];
+  }
 
   $self->{filter_summary} = join ', ', @filter_strings;
 }