Pflichtenheftitems und Abschnitte bearbeiten

diff --git a/SL/Controller/RequirementSpecItem.pm b/SL/Controller/RequirementSpecItem.pm
index b90ec3da91d1b63bc2b491278aaca5be84f92bb0..f3cbd0878163b4b5c1870e9660fc6716a6ae788c 100644 (file)
--- a/SL/Controller/RequirementSpecItem.pm
+++ b/SL/Controller/RequirementSpecItem.pm
@@ -112,6 +112,12 @@ sub action_dragged_and_dropped {
   $self->render($js);
 }
 
   $self->render($js);
 }
 

+sub action_ajax_add {
+  my ($self, %params) = @_;
+
+  die "TODO: add action";
+}
+

 sub action_ajax_edit {
   my ($self, %params) = @_;
 
 sub action_ajax_edit {
   my ($self, %params) = @_;
 


@@ -119,39 +125,53 @@ sub action_ajax_edit {
 
   my $js = SL::ClientJS->new;
 
 
   my $js = SL::ClientJS->new;
 

-  die "TODO: edit section" if $self->item->get_type =~ m/section/;
-

   if (!$self->visible_section || ($self->visible_section->id != $self->item->get_section->id)) {
   if (!$self->visible_section || ($self->visible_section->id != $self->item->get_section->id)) {

+    # Show section/item to edit if it is not visible.
+

     my $html = $self->render('requirement_spec_item/_section', { output => 0 }, requirement_spec_item => $self->item);
     $js->html('#column-content', $html);
   }
 
     my $html = $self->render('requirement_spec_item/_section', { output => 0 }, requirement_spec_item => $self->item);
     $js->html('#column-content', $html);
   }
 

-  if ($self->item->get_type =~ m/function-block/) {
-    my $create_item = sub {
-      [ $_[0]->id, $self->presenter->truncate(join(' ', grep { $_ } ($_[1], $_[0]->fb_number, $_[0]->description))) ]
-    };
-    my @dependencies =
-      map { [ $_->fb_number . ' ' . $_->title,
-              [ map { ( $create_item->($_),
-                        map { $create_item->($_, '->') } @{ $_->sorted_children })
-                    } @{ $_->sorted_children } ] ]
-          } @{ $self->item->requirement_spec->sections };
-
-    my @selected_dependencies = map { $_->id } @{ $self->item->dependencies };
-
-    my $html                  = $self->render('requirement_spec_item/_function_block_form', { output => 0 }, DEPENDENCIES => \@dependencies, SELECTED_DEPENDENCIES => \@selected_dependencies);
-    my $id_base               = $self->item->get_type . '-' . $self->item->id;
-    my $content_top_id        = '#' . $self->item->get_type . '-content-top-' . $self->item->id;
-
-    $js->hide($content_top_id)
-       ->remove("#edit_${id_base}_form")
-       ->insertAfter($html, $content_top_id)
+  if ($self->item->get_type =~ m/section/) {
+    # Edit the section header, not an item.
+    my $html = $self->render('requirement_spec_item/_section_form', { output => 0 });
+
+    $js->hide('#section-header-' . $self->item->id)
+       ->remove("#edit_section_form")
+       ->insertAfter($html, '#section-header-' . $self->item->id)

        ->jstree->select_node('#tree', '#fb-' . $self->item->id)
        ->jstree->select_node('#tree', '#fb-' . $self->item->id)

-       ->focus("#edit_${id_base}_description")
-       ->val('#current_content_type', $self->item->get_type)
-       ->val('#current_content_id', $self->item->id)
+       ->focus("#edit_section_title")
+       ->val('#current_content_type', 'section')
+       ->val('#current_content_id',   $self->item->id)

        ->render($self);
        ->render($self);

+    return;

   }
   }

+
+  # Edit a function block or a sub function block
+  my $create_item = sub {
+    [ $_[0]->id, $self->presenter->truncate(join(' ', grep { $_ } ($_[1], $_[0]->fb_number, $_[0]->description))) ]
+  };
+  my @dependencies =
+    map { [ $_->fb_number . ' ' . $_->title,
+            [ map { ( $create_item->($_),
+                      map { $create_item->($_, '->') } @{ $_->sorted_children })
+                  } @{ $_->sorted_children } ] ]
+        } @{ $self->item->requirement_spec->sections };
+
+  my @selected_dependencies = map { $_->id } @{ $self->item->dependencies };
+
+  my $html                  = $self->render('requirement_spec_item/_function_block_form', { output => 0 }, DEPENDENCIES => \@dependencies, SELECTED_DEPENDENCIES => \@selected_dependencies);
+  my $id_base               = 'edit_function_block_' . $self->item->id;
+  my $content_top_id        = '#' . $self->item->get_type . '-content-top-' . $self->item->id;
+
+  $js->hide($content_top_id)
+     ->remove("#${id_base}_form")
+     ->insertAfter($html, $content_top_id)
+     ->jstree->select_node('#tree', '#fb-' . $self->item->id)
+     ->focus("#${id_base}_description")
+     ->val('#current_content_type', $self->item->get_type)
+     ->val('#current_content_id', $self->item->id)
+     ->render($self);

 }
 
 sub action_ajax_update {
 }
 
 sub action_ajax_update {


@@ -170,7 +190,26 @@ sub action_ajax_update {
 
   $self->item->save;
 
 
   $self->item->save;
 

-  my $id_prefix    = $self->item->get_type eq 'function-block' ? '' : 'sub-';
+  my $type = $self->item->get_type;
+
+  if ($type eq 'section') {
+    # Updated section, now update section header.
+
+    my $html = $self->render('requirement_spec_item/_section_header', { output => 0 }, requirement_spec_item => $self->item);
+
+    return SL::ClientJS->new
+      ->remove('#edit_section_form')
+      ->html('#section-header-' . $self->item->id, $html)
+      ->show('#section-header-' . $self->item->id)
+      ->jstree->rename_node('#tree', '#fb-' . $self->item->id, $::request->presenter->requirement_spec_item_tree_node_title($self->item))
+      ->render($self);
+  }
+
+  # Updated function block or sub function block. Update (sub)
+  # function block and potentially the bottom of the parent function
+  # block.
+
+  my $id_prefix    = $type eq 'function-block' ? '' : 'sub-';

   my $html_top     = $self->render('requirement_spec_item/_function_block_content_top',    { output => 0 }, requirement_spec_item => $self->item, id_prefix => $id_prefix);
   $id_prefix      .= 'function-block-content-';
 
   my $html_top     = $self->render('requirement_spec_item/_function_block_content_top',    { output => 0 }, requirement_spec_item => $self->item, id_prefix => $id_prefix);
   $id_prefix      .= 'function-block-content-';
 


@@ -180,7 +219,7 @@ sub action_ajax_update {
     ->jstree->rename_node('#tree', '#fb-' . $self->item->id, $::request->presenter->requirement_spec_item_tree_node_title($self->item));
 
   $self->replace_bottom($js, $self->item, id_prefix => $id_prefix);
     ->jstree->rename_node('#tree', '#fb-' . $self->item->id, $::request->presenter->requirement_spec_item_tree_node_title($self->item));
 
   $self->replace_bottom($js, $self->item, id_prefix => $id_prefix);

-  $self->replace_bottom($js, $self->item->parent) if $self->item->get_type eq 'sub-function-block';
+  $self->replace_bottom($js, $self->item->parent) if $type eq 'sub-function-block';

 
   $js->render($self);
 }
 
   $js->render($self);
 }

diff --git a/js/requirement_spec.js b/js/requirement_spec.js
index 15bec4b5bb5bb64f7833bcda16f46af0fde1fd75..da53daa2bfb89bbfa4b13228997a5648f33f265b 100644 (file)
--- a/js/requirement_spec.js
+++ b/js/requirement_spec.js
@@ -221,9 +221,8 @@ function submit_edit_item_form(id_base) {
   return true;
 }
 
   return true;
 }
 

-function cancel_edit_item_form(form_id_base, hidden_id_base) {
-  var id = $('#' + form_id_base + '_id').val();
+function cancel_edit_item_form(form_id_base, to_show) {

   $('#' + form_id_base + '_form').remove();
   $('#' + form_id_base + '_form').remove();

-  if (id)
-    $('#' + hidden_id_base + '-' + id).show();
+  if (to_show)
+    $(to_show).show();

 }
 }

diff --git a/templates/webpages/requirement_spec/show.html b/templates/webpages/requirement_spec/show.html
index d8221e567f9abf27ff96d23e3b54498c7bdd71de..68c021ddfd2bf88188a67cf87cbc776b5f82775d 100644 (file)
--- a/templates/webpages/requirement_spec/show.html
+++ b/templates/webpages/requirement_spec/show.html
@@ -150,34 +150,5 @@ $(function(){
   });
 });
 
   });
 });
 

