Finanzcontrollingbericht: Filtern nach Projekttyp

diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm
index d44936d6726d9666747bcad9ec5f537dea99133b..988d619e2232ef5d5dd95d271de24dc05258826a 100644 (file)
--- a/SL/Controller/FinancialControllingReport.pm
+++ b/SL/Controller/FinancialControllingReport.pm
@@ -15,7 +15,7 @@ use SL::Controller::Helper::ReportGenerator;
 use SL::Locale::String;
 
 use Rose::Object::MakeMethods::Generic (
 use SL::Locale::String;
 
 use Rose::Object::MakeMethods::Generic (

-  scalar => [ qw(db_args flat_filter) ],
+  scalar => [ qw(db_args flat_filter project_types) ],

 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); });
 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); });


@@ -45,6 +45,8 @@ __PACKAGE__->make_sorted(
 sub action_list {
   my ($self) = @_;
 
 sub action_list {
   my ($self) = @_;
 

+  $self->project_types(SL::DB::Manager::ProjectType->get_all_sorted);
+

   $self->db_args($self->setup_db_args_for_list(filter => $::form->{filter}));
   $self->flat_filter({ map { $_->{key} => $_->{value} } $::form->flatten_variables('filter') });
   $self->make_filter_summary;
   $self->db_args($self->setup_db_args_for_list(filter => $::form->{filter}));
   $self->flat_filter({ map { $_->{key} => $_->{value} } $::form->flatten_variables('filter') });
   $self->make_filter_summary;

diff --git a/templates/webpages/financial_controlling_report/_filter.html b/templates/webpages/financial_controlling_report/_filter.html
index 0e93ce388b79dfb372840c07486ecd9b227e7770..95e7bd7ab60c86908e40daa2b8d9786e3a325e9f 100644 (file)
--- a/templates/webpages/financial_controlling_report/_filter.html
+++ b/templates/webpages/financial_controlling_report/_filter.html
@@ -26,6 +26,10 @@
    <th align="right">[% 'Project Number' | $T8 %]</th>
    <td>[% L.input_tag('filter.globalproject.projectnumber:substr::ilike', filter.globalproject.projectnumber_substr__ilike, size = 20) %]</td>
   </tr>
    <th align="right">[% 'Project Number' | $T8 %]</th>
    <td>[% L.input_tag('filter.globalproject.projectnumber:substr::ilike', filter.globalproject.projectnumber_substr__ilike, size = 20) %]</td>
   </tr>

+  <tr>
+   <th align="right">[% 'Project Type' | $T8 %]</th>
+   <td>[% L.select_tag('filter.globalproject.project_type_id', SELF.project_types, default=filter.globalproject.project_type_id, title_key='description', with_empty=1) %]</td>
+  </tr>

   <tr>
    <th align="right">[% 'Order Date' | $T8 %] [% 'From Date' | $T8 %]</th>
    <td>[% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge, cal_align = 'BR') %]</td>
   <tr>
    <th align="right">[% 'Order Date' | $T8 %] [% 'From Date' | $T8 %]</th>
    <td>[% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge, cal_align = 'BR') %]</td>