Pflichtenheftaufträge: beliebige Artikel auswählen können

Zusätzlich werden dann Spalten angezeigt, die die Einheit und den im
Angebot/Auftrag verwendeten Positionstypen (Pauschalposition/
Auwandsposition) angeben.

diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm
index a29c7cb92bbf0f8b93cc01664ed017afdd60a5f3..f762b9794a14a4fdd19d25033757d5bb62306f32 100644 (file)
--- a/SL/Controller/RequirementSpec.pm
+++ b/SL/Controller/RequirementSpec.pm
@@ -29,7 +29,7 @@ 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
 (
   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 models) ],
+                                  current_text_block_output_position models time_based_units) ],

 );
 
 __PACKAGE__->run_before('setup');
 );
 
 __PACKAGE__->run_before('setup');


@@ -289,6 +289,7 @@ 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_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_customers {
 sub init_types                  { SL::DB::Manager::RequirementSpecType->get_all_sorted        }
 
 sub init_customers {

diff --git a/SL/Controller/RequirementSpecOrder.pm b/SL/Controller/RequirementSpecOrder.pm
index b02c985bca1e30f94ecd37a2aa6ad5a646ad258f..f354708668a8557d0a3ded555e135cdee6281de4 100644 (file)
--- a/SL/Controller/RequirementSpecOrder.pm
+++ b/SL/Controller/RequirementSpecOrder.pm
@@ -23,7 +23,7 @@ use constant FORMS_SELECTOR => '#quotations_and_orders_article_assignment,#quota
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(parts) ],
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(parts) ],

-  'scalar --get_set_init' => [ qw(requirement_spec rs_order js h_unit_name all_customers all_parts_time_unit) ],
+  'scalar --get_set_init' => [ qw(requirement_spec rs_order js h_unit_name all_customers all_parts_time_unit section_order_part) ],

 );
 
 __PACKAGE__->run_before('setup');
 );
 
 __PACKAGE__->run_before('setup');


@@ -156,6 +156,7 @@ sub action_edit_assignment {
   my $html   = $self->render('requirement_spec_order/edit_assignment', { output => 0 }, make_part_title => sub { $_[0]->partnumber . ' ' . $_[0]->description });
   $self->js->hide(LIST_SELECTOR())
            ->after(LIST_SELECTOR(), $html)
   my $html   = $self->render('requirement_spec_order/edit_assignment', { output => 0 }, make_part_title => sub { $_[0]->partnumber . ' ' . $_[0]->description });
   $self->js->hide(LIST_SELECTOR())
            ->after(LIST_SELECTOR(), $html)

+           ->reinit_widgets

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


@@ -209,15 +210,16 @@ sub init_js {
 }
 
 sub init_all_customers { SL::DB::Manager::Customer->get_all_sorted }
 }
 
 sub init_all_customers { SL::DB::Manager::Customer->get_all_sorted }

-sub init_h_unit_name   { first { SL::DB::Manager::Unit->find_by(name => $_) } qw(Std h Stunde) };
+sub init_h_unit_name   { SL::DB::Manager::Unit->find_h_unit->name };

 sub init_rs_order      { SL::DB::RequirementSpecOrder->new(id => $::form->{rs_order_id})->load };
 sub init_rs_order      { SL::DB::RequirementSpecOrder->new(id => $::form->{rs_order_id})->load };

+sub init_section_order_part { my $id = $::instance_conf->get_requirement_spec_section_order_part_id; return $id ? SL::DB::Part->new(id => $id)->load : undef }

 
 sub init_all_parts_time_unit {
   my ($self) = @_;
 
   return [] unless $self->h_unit_name;
 
 
 sub init_all_parts_time_unit {
   my ($self) = @_;
 
   return [] unless $self->h_unit_name;
 

-  my @convertible_unit_names = map { $_->name } @{ SL::DB::Manager::Unit->find_by(name => $self->h_unit_name)->convertible_units };
+  my @convertible_unit_names = map { $_->name } @{ SL::DB::Manager::Unit->time_based_units };

 
   return SL::DB::Manager::Part->get_all_sorted(where => [ unit => \@convertible_unit_names ]);
 }
 
   return SL::DB::Manager::Part->get_all_sorted(where => [ unit => \@convertible_unit_names ]);
 }