-function edit_section_header() {
-  $.post("controller.pl?action=RequirementSpecItem/edit_section&id=" + encodeURIComponent($('#active_section_id').val()), function(data) {
-    var header = $('#section-header');
-    header.data('old-elements', header.children().detach());
-    header.html(data);
-  });
-}
-
-function submit_section_form() {
-  $.post("controller.pl?action=RequirementSpecItem/update_section&id=" + $('#section-form form').serialize(), function(data) {
-    var header = $('#section-header');
-    header.removeData('old-elements');
-    header.html(data['header_html']);
-    $('#tree').jstree('rename_node', '#fb-' + data['id'], data['node_name']);
-  });
-}
-
-function cancel_section_form() {
-  var header = $('#section-header');
-  header.empty();
-  header.append(header.data('old-elements'));
-  header.removeData('old-elements');
-}
-
-
-
-
-
-

   -->
 </script>
   -->
 </script>

diff --git a/templates/webpages/requirement_spec_item/_function_block_form.html b/templates/webpages/requirement_spec_item/_function_block_form.html
index 5be377ec2877b2ec09795d62ea385a0ae21cd379..a999c6ba19d07eb0174838533d39f83f6712639f 100644 (file)
--- a/templates/webpages/requirement_spec_item/_function_block_form.html
+++ b/templates/webpages/requirement_spec_item/_function_block_form.html
@@ -29,12 +29,12 @@
 
   <div style="width: 59%">
    [% LxERP.t8("Description of #1", SELF.item.fb_number) %]:<br>
 
   <div style="width: 59%">
    [% LxERP.t8("Description of #1", SELF.item.fb_number) %]:<br>

