sub calculate_qty {
$lxdebug->enter_sub();
- my @variable_sort = ();
- my %variable_list = ();
- my $unit_list = ();
$form->{formel} =~ s/\r\n//g;
my ($variable_string, $formel) = split /###/,$form->{formel};
-
- split m/;/, $variable_string;
- foreach $item (@_) {
- my($name, $valueunit) = split /=/,$item;
- my($value, $unit) = split / /, $valueunit;
-
- push(@variable_sort, $value);
- $variable_list{$value} = $name;
- $unit_list{$value} = $unit;
+ foreach $item (split m/;/, $variable_string) {
+ next unless $item =~ m/^ \s* (\w+) \s* = \s* (\w+) \s* (\w+) \s* $/x;
+ push @variable, {
+ description => $1,
+ name => $2,
+ unit => $3,
+ };
}
my @header_sort = qw(variable value unit);
- my %header_title = ( "variable" => $locale->text("Variable"),
- "value" => $locale->text("Value"),
- "unit" => $locale->text("Unit"),
- );
+ my %header_title = (
+ variable => $locale->text("Variable"),
+ value => $locale->text("Value"),
+ unit => $locale->text("Unit"),
+ );
+ my @header = map +{
+ column_title => $header_title{$_},
+ column => $_,
+ }, @header_sort;
- my @variable = map(+{ "description" => $variable_list{$_},
- "name" => $_,
- "unit" => $unit_list{$_} }, @variable_sort);
-
- my @header =
- map(+{ "column_title" => $header_title{$_},
- "column" => $_,
- },
- @header_sort);
$form->{formel} = $formel;
- $form->{"title"} = $locale->text("Please enter values");
+ $form->{title} = $locale->text("Please enter values");
$form->header();
- print($form->parse_html_template("generic/calculate_qty", { "HEADER" => \@header,
+ print $form->parse_html_template("generic/calculate_qty", { "HEADER" => \@header,
"VARIABLES" => \@variable,
- "onload" => $onload }));
+ "onload" => $onload });
$lxdebug->leave_sub();
}
$dateformat = $myconfig{"dateformat"} unless ($dateformat);
foreach my $idx (@indices) {
+ if ($form->{TEMPLATE_ARRAYS} && (ref($form->{TEMPLATE_ARRAYS}->{$idx}) eq "ARRAY")) {
+ for (my $i = 0; $i < scalar(@{$form->{TEMPLATE_ARRAYS}->{$idx}}); $i++) {
+ $form->{TEMPLATE_ARRAYS}->{$idx}->[$i] =
+ $locale->reformat_date(\%myconfig, $form->{TEMPLATE_ARRAYS}->{$idx}->[$i],
+ $dateformat, $longformat);
+ }
+ }
+
next unless (defined($form->{$idx}));
if (!ref($form->{$idx})) {
if (!$numberformat || ($numberformat eq $myconfig{"numberformat"}));
foreach my $idx (@indices) {
+ if ($form->{TEMPLATE_ARRAYS} && (ref($form->{TEMPLATE_ARRAYS}->{$idx}) eq "ARRAY")) {
+ for (my $i = 0; $i < scalar(@{$form->{TEMPLATE_ARRAYS}->{$idx}}); $i++) {
+ $form->{TEMPLATE_ARRAYS}->{$idx}->[$i] = $form->parse_amount(\%myconfig, $form->{TEMPLATE_ARRAYS}->{$idx}->[$i]);
+ }
+ }
+
next unless (defined($form->{$idx}));
if (!ref($form->{$idx})) {
$myconfig{"numberformat"} = $numberformat;
foreach my $idx (@indices) {
+ if ($form->{TEMPLATE_ARRAYS} && (ref($form->{TEMPLATE_ARRAYS}->{$idx}) eq "ARRAY")) {
+ for (my $i = 0; $i < scalar(@{$form->{TEMPLATE_ARRAYS}->{$idx}}); $i++) {
+ $form->{TEMPLATE_ARRAYS}->{$idx}->[$i] = $form->format_amount(\%myconfig, $form->{TEMPLATE_ARRAYS}->{$idx}->[$i], $places);
+ }
+ }
+
next unless (defined($form->{$idx}));
if (!ref($form->{$idx})) {
$cov->{address} =~ s{^,}{}x;
$cov->{address} =~ s{\ +}{\ }gx;
- $cov->{contact} = join " ", map { $cov->{$_} } qw(cp_greeting cp_title cp_givenname cp_name);
+ $cov->{contact} = join " ", map { $cov->{$_} } qw(cp_gender cp_title cp_givenname cp_name);
$cov->{contact} =~ s{\ +}{\ }gx;
}