diff --git a/SL/DB/Manager/Unit.pm b/SL/DB/Manager/Unit.pm
index 673fcb060459bd193cd9c64028df2386e8667a46..aa55ffa7682ecad2e9a092ee49cf31afe72ae9c9 100644 (file)
--- a/SL/DB/Manager/Unit.pm
+++ b/SL/DB/Manager/Unit.pm
@@ -8,6 +8,8 @@ use base qw(SL::DB::Helper::Manager);
 use SL::DB::Helper::Sorted;
 use SL::DB::Helper::Filtered;
 
 use SL::DB::Helper::Sorted;
 use SL::DB::Helper::Filtered;
 

+use List::Util qw(first);
+

 sub object_class { 'SL::DB::Unit' }
 
 __PACKAGE__->make_manager_methods;
 sub object_class { 'SL::DB::Unit' }
 
 __PACKAGE__->make_manager_methods;


@@ -46,4 +48,18 @@ sub all_units {
   $::request->cache('all_units')->{sorted} //= $class->get_all_sorted;
 }
 
   $::request->cache('all_units')->{sorted} //= $class->get_all_sorted;
 }
 

+sub find_h_unit {
+  my ($class) = @_;
+
+  return $::request->cache('unit_manager')->{h_unit} //= first { $_->name =~ m{^(?: Std | h | Stunde )$}x } @{ $class->all_units };
+}
+
+sub time_based_units {
+  my ($class) = @_;
+
+  my $h_unit = $class->find_h_unit;
+  return [] if !$h_unit;
+  return $::request->cache('unit_manager')->{units} //= $h_unit->convertible_units;
+}
+

 1;
 1;

diff --git a/SL/DB/Unit.pm b/SL/DB/Unit.pm
index 900558fbd48ab8bb05795b7b4631e2444584a381..f5f1bc14c7ce0c67c23d147d6a3ad649ed78eaad 100644 (file)
--- a/SL/DB/Unit.pm
+++ b/SL/DB/Unit.pm
@@ -1,5 +1,8 @@
 package SL::DB::Unit;
 
 package SL::DB::Unit;
 

+use List::MoreUtils qw(any);
+
+

 use strict;
 
 use SL::DB::MetaSetup::Unit;
 use strict;
 
 use SL::DB::MetaSetup::Unit;


@@ -57,4 +60,10 @@ sub convert_to {
   return $qty * $my_base_factor / $other_base_factor;
 }
 
   return $qty * $my_base_factor / $other_base_factor;
 }
 

+sub is_time_based {
+  my ($self) = @_;
+
+  return any { $_->id == $self->id } @{ SL::DB::Manager::Unit->time_based_units };
+}
+

 1;
 1;

diff --git a/js/locale/de.js b/js/locale/de.js
index e00362dba3eafa54e32944eec17da81dd875f091..a382fd990c19cc261e6bc09a1f72f89ed5b0d088 100644 (file)
--- a/js/locale/de.js
+++ b/js/locale/de.js
@@ -70,5 +70,7 @@ namespace("kivi").setupLocale({
 "Transaction description":"Vorgangsbezeichnung",
 "Update":"Erneuern",
 "Update quotation/order":"Auftrag/Angebot aktualisieren",
 "Transaction description":"Vorgangsbezeichnung",
 "Update":"Erneuern",
 "Update quotation/order":"Auftrag/Angebot aktualisieren",

-"Version actions":"Aktionen für Versionen"
+"Version actions":"Aktionen für Versionen",
+"flat-rate position":"Pauschalposition",
+"time and effort based position":"Aufwandsposition"

 });
 });

