From 9816fbfe7ec8e672dc93685111082d3ac9d51800 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Fri, 16 Sep 2011 12:32:01 +0200 Subject: [PATCH] select_project in templates ausgelagert --- bin/mozilla/arap.pl | 120 +++----------------- templates/webpages/arap/select_project.html | 39 +++++++ 2 files changed, 53 insertions(+), 106 deletions(-) create mode 100644 templates/webpages/arap/select_project.html diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index fa2dd4239..3b1a44311 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -340,120 +340,28 @@ sub check_project { } sub select_project { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my $locale = $main::locale; - my $cgi = $main::cgi; + $::lxdebug->enter_sub; - $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' . - 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash | report'); + $::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' . + 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash | report'); my ($is_global, $nextsub) = @_; + my $project_list = delete $::form->{project_list}; - my @column_index = qw(ndx projectnumber description); - - my %column_data; - $column_data{ndx} = qq| |; - $column_data{projectnumber} = qq|| . $locale->text('Number') . qq||; - $column_data{description} = - qq|| . $locale->text('Description') . qq||; - - # list items with radio button on a form - $form->header; - - my $title = $locale->text('Select from one of the projects below'); - - print qq| - - -

{script}> - -{rownumber}> - - - - - - - - - - - - -

$title

- - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - -|; - - my $i = 0; - my $j; - foreach my $ref (@{ $form->{project_list} }) { - my $checked = ($i++) ? "" : "checked"; - - $ref->{name} =~ s/\"/"/g; - - $column_data{ndx} = - qq||; - $column_data{projectnumber} = - qq||; - $column_data{description} = qq||; - - $j++; - $j %= 2; - print qq| - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - - -{id}> - -|; - - } - - print qq| -

$ref->{projectnumber}

$ref->{description}

- - - -|; + map { delete $::form->{$_} } qw(action header update); - # delete action variable - map { delete $form->{$_} } qw(action project_list header update); - - # save all other form variables - foreach my $key (keys %${form}) { - next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); - $form->{$key} =~ s/\"/"/g; - print qq|\n|; + my @hiddens; + for my $key (keys %$::form) { + next if $key eq 'login' || $key eq 'password' || '' ne ref $::form->{$key}; + push @hiddens, { key => $key, value => $::form->{$key} }; } + push @hiddens, { key => 'is_global', value => $is_global }, + { key => 'project_selected_nextsub', value => $nextsub }; - print - $cgi->hidden('-name' => 'is_global', '-default' => [$is_global]) - . $cgi->hidden('-name' => 'project_selected_nextsub', '-default' => [$nextsub]) - . qq| - -
- -

+ $::form->header; + print $::form->parse_html_template('arap/select_project', { hiddens => \@hiddens, project_list => $project_list }); - - -|; - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub project_selected { diff --git a/templates/webpages/arap/select_project.html b/templates/webpages/arap/select_project.html new file mode 100644 index 000000000..f3fb66e7b --- /dev/null +++ b/templates/webpages/arap/select_project.html @@ -0,0 +1,39 @@ +[%- USE HTML %] +[%- USE T8 %] +[%- USE L %] +[%- USE LxERP %] + + +

[% 'Select from one of the projects below' | $T8 %]

+ +

+ + + + + + + +[%- FOREACH row IN project_list %] + + + + + [% L.hidden_tag('new_id_' _ loop.count, row.id) %] + [% L.hidden_tag('new_projectnumber_' _ loop.count, row.projectnumber) %] + +[%- END %] +

	[% 'Number' \| $T8 %]	[% 'Description' \| $T8 %]
[% L.radio_button_tag('ndx', value=loop.count, checked=loop.first) %]	[% row.projectnumber \| html %]	[% row.description \| html %]

+ +

+ +[% L.hidden_tag(row.key, row.value) FOREACH row = hiddens %] +[% L.hidden_tag('lastndx', project_list.size) %] +[% L.hidden_tag('nextsub', 'project_selected') %] +[% L.hidden_tag('rownumber', rownumber) %] +[% L.submit_tag('action', LxERP.t8('Continue')) %] + +

+ + + -- 2.20.1