X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FManager%2FChart.pm;h=d70e7f939eaa115a01c58ad52d83d9ad678a75e7;hb=5349a1ed016ae603b39d73747eccc6792707db1c;hp=f7728aef18d4ac2d4e2f08da421ac44704bea4b4;hpb=bba2bff3e15b5e5d2852822f6e060166fe0c51fe;p=kivitendo-erp.git

diff --git a/SL/DB/Manager/Chart.pm b/SL/DB/Manager/Chart.pm
index f7728aef1..d70e7f939 100644
--- a/SL/DB/Manager/Chart.pm
+++ b/SL/DB/Manager/Chart.pm
@@ -6,13 +6,113 @@ use SL::DB::Helper::Manager;
 use base qw(SL::DB::Helper::Manager);
 
 use SL::DB::Helper::Sorted;
+use SL::DB::Helper::Paginated;
+use SL::DB::Helper::Filtered;
+use SL::MoreCommon qw(listify);
 use DateTime;
 use SL::DBUtils;
+use Data::Dumper;
 
 sub object_class { 'SL::DB::Chart' }
 
 __PACKAGE__->make_manager_methods;
 
+__PACKAGE__->add_filter_specs(
+  type => sub {
+    my ($key, $value) = @_;
+    return __PACKAGE__->type_filter($value);
+  },
+  category => sub {
+    my ($key, $value) = @_;
+    return __PACKAGE__->category_filter($value);
+  },
+  selected_category => sub {
+    my ($key, $value) = @_;
+    return __PACKAGE__->selected_category_filter($value);
+  },
+  all => sub {
+    my ($key, $value) = @_;
+    return or => [ map { $_ => $value } qw(accno description) ]
+  },
+  booked => sub {
+    my ($key, $value) = @_;
+    return __PACKAGE__->booked_filter($value);
+  },
+);
+
+sub booked_filter {
+  my ($class, $booked) = @_;
+
+  $booked //= 0;
+  my @filter;
+
+  if ( $booked ) {
+     push @filter, ( id => [ \"SELECT distinct chart_id FROM acc_trans" ] );
+  };
+
+  return @filter;
+}
+
+sub selected_category_filter {
+  my ($class, $selected_categories) = @_;
+
+  my @selected_categories = @$selected_categories;
+
+  # if no category is selected, there is no filter and thus all charts of all
+  # categories are displayed, which is what we want.
+
+  return (category => \@$selected_categories);
+}
+
+sub type_filter {
+  my ($class, $type) = @_;
+
+  # filter by link or several defined custom types
+  # special types:
+  # bank, guv, balance
+
+  return () unless $type;
+
+  if ('HASH' eq ref $type) {
+    # this is to make selection like type => { AR_paid => 1, AP_paid => 1 } work
+    $type = [ grep { $type->{$_} } keys %$type ];
+  }
+
+  my @types = grep { $_ } listify($type);
+  my @filter;
+
+  for my $type (@types) {
+    if ( $type eq 'bank' ) {
+     push @filter, ( id => [ \"SELECT chart_id FROM bank_accounts" ] );
+    } elsif ( $type eq 'guv' ) {
+     push @filter, ( category => [ 'I', 'E' ] );
+    } elsif ( $type eq 'balance' ) {
+     push @filter, ( category => [ 'A', 'Q', 'L' ] );
+    } else {
+      push @filter, $class->link_filter($type);
+    };
+  };
+
+  return @filter > 2 ? (or => \@filter) : @filter;
+}
+
+sub category_filter {
+  my ($class, $category) = @_;
+
+  return () unless $category;
+
+  # filter for chart_picker if a category filter was passed via params
+
+  if ( ref $category eq 'HASH' ) {
+    # this is to make a selection like category => { I => 1, E => 1 } work
+    $category = [ grep { $category->{$_} } keys %$category ];
+  }
+
+  my @categories = grep { $_ } listify($category);
+
+  return (category => \@categories);
+}
+
 sub link_filter {
   my ($class, $link) = @_;
 
@@ -35,7 +135,7 @@ sub cache_taxkeys {
   my $rows = selectall_hashref_query($::form, $::form->get_standard_dbh, <<"", $date);
     SELECT DISTINCT ON (chart_id) chart_id, startdate, id
     FROM taxkeys
-    WHERE startdate < ?
+    WHERE startdate <= ?
     ORDER BY chart_id, startdate DESC;
 
   for (@$rows) {
@@ -43,6 +143,16 @@ sub cache_taxkeys {
   }
 }
 
+sub _sort_spec {
+  (
+    default  => [ 'accno', 1 ],
+    # columns  => {
+    #   SIMPLE => 'ALL',
+    # },
+    nulls    => {},
+  );
+}
+
 1;
 
 __END__
@@ -77,4 +187,6 @@ Nothing here yet.
 
 Moritz Bunkus E<lt>m.bunkus@linet-services.deE<gt>
 
+G. Richardson E<lt>information@kivitendo-premium.deE<gt>
+
 =cut