-   [% L.textarea_tag(id_base _ '.description', SELF.item.description, id=id_base _ '_description', rows=8, style="width: 100%") %]
+   [% L.textarea_tag(id_base _ '.description', SELF.item.description, rows=8, style="width: 100%") %]

   </div>
  </div>
 
  <p>
   [% L.button_tag('submit_edit_item_form("' _ id_base _ '")', LxERP.t8('Save')) %]
   </div>
  </div>
 
  <p>
   [% L.button_tag('submit_edit_item_form("' _ id_base _ '")', LxERP.t8('Save')) %]

-  <a href="#" onclick="cancel_edit_item_form('[% id_base %]', '[% SELF.item.get_type %]-content-top')">[%- LxERP.t8("Cancel") %]</a>
+  <a href="#" onclick="cancel_edit_item_form('[% id_base %]', '[% '#' _ SELF.item.get_type _ '-content-top-' _ SELF.item.id %]')">[%- LxERP.t8("Cancel") %]</a>

  </p>
 </form>
  </p>
 </form>

diff --git a/templates/webpages/requirement_spec_item/_section_form.html b/templates/webpages/requirement_spec_item/_section_form.html
index c2ae0da8b3e408f8106520808c02e2b1011b2749..1b059542d7e513f9fdef15ab7e3ab1b4dcee985a 100644 (file)
--- a/templates/webpages/requirement_spec_item/_section_form.html
+++ b/templates/webpages/requirement_spec_item/_section_form.html
@@ -1,25 +1,27 @@
 [%- USE HTML %][%- USE L %][%- USE LxERP %]
 [%- USE HTML %][%- USE L %][%- USE LxERP %]

