X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryPlan.pm;h=ff17464cc316837d7e6fc2cc65ca80427460025d;hb=28cda5b67bc9cef793911fa4e65b6aa9b81903e3;hp=a7ed85e10810ea6d247659398b1ceabd10bc9ac8;hpb=b213d89c9bb929cbebda13388284bd442f6f8aa2;p=kivitendo-erp.git diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm index a7ed85e10..ff17464cc 100644 --- a/SL/Controller/DeliveryPlan.pm +++ b/SL/Controller/DeliveryPlan.pm @@ -5,23 +5,51 @@ 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::Sorted; use SL::Controller::Helper::ParseFilter; use SL::Controller::Helper::ReportGenerator; +use Rose::Object::MakeMethods::Generic ( + scalar => [ qw(db_args flat_filter) ], +); + __PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); }); +__PACKAGE__->get_models_url_params('flat_filter'); +__PACKAGE__->make_paginated( + MODEL => 'OrderItem', + PAGINATE_ARGS => 'db_args', + ONLY => [ qw(list) ], +); + +__PACKAGE__->make_sorted( + MODEL => 'OrderItem', + ONLY => [ qw(list) ], + + DEFAULT_BY => 'reqdate', + DEFAULT_DIR => 1, + + reqdate => 'Reqdate', + description => 'Description', + partnumber => 'Part Number', + qty => 'Qty', + missing => 'Missing qty', + shipped_qty => 'shipped', + ordnumber => 'Order', + customer => 'Customer', +); + 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->{flat_filter} = { map { $_->{key} => $_->{value} } $::form->flatten_variables('filter') }; + $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 }); @@ -32,13 +60,10 @@ sub action_list { raw_bottom_info_text => $bottom, controller_class => 'DeliveryPlan', }, - report_generator_export_options => [ - 'list', qw(filter sort_by sort_dir), - ], - db_args => $db_args, + report_generator_export_options => [ qw(list filter sort_by sort_dir) ], ); - $self->{orderitems} = SL::DB::Manager::OrderItem->get_all(%$db_args); + $self->{orderitems} = $self->get_models(%{ $self->db_args }); $self->list_objects; } @@ -54,8 +79,6 @@ sub setup_for_list { with_objects => [ 'order', 'order.customer', 'part' ], launder_to => $self->{filter}, ), - sort_by => $self->set_sort_params(%params), - page => $params{page}, ); $args{query} = [ @{ $args{query} || [] }, @@ -115,14 +138,6 @@ sub setup_for_list { return \%args; } -sub set_sort_params { - my ($self, %params) = @_; - my $sort_str; - ($self->{sort_by}, $self->{sort_dir}, $sort_str) = - SL::DB::Manager::OrderItem->make_sort_string(%params); - return $sort_str; -} - sub prepare_report { my ($self, %params) = @_; @@ -135,34 +150,29 @@ sub prepare_report { my @sortable = qw(reqdate partnumber description ordnumber customer); my %column_defs = ( - reqdate => { text => $::locale->text('Reqdate'), - sub => sub { $_[0]->reqdate_as_date || $_[0]->order->reqdate_as_date }}, - description => { text => $::locale->text('Description'), - sub => sub { $_[0]->description }, - obj_link => sub { $self->link_to($_[0]->part) }}, - partnumber => { text => $::locale->text('Part Number'), - sub => sub { $_[0]->part->partnumber }, - obj_link => sub { $self->link_to($_[0]->part) }}, - qty => { text => $::locale->text('Qty'), - sub => sub { $_[0]->qty_as_number . ' ' . $_[0]->unit }}, - shipped_qty => { text => $::locale->text('shipped'), - sub => sub { $::form->format_amount(\%::myconfig, $_[0]->shipped_qty, 2) . ' ' . $_[0]->unit }}, - ordnumber => { text => $::locale->text('Order'), - sub => sub { $_[0]->order->ordnumber }, - obj_link => sub { $self->link_to($_[0]->order) }}, - customer => { text => $::locale->text('Customer'), - sub => sub { $_[0]->order->customer->name }, - obj_link => sub { $self->link_to($_[0]->order->customer) }}, + reqdate => { sub => sub { $_[0]->reqdate_as_date || $_[0]->order->reqdate_as_date }}, + description => { sub => sub { $_[0]->description }, + obj_link => sub { $self->link_to($_[0]->part) }}, + partnumber => { sub => sub { $_[0]->part->partnumber }, + obj_link => sub { $self->link_to($_[0]->part) }}, + qty => { sub => sub { $_[0]->qty_as_number . ' ' . $_[0]->unit }}, + missing => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->qty - $_[0]->shipped_qty, 2) . ' ' . $_[0]->unit }}, + shipped_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->shipped_qty, 2) . ' ' . $_[0]->unit }}, + ordnumber => { sub => sub { $_[0]->order->ordnumber }, + obj_link => sub { $self->link_to($_[0]->order) }}, + customer => { sub => sub { $_[0]->order->customer->name }, + obj_link => sub { $self->link_to($_[0]->order->customer) }}, ); + map { $column_defs{$_}->{text} = $::locale->text( $self->get_sort_spec->{$_}->{title} ) } keys %column_defs; + + my %current_sort_params = $self->get_current_sort_params; for my $col (@sortable) { - $column_defs{$col}{link} = $self->url_for( - action => 'list', + $column_defs{$col}{link} = $self->get_callback( + # TODO: column header links from helper sort_by => $col, - sort_dir => ($self->{sort_by} eq $col ? 1 - $self->{sort_dir} : $self->{sort_dir}), - page => $self->{pages}{cur}, - %{ $self->{flat_filter} }, + sort_dir => ($current_sort_params{by} eq $col ? 1 - $current_sort_params{dir} : $current_sort_params{dir}), ); } @@ -171,7 +181,7 @@ sub prepare_report { $report->set_columns(%column_defs); $report->set_column_order(@columns); $report->set_options(allow_pdf_export => 1, allow_csv_export => 1); - $report->set_sort_indicator(%params); + $report->set_sort_indicator($current_sort_params{by}, $current_sort_params{dir}); $report->set_export_options(@{ $params{report_generator_export_options} || [] }); $report->set_options( %{ $params{report_generator_options} || {} }, @@ -181,7 +191,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, @@ -210,6 +220,39 @@ sub list_objects { return $self->{report}->generate_with_headers; } +sub make_filter_summary { + my ($self) = @_; + + my $filter = $::form->{filter} || {}; + my @filter_strings; + + 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; +} + sub link_to { my ($self, $object, %params) = @_; @@ -252,16 +295,23 @@ sub _pre_parse_filter { push @{ $filter->{and} }, or => [ @part_filters ] if @part_filters; } - if ($filter->{'reqdate:date::le'}) { - $launder_to->{'reqdate_date__le'} = delete $filter->{'reqdate:date::le'}; - my $parsed_date = DateTime->from_lxoffice($launder_to->{'reqdate_date__le'}); - push @{ $filter->{and} }, or => [ - 'reqdate' => { le => $parsed_date }, - and => [ - 'reqdate' => undef, - 'order.reqdate' => { le => $parsed_date }, - ] - ] if $parsed_date; + for my $op (qw(le ge)) { + if ($filter->{"reqdate:date::$op"}) { + $launder_to->{"reqdate_date__$op"} = delete $filter->{"reqdate:date::$op"}; + my $parsed_date = DateTime->from_lxoffice($launder_to->{"reqdate_date__$op"}); + push @{ $filter->{and} }, or => [ + 'reqdate' => { $op => $parsed_date }, + and => [ + 'reqdate' => undef, + 'order.reqdate' => { $op => $parsed_date }, + ] + ] if $parsed_date; + } + } + + if (my $style = delete $filter->{searchstyle}) { + $self->{searchstyle} = $style; + $launder_to->{searchstyle} = $style; } return $filter;