diff --git a/js/requirement_spec.js b/js/requirement_spec.js
index b1d5ce85f7e8e7c878d24e6fa7014170c5af2931..d0ec5608ed7865d1216aec866b1481a28e47eb6d 100644 (file)
--- a/js/requirement_spec.js
+++ b/js/requirement_spec.js
@@ -153,6 +153,8 @@ ns.initialize_requirement_spec = function(data) {
 
   ns.create_context_menus(data.is_template);
   $('#requirement_spec_tabs').on("tabsbeforeactivate", ns.tabs_before_activate);
 
   ns.create_context_menus(data.is_template);
   $('#requirement_spec_tabs').on("tabsbeforeactivate", ns.tabs_before_activate);

+
+  ns.time_based_units = data.time_based_units;

 };
 
 // -------------------------------------------------------------------------
 };
 
 // -------------------------------------------------------------------------


@@ -565,6 +567,31 @@ ns.assign_order_part_id_to_all = function() {
   }).each(function(idx, elt) {
     $(elt).val(order_part_name);
   });
   }).each(function(idx, elt) {
     $(elt).val(order_part_name);
   });

+
+  var unit = $('#quotations_and_orders_order_id').closest('td').data('unit');
+  var text = ns.time_based_units[unit] ? kivi.t8("time and effort based position") : kivi.t8("flat-rate position");
+
+  $('#quotations_and_orders_form [data-unit-column=1]').html(unit);
+  $('#quotations_and_orders_form [data-position-type-column=1]').html(text);
+};
+
+ns.assign_order_part_on_part_picked = function(event, item) {
+  if (!item || !item.unit)
+    return;
+
+  var $elt = $(this),
+      id   = $elt.prop('id');
+
+  if (id == 'quotations_and_orders_order_id')
+    $elt.closest('td').data('unit', item.unit);
+
+  else {
+    var $tr  = $elt.closest('tr');
+    var text = ns.time_based_units[item.unit] ? kivi.t8("time and effort based position") : kivi.t8("flat-rate position");
+
+    $tr.find('[data-unit-column=1]').html(item.unit);
+    $tr.find('[data-position-type-column=1]').html(text);
+  }

 };
 
 // -------------------------------------------------------------------------
 };
 
 // -------------------------------------------------------------------------


@@ -1037,3 +1064,9 @@ ns.create_context_menus = function(is_template) {
 };
 
 });                             // end of namespace(...., function() {...
 };
 
 });                             // end of namespace(...., function() {...

+
+function local_reinit_widgets() {
+  kivi.run_once_for('#quotations_and_orders_order_id,[name="sections[].order_part_id"]', "assign_order_part_on_part_picked", function(elt) {
+    $(elt).on('set_item:PartPicker', kivi.requirement_spec.assign_order_part_on_part_picked);
+  });
+}

