X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/8388c9bf9ba2e2a1fe5b49b4797ed74d1a42a1dc..4d050ca366a72bbdbcc3a0ef49b37867bee9eb59:/SL/Controller/RequirementSpec.pm?ds=sidebyside

diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm
index c7f4b5b1d..3fa13c0f5 100644
--- a/SL/Controller/RequirementSpec.pm
+++ b/SL/Controller/RequirementSpec.pm
@@ -5,7 +5,10 @@ use utf8;
 
 use parent qw(SL::Controller::Base);
 
+use File::Spec ();
+
 use SL::ClientJS;
+use SL::Common ();
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::Filtered;
 use SL::Controller::Helper::Paginated;
@@ -117,11 +120,14 @@ sub action_ajax_edit_time_and_cost_estimate {
   my ($self) = @_;
 
   my $html   = $self->render('requirement_spec/_edit_time_and_cost_estimate', { output => 0 });
+  my $first  = ($self->requirement_spec->sections_sorted || [])->[0];
+  $first     = ($first->children_sorted || [])->[0] if $first;
 
   $self->js
    ->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')
+   ->action_if($first && $first->id, 'focus', '#time_and_cost_estimate_form_complexity_id_' . $first->id)
    ->render($self);
 }
 
@@ -143,9 +149,12 @@ sub action_ajax_save_time_and_cost_estimate {
 
   $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)
-           ->remove('#time_cost_estimate_form_container');
+  my $html = $self->render('requirement_spec/_show_time_and_cost_estimate', { output => 0 }, initially_hidden => !!$::form->{keep_open});
+  $self->js->replaceWith('#time_cost_estimate', $html);
+
+  return $self->js->render($self) if $::form->{keep_open};
+
+  $self->js->remove('#time_cost_estimate_form_container');
 
   if ($self->visible_section) {
     $html = $self->render('requirement_spec_item/_section', { output => 0 }, requirement_spec_item => $self->visible_section);
@@ -208,8 +217,11 @@ sub action_create_pdf {
   my ($self, %params) = @_;
 
   my $base_name       = $self->requirement_spec->type->template_file_name || 'requirement_spec';
+  my @pictures        = $self->prepare_pictures_for_printing;
   my %result          = SL::Template::LaTeX->parse_and_create_pdf("${base_name}.tex", SELF => $self, rspec => $self->requirement_spec);
 
+  unlink @pictures unless ($::lx_office_conf{debug} || {})->{keep_temp_files};
+
   $::form->error(t8('Conversion to PDF failed: #1', $result{error})) if $result{error};
 
   my $attachment_name  =  $self->requirement_spec->type->description . ' ' . ($self->requirement_spec->working_copy_id || $self->requirement_spec->id);
@@ -255,7 +267,7 @@ 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);
+  $::request->{layout}->use_javascript("${_}.js")  for qw(jquery.jstree jquery/jquery.contextMenu jquery/jquery.hotkeys requirement_spec);
   $self->init_visible_section;
 
   return 1;
@@ -342,7 +354,7 @@ sub create_or_update {
     }
   })) {
     $::lxdebug->message(LXDebug::WARN(), "Error: " . $db->error);
-    @errors = ($::locale->text('Saving failed. Error message from the database: #1'), $db->error);
+    @errors = ($::locale->text('Saving failed. Error message from the database: #1', $db->error));
     return $self->js->error(@errors)->render($self) if $::request->is_ajax;
 
     $self->requirement_spec->id(undef) if $is_new;
@@ -469,4 +481,25 @@ sub render_first_pasted_section_as_list {
     ->jstree->select_node('#tree', '#fb-' . $section->id);
 }
 
+sub prepare_pictures_for_printing {
+  my ($self) = @_;
+
+  my @files;
+  my $userspath = File::Spec->rel2abs($::lx_office_conf{paths}->{userspath});
+  my $target    =  "${userspath}/kivitendo-print-requirement-spec-picture-" . Common::unique_id() . '-';
+
+  foreach my $picture (map { @{ $_->pictures } } @{ $self->requirement_spec->text_blocks }) {
+    my $output_file_name        = $target . $picture->id . '.' . $picture->get_default_file_name_extension;
+    $picture->{print_file_name} = File::Spec->abs2rel($output_file_name, $userspath);
+    my $out                     = IO::File->new($output_file_name, 'w') || die("Could not create file " . $output_file_name);
+    $out->binmode;
+    $out->print($picture->picture_content);
+    $out->close;
+
+    push @files, $output_file_name;
+  }
+
+  return @files;
+}
+
 1;