X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRequirementSpec.pm;h=2a6413672362d36a72def5487f1491733bbb06db;hb=bdf33d885938c4f29c1e4b3198174deb5f3193b6;hp=b72a8c4b4e6110a6483b268e48cd2ad87846a8f7;hpb=f3aa68189371cfcbde72a40f4a909356e14e3c94;p=kivitendo-erp.git diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm index b72a8c4b4..2a6413672 100644 --- a/SL/Controller/RequirementSpec.pm +++ b/SL/Controller/RequirementSpec.pm @@ -25,8 +25,8 @@ use SL::Template::LaTeX; use Rose::Object::MakeMethods::Generic ( - scalar => [ qw(requirement_spec_item customers types statuses db_args flat_filter is_template visible_item visible_section) ], - 'scalar --get_set_init' => [ qw(requirement_spec complexities risks projects copy_source js) ], + scalar => [ qw(requirement_spec_item customers types statuses db_args flat_filter visible_item visible_section) ], + 'scalar --get_set_init' => [ qw(requirement_spec complexities risks projects copy_source js current_text_block_output_position) ], ); __PACKAGE__->run_before('setup'); @@ -77,35 +77,36 @@ sub action_list { sub action_new { my ($self) = @_; - $self->requirement_spec(SL::DB::RequirementSpec->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->render('requirement_spec/new', title => t8('Create a new requirement spec')); + $self->render('requirement_spec/new', title => $self->requirement_spec->is_template ? t8('Create a new requirement spec template') : t8('Create a new requirement spec')); } -sub action_ajax_edit { +sub action_ajax_show_basic_settings { my ($self) = @_; - $self->render('requirement_spec/_form', { layout => 0 }, submit_as => 'ajax'); + $self->render('requirement_spec/_show_basic_settings', { layout => 0 }); } -sub action_ajax_show_time_and_cost_estimate { +sub action_ajax_edit { my ($self) = @_; - $self->render('requirement_spec/_show_time_and_cost_estimate', { layout => 0 }); + my $html = $self->render('requirement_spec/_form', { output => 0 }, submit_as => 'ajax'); + + $self->js + ->hide('#basic_settings') + ->after('#basic_settings', $html) + ->render($self); } -sub action_ajax_cancel_time_and_cost_estimate { +sub action_ajax_show_time_and_cost_estimate { my ($self) = @_; - my $html = $self->render('requirement_spec/_show_time_and_cost_estimate', { output => 0 }); - - $self->js - ->replaceWith('#time_cost_estimate', $html) - ->render($self); + $self->render('requirement_spec/_show_time_and_cost_estimate', { layout => 0 }); } sub action_ajax_edit_time_and_cost_estimate { @@ -114,7 +115,9 @@ sub action_ajax_edit_time_and_cost_estimate { my $html = $self->render('requirement_spec/_edit_time_and_cost_estimate', { output => 0 }); $self->js - ->replaceWith('#time_cost_estimate', $html) + ->hide('#time_cost_estimate') + ->after('#time_cost_estimate', $html) + ->on('#time_cost_estimate INPUT[type=text]', 'keydown', 'kivi.requirement_spec.time_cost_estimate_input_key_down') ->render($self); } @@ -134,6 +137,8 @@ sub action_ajax_save_time_and_cost_estimate { 1; }); + $self->requirement_spec(SL::DB::RequirementSpec->new(id => $self->requirement_spec->id)->load); + my $html = $self->render('requirement_spec/_show_time_and_cost_estimate', { output => 0 }); $self->js->replaceWith('#time_cost_estimate', $html); @@ -148,10 +153,11 @@ sub action_ajax_save_time_and_cost_estimate { sub action_show { my ($self) = @_; - my $item = $::form->{requirement_spec_item_id} ? SL::DB::RequirementSpecItem->new(id => $::form->{requirement_spec_item_id})->load : @{ $self->requirement_spec->sections }[0]; + 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]; $self->requirement_spec_item($item); - $self->render('requirement_spec/show', title => t8('Show requirement spec')); + $self->render('requirement_spec/show', title => $title); } sub action_create { @@ -210,6 +216,31 @@ sub action_create_pdf { unlink $result{file_name}; } +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)') }; + $self->render('requirement_spec/select_template_to_paste', { layout => 0 }, TEMPLATES => \@templates); +} + +sub action_paste_template { + my ($self, %params) = @_; + + my $template = SL::DB::RequirementSpec->new(id => $::form->{template_id})->load; + my %result = $self->requirement_spec->paste_template($template); + + return $self->js->error($self->requirement_spec->error)->render($self) if !%result; + + $self->render_pasted_text_block($_) for sort { $a->position <=> $b->position } @{ $result{text_blocks} }; + $self->render_pasted_section($_) for sort { $a->position <=> $b->position } @{ $result{sections} }; + + if (@{ $result{sections} } && (($::form->{current_content_type} || 'sections') eq 'sections') && !$::form->{current_content_id}) { + $self->render_first_pasted_section_as_list($result{sections}->[0]); + } + + $self->invalidate_version->render($self); +} + # # filters # @@ -220,7 +251,6 @@ sub setup { $::auth->assert('sales_quotation_edit'); $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec); $::request->{layout}->use_javascript("${_}.js") for qw(jquery.jstree jquery/jquery.contextMenu client_js requirement_spec); - $self->is_template($::form->{is_template} ? 1 : 0); $self->init_visible_section; return 1; @@ -256,6 +286,11 @@ sub init_js { $self->js(SL::ClientJS->new); } +sub init_current_text_block_output_position { + my ($self) = @_; + $self->current_text_block_output_position($::form->{current_content_type} !~ m/^(?:text-blocks|tb)-(front|back)/ ? -1 : $1 eq 'front' ? 0 : 1); +} + sub load_select_options { my ($self) = @_; @@ -275,10 +310,14 @@ sub create_or_update { my $self = shift; my $is_new = !$self->requirement_spec->id; my $params = delete($::form->{requirement_spec}) || { }; - my $title = $is_new ? t8('Create a new requirement spec') : t8('Edit requirement spec'); $self->requirement_spec->assign_attributes(%{ $params }); + 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') + : t8('Edit requirement spec'); + my @errors = $self->requirement_spec->validate; if (@errors) { @@ -306,15 +345,20 @@ sub create_or_update { return $self->render('requirement_spec/new', title => $title); } + my $info = $self->requirement_spec->is_template ? t8('The requirement spec template has been saved.') : t8('The requirement spec has been saved.'); + if ($::request->is_ajax) { - my $html = $self->render('requirement_spec/_header', { output => 0 }); + my $header_html = $self->render('requirement_spec/_header', { output => 0 }); + my $basics_html = $self->render('requirement_spec/_show_basic_settings', { output => 0 }); return $self->invalidate_version - ->replaceWith('#requirement-spec-header', $html) - ->flash('info', t8('The requirement spec has been saved.')) + ->replaceWith('#requirement-spec-header', $header_html) + ->replaceWith('#basic_settings', $basics_html) + ->remove('#basic_settings_form') + ->flash('info', $info) ->render($self); } - flash_later('info', $is_new ? t8('The requirement spec has been created.') : t8('The requirement spec has been saved.')); + flash_later('info', $info); $self->redirect_to(action => 'show', id => $self->requirement_spec->id); } @@ -332,7 +376,7 @@ sub setup_db_args_from_filter { and => [ @{ $args{where} || [] }, working_copy_id => undef, - is_template => $self->is_template + is_template => $::form->{is_template} ? 1 : 0, ]]; $self->db_args(\%args); @@ -343,33 +387,40 @@ sub prepare_report { my $callback = $self->get_callback; + my $is_template = $::form->{is_template}; my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $self->{report} = $report; - my @columns = qw(title customer status type projectnumber mtime version); - my @sortable = qw(title customer status type projectnumber mtime); + my @columns = $is_template ? qw(title mtime) : qw(title customer status type projectnumber mtime version); + my @sortable = $is_template ? qw(title mtime) : qw(title customer status type projectnumber mtime); my %column_defs = ( title => { obj_link => sub { $self->url_for(action => 'show', id => $_[0]->id, callback => $callback) } }, - customer => { raw_data => sub { $self->presenter->customer($_[0]->customer, display => 'table-cell', callback => $callback) }, - sub => sub { $_[0]->customer->name } }, - projectnumber => { raw_data => sub { $self->presenter->project($_[0]->project, display => 'table-cell', callback => $callback) }, - sub => sub { $_[0]->project_id ? $_[0]->project->projectnumber : '' } }, - status => { sub => sub { $_[0]->status->description } }, - type => { sub => sub { $_[0]->type->description } }, - version => { sub => sub { $_[0]->version_id ? $_[0]->version->version_number : t8('Working copy without version') } }, - mtime => { sub => sub { $_[0]->mtime->to_kivitendo(precision => 'minute') } }, + mtime => { sub => sub { ($_[0]->mtime || $_[0]->itime)->to_kivitendo(precision => 'minute') } }, ); + if (!$is_template) { + %column_defs = ( + %column_defs, + customer => { raw_data => sub { $self->presenter->customer($_[0]->customer, display => 'table-cell', callback => $callback) }, + sub => sub { $_[0]->customer->name } }, + projectnumber => { raw_data => sub { $self->presenter->project($_[0]->project, display => 'table-cell', callback => $callback) }, + sub => sub { $_[0]->project_id ? $_[0]->project->projectnumber : '' } }, + status => { sub => sub { $_[0]->status->description } }, + type => { sub => sub { $_[0]->type->description } }, + version => { sub => sub { $_[0]->version_id ? $_[0]->version->version_number : t8('Working copy without version') } }, + ); + } + map { $column_defs{$_}->{text} ||= $::locale->text( $self->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 }), + 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 }), - title => $::locale->text('Requirement Specs'), + title => $is_template ? t8('Requirement Spec Templates') : t8('Requirement Specs'), allow_pdf_export => 1, allow_csv_export => 1, ); @@ -386,11 +437,51 @@ sub invalidate_version { my ($self) = @_; my $rspec = SL::DB::RequirementSpec->new(id => $self->requirement_spec->id)->load; + return $self->js if $rspec->is_template; + $rspec->invalidate_version; my $html = $self->render('requirement_spec/_version', { output => 0 }, requirement_spec => $rspec); return $self->js->html('#requirement_spec_version', $html); } +sub render_pasted_text_block { + my ($self, $text_block, %params) = @_; + + if ($self->current_text_block_output_position == $text_block->output_position) { + my $html = $self->render('requirement_spec_text_block/_text_block', { output => 0 }, text_block => $text_block); + $self->js + ->appendTo($html, '#text-block-list') + ->hide('#text-block-list-empty'); + } + + my $node = $self->presenter->requirement_spec_text_block_jstree_data($text_block); + my $front_back = $text_block->output_position == 0 ? 'front' : 'back'; + $self->js + ->jstree->create_node('#tree', "#tb-${front_back}", 'last', $node) + ->jstree->open_node( '#tree', "#tb-${front_back}"); +} + +sub render_pasted_section { + my ($self, $item, $parent_id) = @_; + + my $node = $self->presenter->requirement_spec_item_jstree_data($item); + $self->js + ->jstree->create_node('#tree', $parent_id ? "#fb-${parent_id}" : '#sections', 'last', $node) + ->jstree->open_node( '#tree', $parent_id ? "#fb-${parent_id}" : '#sections'); + + $self->render_pasted_section($_, $item->id) for @{ $item->children_sorted }; +} + +sub render_first_pasted_section_as_list { + my ($self, $section, %params) = @_; + + my $html = $self->render('requirement_spec_item/_section', { output => 0 }, requirement_spec_item => $section); + $self->js + ->html('#column-content', $html) + ->val( '#current_content_type', $section->item_type) + ->val( '#current_content_id', $section->id) + ->jstree->select_node('#tree', '#fb-' . $section->id); +} 1;