diff --git a/locale/de/all b/locale/de/all
index 05c80185ba251b699dd862007944a4f1163785b1..98e54f613e17236f13877652ebea27ec83c88859 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1791,6 +1791,7 @@ $self->{texts} = {
   'Plural'                      => 'Plural',
   'Port'                        => 'Port',
   'Portrait'                    => 'Hochformat',
   'Plural'                      => 'Plural',
   'Port'                        => 'Port',
   'Portrait'                    => 'Hochformat',

+  'Position type in quotation/order' => 'Positionstyp in Angebot/Auftrag',

   'Post'                        => 'Buchen',
   'Post Payment'                => 'Zahlung buchen',
   'Post and E-mail'             => 'Buchen und E-Mail',
   'Post'                        => 'Buchen',
   'Post Payment'                => 'Zahlung buchen',
   'Post and E-mail'             => 'Buchen und E-Mail',


@@ -2976,6 +2977,7 @@ $self->{texts} = {
   'executed'                    => 'ausgeführt',
   'failed'                      => 'fehlgeschlagen',
   'female'                      => 'weiblich',
   'executed'                    => 'ausgeführt',
   'failed'                      => 'fehlgeschlagen',
   'female'                      => 'weiblich',

+  'flat-rate position'          => 'Pauschalposition',

   'follow_up_list'              => 'wiedervorlageliste',
   'for'                         => 'für',
   'for Period'                  => 'für den Zeitraum',
   'follow_up_list'              => 'wiedervorlageliste',
   'for'                         => 'für',
   'for Period'                  => 'für den Zeitraum',


@@ -3102,6 +3104,7 @@ $self->{texts} = {
   'taxkey 0 with taxrate 0 was created.' => 'Steuerschlüssel 0 wurde angelegt.',
   'taxnumber'                   => 'Automatikkonto',
   'terminated'                  => 'gekündigt',
   'taxkey 0 with taxrate 0 was created.' => 'Steuerschlüssel 0 wurde angelegt.',
   'taxnumber'                   => 'Automatikkonto',
   'terminated'                  => 'gekündigt',

+  'time and effort based position' => 'Aufwandsposition',

   'to (date)'                   => 'bis',
   'to (time)'                   => 'bis',
   'transfer'                    => 'Umlagerung',
   'to (date)'                   => 'bis',
   'to (time)'                   => 'bis',
   'transfer'                    => 'Umlagerung',

diff --git a/templates/webpages/requirement_spec/show.html b/templates/webpages/requirement_spec/show.html
index 756fbc85c731b0475b300addf282c663aa3a91a1..c329a4e4d600dfc0c5e759ece7a824925f208466 100644 (file)
--- a/templates/webpages/requirement_spec/show.html
+++ b/templates/webpages/requirement_spec/show.html
@@ -1,4 +1,4 @@
-[%- USE JSON -%][%- USE HTML %][%- USE L %][%- USE LxERP %][%- USE P -%]
+[%- USE JSON -%][%- USE HTML %][%- USE L %][%- USE LxERP %][%- USE P -%][%- USE JavaScript -%]

 [% SET sections = SELF.requirement_spec.sections_sorted || [] %]
 
 [%- INCLUDE 'common/flash.html' %]
 [% SET sections = SELF.requirement_spec.sections_sorted || [] %]
 
 [%- INCLUDE 'common/flash.html' %]


@@ -95,6 +95,11 @@ $(function() {
 [% IF SELF.requirement_spec_item %]
     , initially_selected_node: '#fb-[% SELF.requirement_spec_item.id %]'
 [% END %]
 [% IF SELF.requirement_spec_item %]
     , initially_selected_node: '#fb-[% SELF.requirement_spec_item.id %]'
 [% END %]

+    , time_based_units: {
+      [% FOREACH unit = SELF.time_based_units %]
+       [% UNLESS loop.first %], [% END %] "[% JavaScript.escape(unit.name) %]": true
+      [% END %]
+    }

   });
 });
 
   });
 });
 

diff --git a/templates/webpages/requirement_spec_order/_assignment_form.html b/templates/webpages/requirement_spec_order/_assignment_form.html
index 9990c55eafec329d87c00cdfd566f858e6033f29..634cb2446eaf0601a240776c607634f58a05684e 100644 (file)
--- a/templates/webpages/requirement_spec_order/_assignment_form.html
+++ b/templates/webpages/requirement_spec_order/_assignment_form.html
@@ -17,8 +17,8 @@
 
   <tr>
    <td>[% LxERP.t8("Assign the following article to all sections") %]:</td>
 
   <tr>
    <td>[% LxERP.t8("Assign the following article to all sections") %]:</td>

-   <td>
-    [% P.part_picker('quotations_and_orders_dummy', INSTANCE_CONF.get_requirement_spec_section_order_part_id, convertible_unit=SELF.h_unit_name, id='quotations_and_orders_order_id', style=style) %]
+   <td data-unit="[% HTML.escape(SELF.section_order_part.unit) %]">
+    [% P.part_picker('quotations_and_orders_dummy', SELF.section_order_part.id, id='quotations_and_orders_order_id', style=style) %]

     [% L.button_tag('kivi.requirement_spec.assign_order_part_id_to_all()', LxERP.t8('Assign article')) %]
    </td>
   </tr>
     [% L.button_tag('kivi.requirement_spec.assign_order_part_id_to_all()', LxERP.t8('Assign article')) %]
    </td>
   </tr>


