X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRequirementSpecTextBlock.pm;h=264b83b5ac07b4d43f1a8a9fb373106103397418;hb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44;hp=34d4aec52b15284df15432d35c150982c45b73f3;hpb=603481b2eab49e4e70b43cc9cec269c426fffb9d;p=kivitendo-erp.git diff --git a/SL/Controller/RequirementSpecTextBlock.pm b/SL/Controller/RequirementSpecTextBlock.pm index 34d4aec52..264b83b5a 100644 --- a/SL/Controller/RequirementSpecTextBlock.pm +++ b/SL/Controller/RequirementSpecTextBlock.pm @@ -4,23 +4,29 @@ use strict; use parent qw(SL::Controller::Base); +use Carp; +use Params::Validate (); use Time::HiRes (); -use SL::ClientJS; use SL::Clipboard; +use SL::Controller::Helper::RequirementSpec; use SL::DB::RequirementSpec; +use SL::DB::RequirementSpecPicture; use SL::DB::RequirementSpecPredefinedText; use SL::DB::RequirementSpecTextBlock; use SL::Helper::Flash; use SL::Locale::String; +use constant SORTABLE_PICTURE_LIST => 'kivi.requirement_spec.make_text_block_picture_lists_sortable'; + use Rose::Object::MakeMethods::Generic ( scalar => [ qw(text_block) ], - 'scalar --get_set_init' => [ qw(predefined_texts js) ], + 'scalar --get_set_init' => [ qw(predefined_texts picture) ], ); -__PACKAGE__->run_before('load_requirement_spec_text_block', only => [qw(ajax_edit ajax_update ajax_delete ajax_flag dragged_and_dropped ajax_copy)]); +__PACKAGE__->run_before('check_auth'); +__PACKAGE__->run_before('load_requirement_spec_text_block', only => [qw(ajax_edit ajax_update ajax_delete ajax_flag dragged_and_dropped ajax_copy ajax_add_picture)]); # # actions @@ -42,17 +48,11 @@ sub action_ajax_list { # $::lxdebug->message(0, "cur $current_where new $new_where"); - if (!defined($current_where) || ($new_where != $current_where)) { - my $text_blocks = SL::DB::Manager::RequirementSpecTextBlock->get_all_sorted(where => [ output_position => $new_where, requirement_spec_id => $::form->{requirement_spec_id} ]); - my $html = $self->render('requirement_spec_text_block/ajax_list', { output => 0 }, TEXT_BLOCKS => $text_blocks, output_position => $new_where); - - $self->js - ->html('#column-content', $html) - ->val('#current_content_type', 'text-blocks-' . (0 == $new_where ? 'front' : 'back')) - ->val('#current_content_id', $::form->{clicked_id}); - } + $self->show_list(output_position => $new_where, id => $::form->{clicked_id}, set_type => 1) if ($new_where != ($current_where // -1)); - $self->render($self->js); + $self->js + ->run(SORTABLE_PICTURE_LIST()) + ->render($self); } sub action_ajax_add { @@ -61,39 +61,20 @@ sub action_ajax_add { my $current_where = $self->output_position_from_id($::form->{current_content_id}, $::form->{current_content_type}) // -1; my $new_where = $self->output_position_from_id($::form->{id}) // $::form->{output_position}; - if ($new_where != $current_where) { - my $text_blocks = SL::DB::Manager::RequirementSpecTextBlock->get_all_sorted(where => [ output_position => $new_where, requirement_spec_id => $::form->{requirement_spec_id} ]); - my $html = $self->render('requirement_spec_text_block/ajax_list', { output => 0 }, TEXT_BLOCKS => $text_blocks, output_position => $new_where); + $self->show_list(output_position => $new_where) if $new_where != $current_where; - $self->js->html('#column-content', $html); - } + $self->add_new_text_block_form(output_position => $new_where, insert_after_id => $::form->{id}, requirement_spec_id => $::form->{requirement_spec_id}); - $self->text_block(SL::DB::RequirementSpecTextBlock->new( - requirement_spec_id => $::form->{requirement_spec_id}, - output_position => $::form->{output_position}, - )); - - my $id_base = join('_', 'new_text_block', Time::HiRes::gettimeofday(), int rand 1000000000000); - my $html = $self->render('requirement_spec_text_block/_form', { output => 0 }, id_base => $id_base, insert_after => $::form->{id}); - - $self->invalidate_version - ->action($::form->{id} ? 'insertAfter' : 'appendTo', $html, '#text-block-' . ($::form->{id} || 'list')) - ->focus('#' . $id_base . '_title') - ->render($self); + $self->invalidate_version->render; } sub action_ajax_edit { my ($self) = @_; my $current_where = $self->output_position_from_id($::form->{current_content_id}, $::form->{current_content_type}) // -1; - if ($self->text_block->output_position != $current_where) { - my $text_blocks = $self->text_block->get_full_list; - my $html = $self->render('requirement_spec_text_block/ajax_list', { output => 0 }, TEXT_BLOCKS => $text_blocks, output_position => $self->text_block->output_position); - $self->js - ->html('#column-content', $html) - ->val('#current_content_type', 'text-block') - ->val('#current_content_id', $self->text_block->id); + if ($self->text_block->output_position != $current_where) { + $self->show_list(output_position => $self->text_block->output_position, id => $self->text_block->id, requirement_spec_id => $self->text_block->requirement_spec_id); } my $html = $self->render('requirement_spec_text_block/_form', { output => 0 }); @@ -104,6 +85,7 @@ sub action_ajax_edit { ->insertAfter($html, '#text-block-' . $self->text_block->id) ->jstree->select_node('#tree', '#tb-' . $self->text_block->id) ->focus('#edit_text_block_' . $self->text_block->id . '_title') + ->reinit_widgets ->render($self); } @@ -123,9 +105,13 @@ sub action_ajax_create { my $node = $self->presenter->requirement_spec_text_block_jstree_data($self->text_block); $self->invalidate_version + ->hide('#text-block-list-empty') ->replaceWith('#' . $::form->{form_prefix} . '_form', $html) + ->run(SORTABLE_PICTURE_LIST()) ->jstree->create_node('#tree', $insert_after ? ('#tb-' . $insert_after, 'after') : ('#tb-' . ($attributes->{output_position} == 0 ? 'front' : 'back'), 'last'), $node) - ->jstree->select_node('#tree', '#tb-' . $self->text_block->id) + ->jstree->select_node('#tree', '#tb-' . $self->text_block->id); + $self->add_new_text_block_form(output_position => $self->text_block->output_position, insert_after_id => $self->text_block->id, requirement_spec_id => $self->text_block->requirement_spec_id) + ->reinit_widgets ->render($self); } @@ -149,7 +135,11 @@ sub action_ajax_update { $self->invalidate_version ->remove('#' . $prefix . '_form') ->replaceWith('#text-block-' . $self->text_block->id, $html) + ->run(SORTABLE_PICTURE_LIST()) ->jstree->rename_node('#tree', '#tb-' . $self->text_block->id, $self->text_block->title) + ->prop('#tb-' . $self->text_block->id . ' a', 'title', $self->text_block->content_excerpt) + ->addClass('#tb-' . $self->text_block->id . ' a', 'tooltip') + ->reinit_widgets ->render($self); } @@ -203,7 +193,10 @@ sub action_dragged_and_dropped { # $::lxdebug->dump(0, "form", $::form); - return $self->invalidate_version->render($self) if $::form->{current_content_type} !~ m/^text-block/; + $self->invalidate_version + ->jstree->open_node('#tree', '#tb-' . (!$self->text_block->output_position ? 'front' : 'back')); + + return $self->js->render($self) if $::form->{current_content_type} !~ m/^text-block/; my $current_where = $self->output_position_from_id($::form->{current_content_id}, $::form->{current_content_type}) // -1; my $new_where = $self->text_block->output_position; @@ -213,12 +206,7 @@ sub action_dragged_and_dropped { if (($old_where != $new_where) && ($::form->{current_content_id} == $self->text_block->id)) { # The currently selected text block is dragged to the opposite # text block location. Re-render the whole content column. - my $text_blocks = SL::DB::Manager::RequirementSpecTextBlock->get_all_sorted(where => [ output_position => $new_where ]); - my $html = $self->render('requirement_spec_text_block/ajax_list', { output => 0 }, TEXT_BLOCKS => $text_blocks, output_position => $new_where); - - $self->js - ->val('#current_content_type', 'text-blocks-' . ($new_where == 0 ? 'front' : 'back')) - ->html('#column-content', $html); + $self->show_list(output_position => $new_where, id => $id); } else { if ($old_where == $current_where) { @@ -244,7 +232,8 @@ sub action_dragged_and_dropped { } } - $self->invalidate_version + $self->js + ->run(SORTABLE_PICTURE_LIST()) ->render($self); } @@ -258,13 +247,18 @@ sub action_ajax_copy { sub action_ajax_paste { my ($self, %params) = @_; - my $copied = SL::Clipboard->new->get_entry(qr/^RequirementSpecTextBlock$/); + my $copied = SL::Clipboard->new->get_entry(qr/^RequirementSpec(?:TextBlock|Picture)$/); if (!$copied) { return SL::ClientJS->new ->error(t8("The clipboard does not contain anything that can be pasted here.")) ->render($self); } + if (ref($copied) =~ m/Picture$/) { + $self->load_requirement_spec_text_block; + return $self->paste_picture($copied); + } + my $current_output_position = $self->output_position_from_id($::form->{current_content_id}, $::form->{current_content_type}); my $new_output_position = $::form->{id} ? $self->output_position_from_id($::form->{id}) : $::form->{output_position}; my $front_back = 0 == $new_output_position ? 'front' : 'back'; @@ -280,14 +274,135 @@ sub action_ajax_paste { my $node = $self->presenter->requirement_spec_text_block_jstree_data($self->text_block); $self->invalidate_version + ->run(SORTABLE_PICTURE_LIST()) ->jstree->create_node('#tree', $::form->{id} ? ('#tb-' . $::form->{id}, 'after') : ("#tb-${front_back}", 'last'), $node) ->render($self); } +# +# actions for pictures +# + +sub action_ajax_add_picture { + my ($self) = @_; + + $self->picture(SL::DB::RequirementSpecPicture->new); + $self->render('requirement_spec_text_block/_picture_form', { layout => 0 }); +} + +sub action_ajax_edit_picture { + my ($self) = @_; + + $self->text_block($self->picture->text_block); + $self->render('requirement_spec_text_block/_picture_form', { layout => 0 }); +} + +sub action_ajax_create_picture { + my ($self, %params) = @_; + + my $attributes = $::form->{ $::form->{form_prefix} } || die "Missing attributes"; + $attributes->{picture_file_name} = ((($::form->{ATTACHMENTS} || {})->{ $::form->{form_prefix} } || {})->{picture_content} || {})->{filename}; + my @errors = $self->picture(SL::DB::RequirementSpecPicture->new(%{ $attributes }))->validate; + + return $self->js->error(@errors)->render($self) if @errors; + + $self->picture->save; + + $self->text_block($self->picture->text_block); + my $html = $self->render('requirement_spec_text_block/_text_block_picture', { output => 0 }, picture => $self->picture); + + $self->invalidate_version + ->dialog->close('#jqueryui_popup_dialog') + ->append('#text-block-' . $self->text_block->id . '-pictures', $html) + ->show('#text-block-' . $self->text_block->id . '-pictures') + ->render($self); +} + +sub action_ajax_update_picture { + my ($self) = @_; + + my $attributes = $::form->{ $::form->{form_prefix} } || die "Missing attributes"; + + if (!$attributes->{picture_content}) { + delete $attributes->{picture_content}; + } else { + $attributes->{picture_file_name} = ((($::form->{ATTACHMENTS} || {})->{ $::form->{form_prefix} } || {})->{picture_content} || {})->{filename}; + } + + $self->picture->assign_attributes(%{ $attributes }); + my @errors = $self->picture->validate; + + return $self->js->error(@errors)->render($self) if @errors; + + $self->picture->save; + + $self->text_block($self->picture->text_block); + my $html = $self->render('requirement_spec_text_block/_text_block_picture', { output => 0 }, picture => $self->picture); + + $self->invalidate_version + ->dialog->close('#jqueryui_popup_dialog') + ->replaceWith('#text-block-picture-' . $self->picture->id, $html) + ->show('#text-block-' . $self->text_block->id . '-pictures') + ->render($self); +} + +sub action_ajax_delete_picture { + my ($self) = @_; + + $self->picture->delete; + $self->text_block(SL::DB::RequirementSpecTextBlock->new(id => $self->picture->text_block_id)->load); + + $self->invalidate_version + ->remove('#text-block-picture-' . $self->picture->id) + ->action_if(!@{ $self->text_block->pictures }, 'hide', '#text-block-' . $self->text_block->id . '-pictures') + ->render($self); +} + +sub action_ajax_download_picture { + my ($self) = @_; + + $self->send_file(\$self->picture->{picture_content}, type => $self->picture->picture_content_type, name => $self->picture->picture_file_name); +} + +sub action_ajax_copy_picture { + my ($self, %params) = @_; + + SL::Clipboard->new->copy($self->picture); + SL::ClientJS->new->render($self); +} + +sub action_ajax_paste_picture { + my ($self, %params) = @_; + + my $copied = SL::Clipboard->new->get_entry(qr/^RequirementSpecPicture$/); + if (!$copied) { + return SL::ClientJS->new + ->error(t8("The clipboard does not contain anything that can be pasted here.")) + ->render($self); + } + + $self->text_block($self->picture->text_block); # Save text block via the picture the user clicked on + + $self->paste_picture($copied); +} + +sub action_reorder_pictures { + my ($self) = @_; + + SL::DB::RequirementSpecPicture->reorder_list(@{ $::form->{picture_id} || [] }); + + $self->render(\'', { type => 'json' }); +} + # # filters # +sub check_auth { + my ($self) = @_; + $::auth->assert('requirement_spec_edit'); +} + sub load_requirement_spec_text_block { my ($self) = @_; $self->text_block(SL::DB::RequirementSpecTextBlock->new(id => $::form->{id})->load || die "No such requirement spec text block"); @@ -311,12 +426,11 @@ sub output_position_from_id { } sub init_predefined_texts { - return SL::DB::Manager::RequirementSpecPredefinedText->get_all_sorted; + return SL::DB::Manager::RequirementSpecPredefinedText->get_all_sorted(where => [ useable_for_text_blocks => 1 ]); } -sub init_js { - my ($self) = @_; - $self->js(SL::ClientJS->new); +sub init_picture { + return SL::DB::RequirementSpecPicture->new(id => $::form->{picture_id} || $::form->{id})->load; } sub invalidate_version { @@ -327,4 +441,63 @@ sub invalidate_version { return $self->js->html('#requirement_spec_version', $html); } +sub add_new_text_block_form { + my ($self, %params) = @_; + + croak "Missing parameter output_position" unless defined($params{output_position}) && ($params{output_position} ne ''); + croak "Missing parameter requirement_spec_id" unless $params{requirement_spec_id}; + + $self->text_block(SL::DB::RequirementSpecTextBlock->new( + requirement_spec_id => $params{requirement_spec_id}, + output_position => $params{output_position}, + )); + + my $id_base = join('_', 'new_text_block', Time::HiRes::gettimeofday(), int rand 1000000000000); + my $html = $self->render('requirement_spec_text_block/_form', { output => 0 }, id_base => $id_base, insert_after => $params{insert_after_id}); + + $self->js + ->action($params{insert_after_id} ? 'insertAfter' : 'appendTo', $html, '#text-block-' . ($params{insert_after_id} || 'list')) + ->reinit_widgets + ->focus('#' . $id_base . '_title'); +} + +sub show_list { + my $self = shift; + my %params = Params::Validate::validate(@_, { output_position => 1, id => 0, requirement_spec_id => 0, set_type => 0, }); + + $params{requirement_spec_id} ||= $::form->{requirement_spec_id}; + croak "Unknown requirement_spec_id" if !$params{requirement_spec_id}; + + my $text_blocks = SL::DB::Manager::RequirementSpecTextBlock->get_all_sorted(where => [ output_position => $params{output_position}, requirement_spec_id => $params{requirement_spec_id} ]); + my $html = $self->render('requirement_spec_text_block/ajax_list', { output => 0 }, TEXT_BLOCKS => $text_blocks, output_position => $params{output_position}); + + $self->js->html('#column-content', $html); + + $self->js->val('#current_content_type', 'text-blocks-' . (0 == $params{output_position} ? 'front' : 'back')) if $params{id} || $params{set_type}; + $self->js->val('#current_content_id', $params{id}) if $params{id}; + + return $self->set_function_blocks_tab_menu_class(class => 'text-block-context-menu'); +} + +sub paste_picture { + my ($self, $copied) = @_; + + if (!$self->text_block->db->do_transaction(sub { + 1; + $self->picture($copied->to_object)->save; # Create new picture from copied data and save + $self->text_block->add_pictures($self->picture); # Add new picture to text block + $self->text_block->save; + })) { + $::lxdebug->message(LXDebug::WARN(), "Error: " . $self->text_block->db->error); + return $self->js->error($::locale->text('Saving failed. Error message from the database: #1', $self->text_block->db->error))->render; + } + + my $html = $self->render('requirement_spec_text_block/_text_block_picture', { output => 0 }, picture => $self->picture); + + $self->invalidate_version + ->append('#text-block-' . $self->text_block->id . '-pictures', $html) + ->show('#text-block-' . $self->text_block->id . '-pictures') + ->render; +} + 1;