X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCVar.pm;h=0ace069027da47f263262c49e4fa1f9e40a73fc9;hb=5d244100bb104bb9319cd806fdf072fa37253d1c;hp=25f243185ef15105ef2b9fc1b19a33f2b91df811;hpb=d6adcf010d7c644865121af9efc0c1fe6663867d;p=kivitendo-erp.git diff --git a/SL/CVar.pm b/SL/CVar.pm index 25f243185..0ace06902 100644 --- a/SL/CVar.pm +++ b/SL/CVar.pm @@ -55,6 +55,10 @@ SQL } $self->_unpack_flags($config); + + my $cvar_config = SL::DB::CustomVariableConfig->new(id => $config->{id})->load; + @{$config->{'partsgroups'}} = map {$_->id} @{$cvar_config->partsgroups}; + } $::form->{CVAR_CONFIGS}->{$params{module}} = $configs; } @@ -94,13 +98,12 @@ sub get_custom_variables { my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); - my $trans_id = $params{trans_id} ? 'OR (v.trans_id = ?) ' : ''; + my $sub_module = $params{sub_module} ? $params{sub_module} : ''; my $q_var = qq|SELECT text_value, timestamp_value, timestamp_value::date AS date_value, number_value, bool_value FROM custom_variables - WHERE (config_id = ?) AND (trans_id = ?)|; - $q_var .= qq| AND (sub_module = ?)| if $params{sub_module}; + WHERE (config_id = ?) AND (trans_id = ?) AND (sub_module = ?)|; my $h_var = prepare_query($form, $dbh, $q_var); my $custom_variables = $self->get_configs(module => $params{module}); @@ -125,13 +128,14 @@ sub get_custom_variables { 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}; + my @values = (conv_i($cvar->{id}), conv_i($params{trans_id}), $sub_module); do_statement($form, $h_var, $q_var, @values); $act_var = $h_var->fetchrow_hashref(); $valid = $self->get_custom_variables_validity(config_id => $cvar->{id}, trans_id => $params{trans_id}); + } else { + $valid = !$cvar->{flag_defaults_to_invalid}; } if ($act_var) { @@ -145,7 +149,7 @@ sub get_custom_variables { : $act_var->{text_value}; $cvar->{valid} = $valid; } else { - $cvar->{valid} = 1; + $cvar->{valid} = $valid // 1; if ($cvar->{type} eq 'date') { if ($cvar->{default_value} eq 'NOW') { @@ -277,13 +281,20 @@ sub render_inputs { my $myconfig = \%main::myconfig; my $form = $main::form; - my %options = ( name_prefix => "$params{name_prefix}", - name_postfix => "$params{name_postfix}", - hide_non_editable => $params{hide_non_editable}, + my %options = ( name_prefix => "$params{name_prefix}", + name_postfix => "$params{name_postfix}", + hide_non_editable => $params{hide_non_editable}, show_disabled_message => $params{show_disabled_message}, ); + # should this cvar be filtered by partsgroups? foreach my $var (@{ $params{variables} }) { + if ($var->{flag_partsgroup_filter}) { + if (!$params{partsgroup_id} || (!grep {$params{partsgroup_id} == $_} @{ $var->{partsgroups} })) { + $var->{partsgroup_filtered} = 1; + } + } + $var->{HTML_CODE} = $form->parse_html_template('amcvar/render_inputs', { var => $var, %options }); $var->{VALID_BOX} = $form->parse_html_template('amcvar/render_checkboxes', { var => $var, %options }); } @@ -402,7 +413,7 @@ 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)) { + } elsif (any { $config->{type} eq $_ } qw(customer vendor)) { next unless $params{filter}->{$name}; my $table = $config->{type}; @@ -589,7 +600,7 @@ sub get_custom_variables_validity { my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); - my $query = qq|SELECT COUNT(*) FROM custom_variables_validity WHERE config_id = ? AND trans_id = ?|; + my $query = qq|SELECT id FROM custom_variables_validity WHERE config_id = ? AND trans_id = ? LIMIT 1|; my ($invalid) = selectfirst_array_query($form, $dbh, $query, conv_i($params{config_id}), conv_i($params{trans_id})); @@ -611,9 +622,9 @@ sub custom_variables_validity_by_trans_id { 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 $query = qq|SELECT DISTINCT config_id FROM custom_variables_validity WHERE trans_id = ?|; - my %invalids = selectall_as_map($form, $dbh, $query, 'config_id', 'count', $params{trans_id}); + my %invalids = map { +($_->{config_id} => 1) } selectall_hashref_query($form, $dbh, $query, $params{trans_id}); $main::lxdebug->leave_sub(2); @@ -641,6 +652,56 @@ sub format_to_template { return $value; } +sub get_non_editable_ic_cvars { + $main::lxdebug->enter_sub(2); + my $self = shift; + my %params = @_; + + Common::check_params(\%params, qw(form dbh row sub_module may_converted_from)); + my $form = $params{form}; + my $dbh = $params{dbh}; + my $row = $params{row}; + my $sub_module = $params{sub_module}; + my $may_converted_from = $params{may_converted_from}; + + my $cvars; + if (! $form->{"${sub_module}_id_${row}"}) { + my $conv_from = 0; + foreach (@{ $may_converted_from }) { + if ($form->{"converted_from_${_}_id_$row"}) { + $cvars = CVar->get_custom_variables(dbh => $dbh, + module => 'IC', + sub_module => $_, + trans_id => $form->{"converted_from_${_}_id_$row"}, + ); + $conv_from = 1; + last; + } + } + # get values for CVars from master data for new items + if (!$conv_from) { + $cvars = CVar->get_custom_variables(dbh => $dbh, + module => 'IC', + trans_id => $form->{"id_$row"}, + ); + } + } else { + # get values for CVars from custom_variables for existing items + $cvars = CVar->get_custom_variables(dbh => $dbh, + module => 'IC', + sub_module => $sub_module, + trans_id => $form->{"${sub_module}_id_${row}"}, + ); + } + # map only non-editable CVars to form + foreach (@{ $cvars }) { + next if $_->{flag_editable}; + $form->{"ic_cvar_$_->{name}_$row"} = $_->{value} + } + + $main::lxdebug->leave_sub(2); +} + 1; __END__