@@ -31,6 +31,8 @@
     <th>[% LxERP.t8("Title") %]</th>
     <th>[% LxERP.t8("Description") %]</th>
     <th>[% LxERP.t8("Article") %]</th>
     <th>[% LxERP.t8("Title") %]</th>
     <th>[% LxERP.t8("Description") %]</th>
     <th>[% LxERP.t8("Article") %]</th>

+    <th>[% LxERP.t8("Unit") %]</th>
+    <th>[% LxERP.t8("Position type in quotation/order") %]</th>

    </tr>
   </thead>
 
    </tr>
   </thead>
 


@@ -41,7 +43,15 @@
     <td>[% HTML.escape(section.fb_number) %]</td>
     <td>[% HTML.escape(section.title) %]</td>
     <td>[% HTML.escape(P.truncate(section.description_as_stripped_html)) %]</td>
     <td>[% HTML.escape(section.fb_number) %]</td>
     <td>[% HTML.escape(section.title) %]</td>
     <td>[% HTML.escape(P.truncate(section.description_as_stripped_html)) %]</td>

-    <td>[% P.part_picker('sections[].order_part_id', section.order_part_id, convertible_unit=SELF.h_unit_name, id='quotations_and_orders_sections_order_pard_id_' _ loop.count, style=style) %]</td>
+    <td>[% P.part_picker('sections[].order_part_id', section.order_part_id, id='quotations_and_orders_sections_order_pard_id_' _ loop.count, style=style) %]</td>
+    <td data-unit-column=1>[% HTML.escape(section.order_part.unit) %]</td>
+    <td data-position-type-column=1>
+     [% IF section.order_part_id && section.order_part.unit_obj.is_time_based %]
+      [% LxERP.t8("time and effort based position") %]
+     [% ELSIF section.order_part_id %]
+      [% LxERP.t8("flat-rate position") %]
+     [% END %]
+    </td>

    </tr>
    [% END %]
   </tbody>
    </tr>
    [% END %]
   </tbody>

diff --git a/templates/webpages/requirement_spec_order/list.html b/templates/webpages/requirement_spec_order/list.html
index b4bef1dfca252aa65bd687a3d153e7c9186d4bce..4f8278d19f2b9b320cf8834d22bf483aee5670a7 100644 (file)
--- a/templates/webpages/requirement_spec_order/list.html
+++ b/templates/webpages/requirement_spec_order/list.html
@@ -15,6 +15,8 @@
     <th>[% LxERP.t8("Title") %]</th>
     <th>[% LxERP.t8("Description") %]</th>
     <th>[% LxERP.t8("Article") %]</th>
     <th>[% LxERP.t8("Title") %]</th>
     <th>[% LxERP.t8("Description") %]</th>
     <th>[% LxERP.t8("Article") %]</th>

+    <th>[% LxERP.t8("Unit") %]</th>
+    <th>[% LxERP.t8("Position type in quotation/order") %]</th>

    </tr>
   </thead>
 
    </tr>
   </thead>
 


@@ -31,6 +33,14 @@
        [% LxERP.t8("no article assigned yet") %]
       [% END %]
      </td>
        [% LxERP.t8("no article assigned yet") %]
       [% END %]
      </td>

+     <td>[% HTML.escape(section.order_part.unit) %]</td>
+     <td>
+      [% IF section.order_part_id && section.order_part.unit_obj.is_time_based %]
+       [% LxERP.t8("time and effort based position") %]
+      [% ELSIF section.order_part_id %]
+       [% LxERP.t8("flat-rate position") %]
+      [% END %]
+     </td>

     </tr>
    [% END %]
   </tbody>
     </tr>
    [% END %]
   </tbody>