X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FRequirementSpec.pm;h=6694ce38dc45aba8f2af1420a5994be2f8a5b3b8;hb=83b3c64ecfdbcd1c3dc1e1586af1260bc0917aeb;hp=2f31f97a83085e14490fb0e5457d863a53a37d3c;hpb=8b4ff253e3498121df023a65bc502d5e099b15e8;p=kivitendo-erp.git diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm index 2f31f97a8..6694ce38d 100644 --- a/SL/Controller/RequirementSpec.pm +++ b/SL/Controller/RequirementSpec.pm @@ -10,10 +10,6 @@ use File::Spec (); use SL::ClientJS; use SL::Common (); use SL::Controller::Helper::GetModels; -use SL::Controller::Helper::Filtered; -use SL::Controller::Helper::Paginated; -use SL::Controller::Helper::Sorted; -use SL::Controller::Helper::ParseFilter; use SL::Controller::Helper::ReportGenerator; use SL::Controller::Helper::RequirementSpec; use SL::DB::Customer; @@ -33,26 +29,13 @@ use Rose::Object::MakeMethods::Generic ( scalar => [ qw(requirement_spec_item visible_item visible_section) ], 'scalar --get_set_init' => [ qw(requirement_spec customers types statuses complexities risks projects project_types project_statuses default_project_type default_project_status copy_source js - current_text_block_output_position) ], + current_text_block_output_position models time_based_units) ], ); __PACKAGE__->run_before('setup'); +__PACKAGE__->run_before('set_default_filter_args', only => [ qw(list) ]); -__PACKAGE__->make_filtered( - MODEL => 'RequirementSpec', - LAUNDER_TO => 'filter' -); -__PACKAGE__->make_paginated( - MODEL => 'RequirementSpec', - ONLY => [ qw(list) ], -); -__PACKAGE__->make_sorted( - MODEL => 'RequirementSpec', - ONLY => [ qw(list) ], - - DEFAULT_BY => 'customer', - DEFAULT_DIR => 1, - +my %sort_columns = ( customer => t8('Customer'), title => t8('Title'), type => t8('Requirement Spec Type'), @@ -70,17 +53,8 @@ __PACKAGE__->make_sorted( sub action_list { my ($self) = @_; - my $requirement_specs = $self->get_models( - query => [ - and => [ - working_copy_id => undef, - is_template => $::form->{is_template} ? 1 : 0, - ]], - with_objects => [ 'customer', 'type', 'status', 'project' ], - ); - $self->prepare_report; - $self->report_generator_list_objects(report => $self->{report}, objects => $requirement_specs); + $self->report_generator_list_objects(report => $self->{report}, objects => $self->models->get); } sub action_new { @@ -89,7 +63,7 @@ sub action_new { $self->requirement_spec(SL::DB::RequirementSpec->new(is_template => $::form->{is_template})); if ($self->copy_source) { - $self->requirement_spec->$_($self->copy_source->$_) for qw(type_id status_id customer_id title hourly_rate) + $self->requirement_spec->$_($self->copy_source->$_) for qw(type_id status_id customer_id title hourly_rate is_template) } $self->render('requirement_spec/new', title => $self->requirement_spec->is_template ? t8('Create a new requirement spec template') : t8('Create a new requirement spec')); @@ -181,7 +155,7 @@ sub action_show { my ($self) = @_; my $title = $self->requirement_spec->is_template ? t8('Show requirement spec template') : t8('Show requirement spec'); - my $item = $::form->{requirement_spec_item_id} ? SL::DB::RequirementSpecItem->new(id => $::form->{requirement_spec_item_id})->load : @{ $self->requirement_spec->sections }[0]; + my $item = $::form->{requirement_spec_item_id} ? SL::DB::RequirementSpecItem->new(id => $::form->{requirement_spec_item_id})->load : @{ $self->requirement_spec->sections_sorted }[0]; $self->requirement_spec_item($item); $self->render('requirement_spec/show', title => $title); @@ -260,7 +234,10 @@ sub action_create_pdf { sub action_select_template_to_paste { my ($self) = @_; - my @templates = grep { @{ $_->sections } || @{ $_->text_blocks } } @{ SL::DB::Manager::RequirementSpec->get_all(where => [ is_template => 1 ], sort_by => 'lower(title)') }; + my @templates = @{ SL::DB::Manager::RequirementSpec->get_all( + where => [ is_template => 1, SL::DB::Manager::RequirementSpec->not_empty_filter ], + sort_by => 'lower(requirement_specs.title)', + ) }; $self->render('requirement_spec/select_template_to_paste', { layout => 0 }, TEMPLATES => \@templates); } @@ -279,9 +256,42 @@ sub action_paste_template { $self->render_first_pasted_section_as_list($result{sections}->[0]); } + my $parts_list = $self->render('requirement_spec_part/show', { output => 0 }); + $self->js + ->replaceWith('#additional_parts_list_container', $parts_list) + ->show( '#additional_parts_list_container') + ->remove( '#additional_parts_form_container'); + $self->invalidate_version->render($self); } +sub action_renumber_sections { + my ($self) = @_; + + my %numbers = map { ($_ => 1) } qw(section function_block); + my %formats = map { my $method = "${_}_number_format"; ($_ => $self->requirement_spec->type->$method) } qw(section function_block); + my @items = @{ $self->requirement_spec->sections_sorted }; + + $self->requirement_spec->db->with_transaction(sub { + while (@items) { + my $item = shift @items; + my $type = $item->parent_id ? 'function_block' : 'section'; + + $item->update_attributes(fb_number => SL::PrefixedNumber->new(number => $formats{$type} || 0)->set_to($numbers{$type})); + + $numbers{$type}++; + + unshift @items, @{ $item->children_sorted }; + } + + $self->requirement_spec->invalidate_version unless $self->requirement_spec->is_template; + + 1; + }); + + $self->redirect_to(action => 'show', id => $self->requirement_spec->id); +} + # # filters # @@ -291,7 +301,7 @@ sub setup { $::auth->assert('requirement_spec_edit'); $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec); - $::request->{layout}->use_javascript("${_}.js") for qw(jquery.jstree jquery/jquery.contextMenu jquery/jquery.hotkeys requirement_spec ckeditor/ckeditor ckeditor/adapters/jquery); + $::request->{layout}->use_javascript("${_}.js") for qw(jquery.jstree jquery/jquery.contextMenu jquery/jquery.hotkeys requirement_spec ckeditor/ckeditor ckeditor/adapters/jquery autocomplete_part); $self->init_visible_section; return 1; @@ -306,6 +316,7 @@ sub init_project_types { SL::DB::Manager::ProjectType->get_all_sorted sub init_projects { SL::DB::Manager::Project->get_all_sorted } sub init_risks { SL::DB::Manager::RequirementSpecRisk->get_all_sorted } sub init_statuses { SL::DB::Manager::RequirementSpecStatus->get_all_sorted } +sub init_time_based_units { SL::DB::Manager::Unit->time_based_units } sub init_types { SL::DB::Manager::RequirementSpecType->get_all_sorted } sub init_customers { @@ -395,10 +406,13 @@ sub create_or_update { sub prepare_report { my ($self) = @_; - my $callback = $self->get_callback; - my $is_template = $::form->{is_template}; my $report = SL::ReportGenerator->new(\%::myconfig, $::form); + + $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i; + $self->models->finalize; # for filter laundering + my $callback = $self->models->get_callback; + $self->{report} = $report; my @columns = $is_template ? qw(title mtime) : qw(title customer status type projectnumber mtime version); @@ -422,14 +436,14 @@ sub prepare_report { ); } - map { $column_defs{$_}->{text} ||= $::locale->text( $self->get_sort_spec->{$_}->{title} ) } keys %column_defs; + map { $column_defs{$_}->{text} ||= $::locale->text( $self->models->get_sort_spec->{$_}->{title} ) } keys %column_defs; $report->set_options( std_column_visibility => 1, controller_class => 'RequirementSpec', output_format => 'HTML', raw_top_info_text => $self->render('requirement_spec/report_top', { output => 0 }, is_template => $is_template), - raw_bottom_info_text => $self->render('requirement_spec/report_bottom', { output => 0 }), + raw_bottom_info_text => $self->render('requirement_spec/report_bottom', { output => 0 }, models => $self->models), title => $is_template ? t8('Requirement Spec Templates') : t8('Requirement Specs'), allow_pdf_export => 1, allow_csv_export => 1, @@ -438,9 +452,7 @@ sub prepare_report { $report->set_column_order(@columns); $report->set_export_options(qw(list filter)); $report->set_options_from_form; - $self->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable); - - $self->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i; + $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable); } sub invalidate_version { @@ -472,6 +484,18 @@ sub render_pasted_text_block { ->jstree->open_node( '#tree', "#tb-${front_back}"); } +sub set_default_filter_args { + my ($self) = @_; + + if (!$::form->{filter} && !$::form->{is_template}) { + $::form->{filter} = { + status_id => [ map { $_->{id} } grep { $_->name ne 'done' } @{ $self->statuses } ], + }; + } + + return 1; +} + sub render_pasted_section { my ($self, $item, $parent_id) = @_; @@ -567,4 +591,26 @@ sub update_project_link_create { ->render($self); } +sub init_models { + my ($self) = @_; + + SL::Controller::Helper::GetModels->new( + controller => $self, + sorted => { + _default => { + by => 'customer', + dir => 1, + }, + %sort_columns, + }, + query => [ + and => [ + working_copy_id => undef, + is_template => $::form->{is_template} ? 1 : 0, + ], + ], + with_objects => [ 'customer', 'type', 'status', 'project' ], + ); +} + 1;