X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRequirementSpec.pm;h=1e3618112dd7351505868cd21a614723e63d2b18;hb=dac0c31d4a35ce06fba77bfa64d5b314ce92dcd0;hp=b389ba37319e29e44f3feda89b933c93e8ee1b47;hpb=1ae686100b75daf4590311ba74f8884f32df562e;p=kivitendo-erp.git diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm index b389ba373..1e3618112 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; @@ -25,6 +21,7 @@ use SL::DB::RequirementSpecRisk; use SL::DB::RequirementSpecStatus; use SL::DB::RequirementSpecType; use SL::DB::RequirementSpec; +use SL::Helper::CreatePDF qw(); use SL::Helper::Flash; use SL::Locale::String; use SL::Template::LaTeX; @@ -33,26 +30,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 html_template cvar_configs includeable_cvar_configs include_cvars) ], ); __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 +54,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 +64,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')); @@ -233,7 +208,7 @@ sub action_revert_to { my $version = $versioned_copy->versions->[0]; $version->update_attributes(working_copy_id => $self->requirement_spec->id); - flash_later('info', t8('The requirement spec has been reverted to version #1.', $self->requirement_spec->version->version_number)); + flash_later('info', t8('The requirement spec has been reverted to version #1.', $versioned_copy->version->version_number)); $self->js->redirect_to($self->url_for(action => 'show', id => $self->requirement_spec->id))->render($self); } @@ -257,10 +232,34 @@ sub action_create_pdf { unlink $result{file_name}; } +sub action_create_html { + my ($self, %params) = @_; + + my $base_name = $self->requirement_spec->type->template_file_name || 'requirement_spec'; + my @pictures = $self->prepare_pictures_for_printing; + my $content = SL::Helper::CreatePDF->create_parsed_file( + template => "${base_name}.html", + format => 'html', + template_type => 'HTML', + variables => { + SELF => $self, + rspec => $self->requirement_spec, + }); + + # $content is now a scalar of bytes, but $self->render() expects a + # scalar of characters. + $content = Encode::decode('utf-8', $content); + + $self->render(\$content, { layout => 0, process => 0 }); +} + 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 +278,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 +323,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 autocomplete_customer); $self->init_visible_section; return 1; @@ -306,7 +338,9 @@ 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_cvar_configs { SL::DB::Manager::CustomVariableConfig->get_all_sorted(where => [ module => 'RequirementSpecs' ]) } sub init_customers { my ($self) = @_; @@ -332,6 +366,17 @@ sub init_current_text_block_output_position { $self->current_text_block_output_position($::form->{current_content_type} !~ m/^(?:text-blocks|tb)-(front|back)/ ? -1 : $1 eq 'front' ? 0 : 1); } +sub init_includeable_cvar_configs { + my ($self) = @_; + return [ grep { $_->includeable } @{ $self->cvar_configs } ]; +} + +sub init_include_cvars { + my ($self) = @_; + return $::form->{include_cvars} if $::form->{include_cvars} && (ref($::form->{include_cvars}) eq 'HASH'); + return { map { ($_->name => ($_->includeable && $_->included_by_default)) } @{ $self->cvar_configs } }; +} + # # helpers # @@ -340,9 +385,24 @@ sub create_or_update { my $self = shift; my $is_new = !$self->requirement_spec->id; my $params = delete($::form->{requirement_spec}) || { }; + my $cvars = delete($::form->{cvars}) || { }; + + # Forcefully make it clear to Rose which custom_variables exist (or don't), so that the ones added with »add_custom_variables« are visible when calling »custom_variables«. + if ($is_new) { + $params->{custom_variables} = []; + } else { + $self->requirement_spec->custom_variables; + } $self->requirement_spec->assign_attributes(%{ $params }); + foreach my $var (@{ $self->requirement_spec->cvars_by_config }) { + my $value = $cvars->{ $var->config->name }; + $value = $::form->parse_amount(\%::myconfig, $value) if $var->config->type eq 'number'; + + $var->value($value); + } + my $title = $is_new && $self->requirement_spec->is_template ? t8('Create a new requirement spec template') : $is_new ? t8('Create a new requirement spec') : $self->requirement_spec->is_template ? t8('Edit requirement spec template') @@ -363,7 +423,7 @@ sub create_or_update { if ($self->copy_source) { $self->requirement_spec($self->copy_source->create_copy(%{ $params })); } else { - $self->requirement_spec->save; + $self->requirement_spec->save(cascade => 1); } })) { $::lxdebug->message(LXDebug::WARN(), "Error: " . $db->error); @@ -395,10 +455,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 +485,28 @@ sub prepare_report { ); } - map { $column_defs{$_}->{text} ||= $::locale->text( $self->get_sort_spec->{$_}->{title} ) } keys %column_defs; + $column_defs{$_}->{text} ||= $::locale->text( $self->models->get_sort_spec->{$_}->{title} ) for keys %column_defs; + + if (!$is_template) { + my %cvar_column_defs = map { + my $cfg = $_; + (('cvar_' . $cfg->name) => { + sub => sub { my $var = $_[0]->cvar_by_name($cfg->name); $var ? $var->value_as_text : '' }, + text => $cfg->description, + visible => $self->include_cvars->{ $cfg->name } ? 1 : 0, + }) + } @{ $self->includeable_cvar_configs }; + + push @columns, map { 'cvar_' . $_->name } @{ $self->includeable_cvar_configs }; + %column_defs = (%column_defs, %cvar_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 +515,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 +547,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 +654,33 @@ 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' ], + ); +} + +sub init_html_template { + my ($self) = @_; + my $base_name = $self->requirement_spec->type->template_file_name || 'requirement_spec'; + my $template = SL::Helper::CreatePDF->find_template(name => $base_name, extension => 'html'); + return !!$template; +} + 1;