-[%- SET id_base="section-form" %]
-<div id="[% id_base %]">
+[%- DEFAULT id_base="edit_section" %]
+[%- SET style="width: 500px" %]
+<form id="[% id_base %]_form">

  <h1>[%- LxERP.t8("Edit section #1", SELF.item.fb_number) %]</h1>
 
  <h1>[%- LxERP.t8("Edit section #1", SELF.item.fb_number) %]</h1>
 

- <form>
-  [% L.hidden_tag("requirement_spec_id", SELF.item.requirement_spec_id, id=(id_base _ "-requirement-spec-id")) %]
-  [% L.hidden_tag("id", SELF.item.id, id=(id_base _ "-requirement-spec-item-id")) %]
+ [% L.hidden_tag(id_base _ '_id',                  SELF.item.id) %]
+ [% L.hidden_tag(id_base _ '.requirement_spec_id', SELF.item.requirement_spec_id) %]
+ [% IF insert_after %]
+  [% L.hidden_tag(id_base _ '.insert_after',       insert_after) %]
+ [% END %]

 
 

-  <p>
-   [%- LxERP.t8("Title") %]:<br>
-   [% L.input_tag("title", SELF.item.title, id=(id_base _ "-title")) %]
-  </p>
+ <p>
+  [%- LxERP.t8("Title") %]:<br>
+  [% L.input_tag(id_base _ '.title', SELF.item.title, style=style) %]
+ </p>

 
 

-  <p>
-   [%- LxERP.t8("Description") %]:<br>
-   [% L.textarea_tag("description", SELF.item.description, id=(id_base _ "-description"), rows=8, cols=80) %]
-  </p>
+ <p>
+  [%- LxERP.t8("Description") %]:<br>
+  [% L.textarea_tag(id_base _ '.description', SELF.item.description, rows=8, cols=80, style=style) %]
+ </p>

 
 

-  <p>
-   [% L.button_tag("submit_section_form()", LxERP.t8("Save")) %]
-   <a href="#" onclick="cancel_section_form()">[% LxERP.t8("Cancel") %]</a>
-  </p>
- </form>
-</div>
+ <p>
+  [% L.button_tag('submit_edit_item_form("' _ id_base _ '")', LxERP.t8('Save')) %]
+  <a href="#" onclick="cancel_edit_item_form('[% id_base %]', '[% '#section-header-' _ SELF.item.id %]')">[%- LxERP.t8("Cancel") %]</a>
+ </p>
+</form>

diff --git a/templates/webpages/requirement_spec_item/_section_header.html b/templates/webpages/requirement_spec_item/_section_header.html
index db3a9983d4cfff9f5addfbbd0cb8d8ad5fe192ef..268f6cdadb3e0d422f5a63219782809bcd97c8aa 100644 (file)
--- a/templates/webpages/requirement_spec_item/_section_header.html
+++ b/templates/webpages/requirement_spec_item/_section_header.html
@@ -10,7 +10,7 @@
  [% END %]
 </h1>
 
  [% END %]
 </h1>
 

-<div class="section-description">
+<div class="section-description" id="section-description">

  <div class="section-description-heading">[%- LxERP.t8("Preamble") %]</div>
  [% IF requirement_spec_item.description %]
   [%- L.simple_format(requirement_spec_item.description) -%]
  <div class="section-description-heading">[%- LxERP.t8("Preamble") %]</div>
  [% IF requirement_spec_item.description %]
   [%- L.simple_format(requirement_spec_item.description) -%]