Banktransaction: Kontoauszug verbuchen überarbeitet(4)

[mfinanz.git] / SL / Template / Plugin / L.pm

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index b6021f5c24d340eb2c617e7d9e76e96d5b2544d5..56dd4fbe895bb46e7a54a81dd31587039a14c7f2 100644 (file)
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -2,11 +2,13 @@ package SL::Template::Plugin::L;
 
 use base qw( Template::Plugin );
 use Template::Plugin;
 
 use base qw( Template::Plugin );
 use Template::Plugin;

+use Data::Dumper;

 use List::MoreUtils qw(apply);
 use List::Util qw(max);
 use Scalar::Util qw(blessed);
 
 use SL::Presenter;
 use List::MoreUtils qw(apply);
 use List::Util qw(max);
 use Scalar::Util qw(blessed);
 
 use SL::Presenter;

+use SL::Util qw(_hashify);

 
 use strict;
 
 
 use strict;
 


@@ -30,10 +32,6 @@ sub _J {
   return $string;
 }
 
   return $string;
 }
 

-sub _hashify {
-  return (@_ && (ref($_[0]) eq 'HASH')) ? %{ $_[0] } : @_;
-}
-

 sub new {
   my ($class, $context, @args) = @_;
 
 sub new {
   my ($class, $context, @args) = @_;
 


@@ -64,14 +62,28 @@ sub _call_presenter {
 
 sub name_to_id    { return _call_presenter('name_to_id',    @_); }
 sub html_tag      { return _call_presenter('html_tag',      @_); }
 
 sub name_to_id    { return _call_presenter('name_to_id',    @_); }
 sub html_tag      { return _call_presenter('html_tag',      @_); }

+sub hidden_tag    { return _call_presenter('hidden_tag',    @_); }

 sub select_tag    { return _call_presenter('select_tag',    @_); }
 sub select_tag    { return _call_presenter('select_tag',    @_); }

+sub checkbox_tag  { return _call_presenter('checkbox_tag',  @_); }

 sub input_tag     { return _call_presenter('input_tag',     @_); }
 sub input_tag     { return _call_presenter('input_tag',     @_); }

+sub javascript    { return _call_presenter('javascript',    @_); }

 sub truncate      { return _call_presenter('truncate',      @_); }
 sub simple_format { return _call_presenter('simple_format', @_); }
 sub truncate      { return _call_presenter('truncate',      @_); }
 sub simple_format { return _call_presenter('simple_format', @_); }

+sub part_picker   { return _call_presenter('part_picker',   @_); }
+sub chart_picker  { return _call_presenter('chart_picker',  @_); }
+sub customer_vendor_picker   { return _call_presenter('customer_vendor_picker',   @_); }
+sub project_picker           { return _call_presenter('project_picker',           @_); }
+sub button_tag               { return _call_presenter('button_tag',               @_); }
+sub submit_tag               { return _call_presenter('submit_tag',               @_); }
+sub ajax_submit_tag          { return _call_presenter('ajax_submit_tag',          @_); }
+
+sub _set_id_attribute {
+  my ($attributes, $name, $unique) = @_;
+  SL::Presenter::Tag::_set_id_attribute($attributes, $name, $unique);
+}

 
 sub img_tag {
 
 sub img_tag {

-  my ($self, @slurp) = @_;
-  my %options = _hashify(@slurp);
+  my ($self, %options) = _hashify(1, @_);

 
   $options{alt} ||= '';
 
 
   $options{alt} ||= '';
 


@@ -79,10 +91,9 @@ sub img_tag {
 }
 
 sub textarea_tag {
 }
 
 sub textarea_tag {

-  my ($self, $name, $content, @slurp) = @_;
-  my %attributes      = _hashify(@slurp);
+  my ($self, $name, $content, %attributes) = _hashify(3, @_);

 
 

-  $attributes{id}   ||= $self->name_to_id($name);
+  _set_id_attribute(\%attributes, $name);

   $attributes{rows}  *= 1; # required by standard
   $attributes{cols}  *= 1; # required by standard
   $content            = $content ? _H($content) : '';
   $attributes{rows}  *= 1; # required by standard
   $attributes{cols}  *= 1; # required by standard
   $content            = $content ? _H($content) : '';


@@ -90,37 +101,16 @@ sub textarea_tag {
   return $self->html_tag('textarea', $content, %attributes, name => $name);
 }
 
   return $self->html_tag('textarea', $content, %attributes, name => $name);
 }
 

-sub checkbox_tag {
-  my ($self, $name, @slurp) = @_;
-  my %attributes       = _hashify(@slurp);
-
-  $attributes{id}    ||= $self->name_to_id($name);
-  $attributes{value}   = 1 unless defined $attributes{value};
-  my $label            = delete $attributes{label};
-  my $checkall         = delete $attributes{checkall};
-
-  if ($attributes{checked}) {
-    $attributes{checked} = 'checked';
-  } else {
-    delete $attributes{checked};
-  }
-
-  my $code  = $self->html_tag('input', undef,  %attributes, name => $name, type => 'checkbox');
-  $code    .= $self->html_tag('label', $label, for => $attributes{id}) if $label;
-  $code    .= $self->javascript(qq|\$('#$attributes{id}').checkall('$checkall');|) if $checkall;
-
-  return $code;
-}
-

 sub radio_button_tag {
 sub radio_button_tag {

-  my $self             = shift;
-  my $name             = shift;
-  my %attributes       = _hashify(@_);
+  my ($self, $name, %attributes) = _hashify(2, @_);
+
+  $attributes{value}   = 1 unless exists $attributes{value};

 
 

-  $attributes{value}   = 1 unless defined $attributes{value};
-  $attributes{id}    ||= $self->name_to_id($name . "_" . $attributes{value});
+  _set_id_attribute(\%attributes, $name, 1);

   my $label            = delete $attributes{label};
 
   my $label            = delete $attributes{label};
 

+  _set_id_attribute(\%attributes, $name . '_' . $attributes{value});
+

   if ($attributes{checked}) {
     $attributes{checked} = 'checked';
   } else {
   if ($attributes{checked}) {
     $attributes{checked} = 'checked';
   } else {


@@ -133,11 +123,6 @@ sub radio_button_tag {
   return $code;
 }
 
   return $code;
 }
 

-sub hidden_tag {
-  my ($self, $name, $value, @slurp) = @_;
-  return $self->input_tag($name, $value, _hashify(@slurp), type => 'hidden');
-}
-

 sub div_tag {
   my ($self, $content, @slurp) = @_;
   return $self->html_tag('div', $content, @slurp);
 sub div_tag {
   my ($self, $content, @slurp) = @_;
   return $self->html_tag('div', $content, @slurp);


@@ -154,49 +139,19 @@ sub li_tag {
 }
 
 sub link {
 }
 
 sub link {

-  my ($self, $href, $content, @slurp) = @_;
-  my %params = _hashify(@slurp);
+  my ($self, $href, $content, %params) = _hashify(3, @_);

 
   $href ||= '#';
 
   return $self->html_tag('a', $content, %params, href => $href);
 }
 
 
   $href ||= '#';
 
   return $self->html_tag('a', $content, %params, href => $href);
 }
 

-sub submit_tag {
-  my ($self, $name, $value, @slurp) = @_;
-  my %attributes = _hashify(@slurp);
-
-  if ( $attributes{confirm} ) {
-    $attributes{onclick} = 'return confirm("'. _J(delete($attributes{confirm})) .'");';
-  }
-
-  return $self->input_tag($name, $value, %attributes, type => 'submit', class => 'submit');
-}
-
-sub button_tag {
-  my ($self, $onclick, $value, @slurp) = @_;
-  my %attributes = _hashify(@slurp);
-
-  $attributes{id}   ||= $self->name_to_id($attributes{name}) if $attributes{name};
-  $attributes{type} ||= 'button';
-
-  $onclick = 'if (!confirm("'. _J(delete($attributes{confirm})) .'")) return false; ' . $onclick if $attributes{confirm};
-
-  return $self->html_tag('input', undef, %attributes, value => $value, onclick => $onclick);
-}
-

 sub yes_no_tag {
 sub yes_no_tag {

-  my ($self, $name, $value) = splice @_, 0, 3;
-  my %attributes            = _hashify(@_);
+  my ($self, $name, $value, %attributes) = _hashify(3, @_);

 
   return $self->select_tag($name, [ [ 1 => $::locale->text('Yes') ], [ 0 => $::locale->text('No') ] ], default => $value ? 1 : 0, %attributes);
 }
 
 
   return $self->select_tag($name, [ [ 1 => $::locale->text('Yes') ], [ 0 => $::locale->text('No') ] ], default => $value ? 1 : 0, %attributes);
 }
 

-sub javascript {
-  my ($self, $data) = @_;
-  return $self->html_tag('script', $data, type => 'text/javascript');
-}
-

 sub stylesheet_tag {
   my $self = shift;
   my $code = '';
 sub stylesheet_tag {
   my $self = shift;
   my $code = '';


@@ -213,36 +168,28 @@ sub stylesheet_tag {
 
 my $date_tag_id_idx = 0;
 sub date_tag {
 
 my $date_tag_id_idx = 0;
 sub date_tag {

-  my ($self, $name, $value, @slurp) = @_;
+  my ($self, $name, $value, %params) = _hashify(3, @_);

 
 

-  my %params   = _hashify(@slurp);
-  my $id       = $self->name_to_id($name) . _tag_id();
+  _set_id_attribute(\%params, $name);

   my @onchange = $params{onchange} ? (onChange => delete $params{onchange}) : ();
   my @onchange = $params{onchange} ? (onChange => delete $params{onchange}) : ();

-  my @class    = $params{no_cal} || $params{readonly} ? () : (class => 'datepicker');
+  my @classes  = $params{no_cal} || $params{readonly} ? () : ('datepicker');
+  push @classes, delete($params{class}) if $params{class};
+  my %class    = @classes ? (class => join(' ', @classes)) : ();
+
+  $::request->presenter->need_reinit_widgets($params{id});

 
   return $self->input_tag(
     $name, blessed($value) ? $value->to_lxoffice : $value,
 
   return $self->input_tag(
     $name, blessed($value) ? $value->to_lxoffice : $value,

-    id     => $id,

     size   => 11,
     onblur => "check_right_date_format(this);",
     %params,
     size   => 11,
     onblur => "check_right_date_format(this);",
     %params,

-    @class, @onchange,
+    %class, @onchange,

   );
 }
 
   );
 }
 

-sub customer_picker {
-  my ($self, $name, $value, %params) = @_;
-  my $name_e    = _H($name);
-
-  $::request->{layout}->add_javascripts('autocomplete_customer.js');
-
-  $self->hidden_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => 'customer_autocomplete') .
-  $self->input_tag("$name_e\_name", (ref $value && $value->can('name')) ? $value->name : '', %params);
-}
-

 # simple version with select_tag
 sub vendor_selector {
 # simple version with select_tag
 sub vendor_selector {

-  my ($self, $name, $value, %params) = @_;
+  my ($self, $name, $value, %params) = _hashify(3, @_);

 
   my $actual_vendor_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"}) ? $::form->{"$name"}->id : $::form->{"$name"}) :
                          (ref $value && $value->can('id')) ? $value->id : '';
 
   my $actual_vendor_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"}) ? $::form->{"$name"}->id : $::form->{"$name"}) :
                          (ref $value && $value->can('id')) ? $value->id : '';


@@ -257,7 +204,7 @@ sub vendor_selector {
 
 # simple version with select_tag
 sub part_selector {
 
 # simple version with select_tag
 sub part_selector {

-  my ($self, $name, $value, %params) = @_;
+  my ($self, $name, $value, %params) = _hashify(3, @_);

 
   my $actual_part_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"})? $::form->{"$name"}->id : $::form->{"$name"}) :
                        (ref $value && $value->can('id')) ? $value->id : '';
 
   my $actual_part_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"})? $::form->{"$name"}->id : $::form->{"$name"}) :
                        (ref $value && $value->can('id')) ? $value->id : '';


@@ -285,8 +232,7 @@ sub javascript_tag {
 }
 
 sub tabbed {
 }
 
 sub tabbed {

-  my ($self, $tabs, @slurp) = @_;
-  my %params   = _hashify(@slurp);
+  my ($self, $tabs, %params) = _hashify(2, @_);

   my $id       = $params{id} || 'tab_' . _tag_id();
 
   $params{selected} *= 1;
   my $id       = $params{id} || 'tab_' . _tag_id();
 
   $params{selected} *= 1;


@@ -312,8 +258,7 @@ sub tabbed {
 }
 
 sub tab {
 }
 
 sub tab {

-  my ($self, $name, $src, @slurp) = @_;
-  my %params = _hashify(@slurp);
+  my ($self, $name, $src, %params) = _hashify(3, @_);

 
   $params{method} ||= 'process';
 
 
   $params{method} ||= 'process';
 


@@ -334,27 +279,20 @@ sub tab {
 }
 
 sub areainput_tag {
 }
 
 sub areainput_tag {

-  my ($self, $name, $value, @slurp) = @_;
-  my %attributes      = _hashify(@slurp);
+  my ($self, $name, $value, %attributes) = _hashify(3, @_);

 
 

-  my ($rows, $cols);
-  my $min  = delete $attributes{min_rows} || 1;
-
-  if (exists $attributes{cols}) {
-    $cols = delete $attributes{cols};
-    $rows = $::form->numtextrows($value, $cols);
-  } else {
-    $rows = delete $attributes{rows} || 1;
-  }
+  my $cols    = delete $attributes{cols} || delete $attributes{size};
+  my $minrows = delete $attributes{min_rows} || 1;
+  my $maxrows = delete $attributes{max_rows};
+  my $rows    = $::form->numtextrows($value, $cols, $maxrows, $minrows);

 
   return $rows > 1
 
   return $rows > 1

-    ? $self->textarea_tag($name, $value, %attributes, rows => max($rows, $min), ($cols ? (cols => $cols) : ()))
-    : $self->input_tag($name, $value, %attributes, ($cols ? (size => $cols) : ()));
+    ? $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols)
+    : $self->input_tag($name, $value, %attributes, size => $cols);

 }
 
 sub multiselect2side {
 }
 
 sub multiselect2side {

-  my ($self, $id, @slurp) = @_;
-  my %params              = _hashify(@slurp);
+  my ($self, $id, %params) = _hashify(2, @_);

 
   $params{labelsx}        = "\"" . _J($params{labelsx} || $::locale->text('Available')) . "\"";
   $params{labeldx}        = "\"" . _J($params{labeldx} || $::locale->text('Selected'))  . "\"";
 
   $params{labelsx}        = "\"" . _J($params{labelsx} || $::locale->text('Available')) . "\"";
   $params{labeldx}        = "\"" . _J($params{labeldx} || $::locale->text('Selected'))  . "\"";


@@ -373,8 +311,7 @@ EOCODE
 }
 
 sub sortable_element {
 }
 
 sub sortable_element {

-  my ($self, $selector, @slurp) = @_;
-  my %params                    = _hashify(@slurp);
+  my ($self, $selector, %params) = _hashify(2, @_);

 
   my %attributes = ( distance => 5,
                      helper   => <<'JAVASCRIPT' );
 
   my %attributes = ( distance => 5,
                      helper   => <<'JAVASCRIPT' );


@@ -393,8 +330,10 @@ JAVASCRIPT
     my $filter  = ".filter(function(idx) { return this.substr(0, " . length($params{with}) . ") == '$params{with}'; })";
     $filter    .= ".map(function(idx, str) { return str.replace('$params{with}_', ''); })";
 
     my $filter  = ".filter(function(idx) { return this.substr(0, " . length($params{with}) . ") == '$params{with}'; })";
     $filter    .= ".map(function(idx, str) { return str.replace('$params{with}_', ''); })";
 

+    my $params_js = $params{params} ? qq| + ($params{params})| : '';
+

     $stop_event = <<JAVASCRIPT;
     $stop_event = <<JAVASCRIPT;

-        \$.post('$params{url}', { '${as}[]': \$(\$('${selector}').sortable('toArray'))${filter}.toArray() });
+        \$.post('$params{url}'${params_js}, { '${as}[]': \$(\$('${selector}').sortable('toArray'))${filter}.toArray() });

 JAVASCRIPT
   }
 
 JAVASCRIPT
   }
 


@@ -430,63 +369,54 @@ JAVASCRIPT
   return $code;
 }
 
   return $code;
 }
 

-sub online_help_tag {
-  my ($self, $tag, @slurp) = @_;
-  my %params               = _hashify(@slurp);
-  my $cc                   = $::myconfig{countrycode};
-  my $file                 = "doc/online/$cc/$tag.html";
-  my $text                 = $params{text} || $::locale->text('Help');
-
-  die 'malformed help tag' unless $tag =~ /^[a-zA-Z0-9_]+$/;
-  return unless -f $file;
-  return $self->html_tag('a', $text, href => $file, class => 'jqModal')
-}
-

 sub dump {
   my $self = shift;
 sub dump {
   my $self = shift;

-  require Data::Dumper;

   return '<pre>' . Data::Dumper::Dumper(@_) . '</pre>';
 }
 
 sub sortable_table_header {
   return '<pre>' . Data::Dumper::Dumper(@_) . '</pre>';
 }
 
 sub sortable_table_header {

-  my ($self, $by, @slurp) = @_;
-  my %params              = _hashify(@slurp);
+  my ($self, $by, %params) = _hashify(2, @_);

 
   my $controller          = $self->{CONTEXT}->stash->get('SELF');
 
   my $controller          = $self->{CONTEXT}->stash->get('SELF');

-  my $sort_spec           = $controller->get_sort_spec;
+  my $models              = $params{models} || $self->{CONTEXT}->stash->get('MODELS');
+  my $sort_spec           = $models->get_sort_spec;

   my $by_spec             = $sort_spec->{$by};
   my $by_spec             = $sort_spec->{$by};

-  my %current_sort_params = $controller->get_current_sort_params;
+  my %current_sort_params = $models->get_current_sort_params;

   my ($image, $new_dir)   = ('', $current_sort_params{dir});
   my $title               = delete($params{title}) || $::locale->text($by_spec->{title});
 
   my ($image, $new_dir)   = ('', $current_sort_params{dir});
   my $title               = delete($params{title}) || $::locale->text($by_spec->{title});
 

-  if ($current_sort_params{by} eq $by) {
-    my $current_dir = $current_sort_params{dir} ? 'up' : 'down';
+  if ($current_sort_params{sort_by} eq $by) {
+    my $current_dir = $current_sort_params{sort_dir} ? 'up' : 'down';

     $image          = '<img border="0" src="image/' . $current_dir . '.png">';
     $image          = '<img border="0" src="image/' . $current_dir . '.png">';

-    $new_dir        = 1 - ($current_sort_params{dir} || 0);
+    $new_dir        = 1 - ($current_sort_params{sort_dir} || 0);

   }
 
   }
 

-  $params{ $sort_spec->{FORM_PARAMS}->[0] } = $by;
-  $params{ $sort_spec->{FORM_PARAMS}->[1] } = ($new_dir ? '1' : '0');
+  $params{ $models->sorted->form_params->[0] } = $by;
+  $params{ $models->sorted->form_params->[1] } = ($new_dir ? '1' : '0');

 
 

-  return '<a href="' . $controller->get_callback(%params) . '">' . _H($title) . $image . '</a>';
+  return '<a href="' . $models->get_callback(%params) . '">' . _H($title) . $image . '</a>';

 }
 
 sub paginate_controls {
 }
 
 sub paginate_controls {

-  my ($self)          = @_;
+  my ($self, %params) = _hashify(1, @_);

 
   my $controller      = $self->{CONTEXT}->stash->get('SELF');
 
   my $controller      = $self->{CONTEXT}->stash->get('SELF');

-  my $paginate_spec   = $controller->get_paginate_spec;
-  my %paginate_params = $controller->get_current_paginate_params;
+  my $models          = $params{models} || $self->{CONTEXT}->stash->get('MODELS');
+  my $pager           = $models->paginated;
+#  my $paginate_spec   = $controller->get_paginate_spec;
+
+  my %paginate_params = $models->get_paginate_args;

 
   my %template_params = (
     pages             => \%paginate_params,
     url_maker         => sub {
 
   my %template_params = (
     pages             => \%paginate_params,
     url_maker         => sub {

-      my %url_params                                    = _hashify(@_);
-      $url_params{ $paginate_spec->{FORM_PARAMS}->[0] } = delete $url_params{page};
-      $url_params{ $paginate_spec->{FORM_PARAMS}->[1] } = delete $url_params{per_page} if exists $url_params{per_page};
+      my %url_params                                    = _hashify(0, @_);
+      $url_params{ $pager->form_params->[0] } = delete $url_params{page};
+      $url_params{ $pager->form_params->[1] } = delete $url_params{per_page} if exists $url_params{per_page};

 
 

-      return $controller->get_callback(%url_params);
+      return $models->get_callback(%url_params);

     },
     },

+    %params,

   );
 
   return SL::Presenter->get->render('common/paginate', %template_params);
   );
 
   return SL::Presenter->get->render('common/paginate', %template_params);


@@ -521,6 +451,10 @@ Usage from a template:
 A module modeled a bit after Rails' ActionView helpers. Several small
 functions that create HTML tags from various kinds of data sources.
 
 A module modeled a bit after Rails' ActionView helpers. Several small
 functions that create HTML tags from various kinds of data sources.
 

+The C<id> attribute is usually calculated automatically. This can be
+overridden by either specifying an C<id> attribute or by setting
+C<no_id> to trueish.
+

 =head1 FUNCTIONS
 
 =head2 LOW-LEVEL FUNCTIONS
 =head1 FUNCTIONS
 
 =head2 LOW-LEVEL FUNCTIONS


@@ -566,28 +500,6 @@ Creates a HTML 'input type=hidden' tag named C<$name> with the value
 C<$value> and with arbitrary HTML attributes from C<%attributes>. The
 tag's C<id> defaults to C<name_to_id($name)>.
 
 C<$value> and with arbitrary HTML attributes from C<%attributes>. The
 tag's C<id> defaults to C<name_to_id($name)>.
 

-=item C<submit_tag $name, $value, %attributes>
-
-Creates a HTML 'input type=submit class=submit' tag named C<$name> with the
-value C<$value> and with arbitrary HTML attributes from C<%attributes>. The
-tag's C<id> defaults to C<name_to_id($name)>.
-
-If C<$attributes{confirm}> is set then a JavaScript popup dialog will
-be added via the C<onclick> handler asking the question given with
-C<$attributes{confirm}>. The request is only submitted if the user
-clicks the dialog's ok/yes button.
-
-=item C<button_tag $onclick, $text, %attributes>
-
-Creates a HTML 'input type="button"' tag with an onclick handler
-C<$onclick> and a value of C<$text>. The button does not have a name
-nor an ID by default.
-
-If C<$attributes{confirm}> is set then a JavaScript popup dialog will
-be prepended to the C<$onclick> handler asking the question given with
-C<$attributes{confirm}>. The request is only submitted if the user
-clicks the dialog's "ok/yes" button.
-

 =item C<textarea_tag $name, $value, %attributes>
 
 Creates a HTML 'textarea' tag named C<$name> with the content
 =item C<textarea_tag $name, $value, %attributes>
 
 Creates a HTML 'textarea' tag named C<$name> with the content


@@ -727,6 +639,11 @@ If trueish then the children will not be recolored. The default is to
 recolor the children by setting the class C<listrow0> on odd and
 C<listrow1> on even entries.
 
 recolor the children by setting the class C<listrow0> on odd and
 C<listrow1> on even entries.
 

+=item C<params>
+
+An optional JavaScript string that is evaluated before sending the
+POST request. The result must be a string that is appended to the URL.
+

 =back
 
 Example:
 =back
 
 Example: