X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCVar.pm;h=0a91c59f6438a445a28a49c75ccdfd9f88f73b9e;hb=4486e3bc8eb00c37cf8029e663eb94b4b9c5346a;hp=cdc05b5abf183825cb9045529333fbb702f315b5;hpb=8ab8cad9c06edcaa424a13cd6e23d39a02135f07;p=kivitendo-erp.git diff --git a/SL/CVar.pm b/SL/CVar.pm index cdc05b5ab..0a91c59f6 100644 --- a/SL/CVar.pm +++ b/SL/CVar.pm @@ -3,10 +3,11 @@ package CVar; use strict; use List::Util qw(first); +use Scalar::Util qw(blessed); use Data::Dumper; use SL::DBUtils; -use SL::MoreCommon qw(listify); +use SL::MoreCommon qw(any listify); sub get_configs { $main::lxdebug->enter_sub(); @@ -25,25 +26,41 @@ sub get_configs { push @values, $params{module}; } - my $query = qq|SELECT * FROM custom_variable_configs $where ORDER BY sortkey|; + my $query = <{CVAR_CONFIGS} = {} unless 'HASH' eq ref $::form->{CVAR_CONFIGS}; + if (!$::form->{CVAR_CONFIGS}->{$params{module}}) { + my $configs = selectall_hashref_query($form, $dbh, $query, @values); - foreach my $config (@{ $configs }) { - if ($config->{type} eq 'select') { - $config->{OPTIONS} = [ map { { 'value' => $_ } } split(m/\#\#/, $config->{options}) ]; + foreach my $config (@{ $configs }) { + if ($config->{type} eq 'select') { + $config->{OPTIONS} = [ map { { 'value' => $_ } } split(m/\#\#/, $config->{options}) ]; - } elsif ($config->{type} eq 'number') { - $config->{precision} = $1 if ($config->{options} =~ m/precision=(\d+)/i); + } elsif ($config->{type} eq 'number') { + $config->{precision} = $1 if ($config->{options} =~ m/precision=(\d+)/i); - } + } elsif ($config->{type} eq 'textfield') { + $config->{width} = 30; + $config->{height} = 5; + $config->{width} = $1 if ($config->{options} =~ m/width=(\d+)/i); + $config->{height} = $1 if ($config->{options} =~ m/height=(\d+)/i); - $self->_unpack_flags($config); + } elsif ($config->{type} eq 'text') { + $config->{maxlength} = $1 if ($config->{options} =~ m/maxlength=(\d+)/i); + + } + + $self->_unpack_flags($config); + } + $::form->{CVAR_CONFIGS}->{$params{module}} = $configs; } $main::lxdebug->leave_sub(); - return $configs; + return $::form->{CVAR_CONFIGS}->{$params{module}}; } sub get_config { @@ -168,8 +185,9 @@ sub delete_config { my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); - do_query($form, $dbh, qq|DELETE FROM custom_variables WHERE config_id = ?|, conv_i($params{id})); - do_query($form, $dbh, qq|DELETE FROM custom_variable_configs WHERE id = ?|, conv_i($params{id})); + do_query($form, $dbh, qq|DELETE FROM custom_variables WHERE config_id = ?|, conv_i($params{id})); + do_query($form, $dbh, qq|DELETE FROM custom_variables_validity WHERE config_id = ?|, conv_i($params{id})); + do_query($form, $dbh, qq|DELETE FROM custom_variable_configs WHERE id = ?|, conv_i($params{id})); $dbh->commit(); @@ -191,13 +209,6 @@ sub get_custom_variables { my $trans_id = $params{trans_id} ? 'OR (v.trans_id = ?) ' : ''; - my $q_cfg = - qq|SELECT id, name, description, type, default_value, options, - date_trunc('seconds', localtimestamp) AS current_timestamp, current_date AS current_date - FROM custom_variable_configs - WHERE module = ? - ORDER BY sortkey|; - my $q_var = qq|SELECT text_value, timestamp_value, timestamp_value::date AS date_value, number_value, bool_value FROM custom_variables @@ -205,7 +216,7 @@ sub get_custom_variables { $q_var .= qq| AND (sub_module = ?)| if $params{sub_module}; my $h_var = prepare_query($form, $dbh, $q_var); - my $custom_variables = selectall_hashref_query($form, $dbh, $q_cfg, $params{module}); + my $custom_variables = $self->get_configs(module => $params{module}); foreach my $cvar (@{ $custom_variables }) { if ($cvar->{type} eq 'textfield') { @@ -225,7 +236,7 @@ sub get_custom_variables { $cvar->{OPTIONS} = [ map { { 'value' => $_ } } split(m/\#\#/, $cvar->{options}) ]; } - my $act_var; + my ($act_var, $valid); if ($params{trans_id}) { my @values = (conv_i($cvar->{id}), conv_i($params{trans_id})); push @values, $params{sub_module} if $params{sub_module}; @@ -233,16 +244,19 @@ sub get_custom_variables { do_statement($form, $h_var, $q_var, @values); $act_var = $h_var->fetchrow_hashref(); - $act_var->{valid} = $self->get_custom_variables_validity(config_id => $cvar->{id}, trans_id => $params{trans_id}); + $valid = $self->get_custom_variables_validity(config_id => $cvar->{id}, trans_id => $params{trans_id}); } if ($act_var) { $cvar->{value} = $cvar->{type} eq 'date' ? $act_var->{date_value} : $cvar->{type} eq 'timestamp' ? $act_var->{timestamp_value} : $cvar->{type} eq 'number' ? $act_var->{number_value} + : $cvar->{type} eq 'customer' ? $act_var->{number_value} + : $cvar->{type} eq 'vendor' ? $act_var->{number_value} + : $cvar->{type} eq 'part' ? $act_var->{number_value} : $cvar->{type} eq 'bool' ? $act_var->{bool_value} : $act_var->{text_value}; - $cvar->{valid} = $act_var->{valid}; + $cvar->{valid} = $valid; } else { $cvar->{valid} = 1; @@ -273,6 +287,15 @@ sub get_custom_variables { if ($cvar->{type} eq 'number') { $cvar->{value} = $form->format_amount($myconfig, $cvar->{value} * 1, $cvar->{precision}); + } elsif ($cvar->{type} eq 'customer') { + require SL::DB::Customer; + $cvar->{value} = SL::DB::Manager::Customer->find_by(id => $cvar->{value} * 1); + } elsif ($cvar->{type} eq 'vendor') { + require SL::DB::Vendor; + $cvar->{value} = SL::DB::Manager::Vendor->find_by(id => $cvar->{value} * 1); + } elsif ($cvar->{type} eq 'part') { + require SL::DB::Part; + $cvar->{value} = SL::DB::Manager::Part->find_by(id => $cvar->{value} * 1); } } @@ -334,20 +357,24 @@ sub save_custom_variables { } elsif ($config->{type} eq 'bool') { push @values, $value ? 't' : 'f', undef, undef, undef; + } elsif (any { $config->{type} eq $_ } qw(customer vendor part)) { + push @values, undef, undef, undef, $value * 1; } do_statement($form, $sth, $query, @values); - unless ($params{always_valid}) { - $self->save_custom_variables_validity(trans_id => $params{trans_id}, config_id => $config->{id}, - validity => ($params{variables}->{"$params{name_prefix}cvar_$config->{name}$params{name_postfix}_valid"} ? 1 : 0) - ); - }; + if ($params{save_validity}) { + my $valid_index = "$params{name_prefix}cvar_$config->{name}$params{name_postfix}_valid"; + $self->save_custom_variables_validity(trans_id => $params{trans_id}, + config_id => $config->{id}, + validity => ($params{variables}{$valid_index} || $params{always_valid} ? 1 : 0) + ); + } } $sth->finish(); - $dbh->commit(); + $dbh->commit() unless $params{dbh}; $main::lxdebug->leave_sub(); } @@ -392,6 +419,7 @@ sub render_search_options { $params{include_prefix} = 'l_' unless defined($params{include_prefix}); $params{include_value} ||= '1'; + $params{filter_prefix} ||= ''; my $filter = $form->parse_html_template('amcvar/search_filter', \%params); my $include = $form->parse_html_template('amcvar/search_include', \%params); @@ -487,6 +515,17 @@ sub build_filter_query { $not = 'NOT' if ($params{filter}->{$name} eq 'no'); push @sub_where, qq|COALESCE(cvar.bool_value, false) = TRUE|; + } elsif (any { $config->{type} eq $_ } qw(customer vendor part)) { + next unless $params{filter}->{$name}; + + my $table = $config->{type}; + push @sub_where, qq|cvar.number_value * 1 IN (SELECT id FROM $table WHERE name ILIKE ?)|; + push @sub_values, "%$params{filter}->{$name}%"; + } elsif ($config->{type} eq 'part') { + next unless $params{filter}->{$name}; + + push @sub_where, qq|cvar.number_value * 1 IN (SELECT id FROM parts WHERE partnumber ILIKE ?)|; + push @sub_values, "%$params{filter}->{$name}%"; } if (@sub_where) { @@ -560,6 +599,9 @@ sub add_custom_variables_to_report { $cfg->{type} eq 'date' ? $ref->{date_value} : $cfg->{type} eq 'timestamp' ? $ref->{timestamp_value} : $cfg->{type} eq 'number' ? $form->format_amount($myconfig, $ref->{number_value} * 1, $cfg->{precision}) + : $cfg->{type} eq 'customer' ? (SL::DB::Manager::Customer->find_by(id => 1*$ref->{number_value}) || SL::DB::Customer->new)->name + : $cfg->{type} eq 'vendor' ? (SL::DB::Manager::Vendor->find_by(id => 1*$ref->{number_value}) || SL::DB::Vendor->new)->name + : $cfg->{type} eq 'part' ? (SL::DB::Manager::Part->find_by(id => 1*$ref->{number_value}) || SL::DB::Part->new)->partnumber : $cfg->{type} eq 'bool' ? ($ref->{bool_value} ? $locale->text('Yes') : $locale->text('No')) : $ref->{text_value}; } @@ -642,7 +684,7 @@ sub save_custom_variables_validity { $sth->finish(); - $dbh->commit(); + $dbh->commit() unless $params{dbh}; $main::lxdebug->leave_sub(); } @@ -669,6 +711,49 @@ sub get_custom_variables_validity { return !$invalid; } +sub custom_variables_validity_by_trans_id { + $main::lxdebug->enter_sub(2); + + my $self = shift; + my %params = @_; + + return sub { 0 } unless $params{trans_id}; + + my $myconfig = \%main::myconfig; + my $form = $main::form; + + my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); + + my $query = qq|SELECT config_id, COUNT(*) FROM custom_variables_validity WHERE trans_id = ? GROUP BY config_id|; + + my %invalids = selectall_as_map($form, $dbh, $query, 'config_id', 'count', $params{trans_id}); + + $main::lxdebug->leave_sub(2); + + return sub { !$invalids{+shift} }; +} + +sub parse { + my ($self, $value, $config) = @_; + + return $::form->parse_amount(\%::myconfig, $value) if $config->{type} eq 'number'; + return DateTime->from_lxoffice($value) if $config->{type} eq 'date'; + return !ref $value ? SL::DB::Manager::Customer->find_by(id => $value * 1) : $value if $config->{type} eq 'customer'; + return !ref $value ? SL::DB::Manager::Vendor->find_by(id => $value * 1) : $value if $config->{type} eq 'vendor'; + return !ref $value ? SL::DB::Manager::Part->find_by(id => $value * 1) : $value if $config->{type} eq 'part'; + return $value; +} + +sub format_to_template { + my ($self, $value, $config) = @_; + # stupid template expects everything formated. except objects + # do not use outside of print routines for legacy templates + + return $::form->format_amount(\%::myconfig, $value) if $config->{type} eq 'number'; + return $value->to_lxoffice if $config->{type} eq 'date' && blessed $value && $value->can('to_lxoffice'); + return $value; +} + 1; __END__