From: Sven Schöling Date: Wed, 26 Oct 2011 09:20:48 +0000 (+0200) Subject: pe -> templates X-Git-Tag: release-2.7.0beta1~208 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1b83184af8383acf47b568697b87bafd7c377780;p=kivitendo-erp.git pe -> templates --- diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl index 532dcfac5..a9cee792d 100644 --- a/bin/mozilla/pe.pl +++ b/bin/mozilla/pe.pl @@ -42,604 +42,183 @@ use strict; # end of main sub add { - $main::lxdebug->enter_sub(); + $::lxdebug->enter_sub; + $::auth->assert('config'); - $main::auth->assert('config'); + $::form->{title} = "Add"; + $::form->{callback} ||= "$::form->{script}?action=add&type=$::form->{type}"; - my $form = $main::form; + call_sub("form_$::form->{type}"); - $form->{title} = "Add"; - - # construct callback - $form->{callback} = - "$form->{script}?action=add&type=$form->{type}" - unless $form->{callback}; - - call_sub("form_$form->{type}_header"); - call_sub("form_$form->{type}_footer"); - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub edit { - $main::lxdebug->enter_sub(); + $::lxdebug->enter_sub; + $::auth->assert('config'); - $main::auth->assert('config'); + $::form->{title} = "Edit"; - my $form = $main::form; - my %myconfig = %main::myconfig; - - # show history button - $form->{javascript} = qq||; - #/show hhistory button - $form->{title} = "Edit"; - - if ($form->{type} eq 'partsgroup') { - PE->get_partsgroup(\%myconfig, \%$form); + if ($::form->{type} eq 'partsgroup') { + PE->get_partsgroup(\%::myconfig, $::form); } - if ($form->{type} eq 'pricegroup') { - PE->get_pricegroup(\%myconfig, \%$form); + if ($::form->{type} eq 'pricegroup') { + PE->get_pricegroup(\%::myconfig, $::form); } - call_sub("form_$form->{type}_header"); - call_sub("form_$form->{type}_footer"); + call_sub("form_$::form->{type}"); - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub search { - $main::lxdebug->enter_sub(); - - $main::auth->assert('config'); - - my $form = $main::form; - my $locale = $main::locale; - - my ($report, $sort, $number); - if ($form->{type} eq 'partsgroup') { - $report = "partsgroup_report"; - $sort = 'partsgroup'; - $form->{title} = $locale->text('Groups'); - - $number = qq| - - | . $locale->text('Group') . qq| - - -|; - - } - - # for pricesgroups - if ($form->{type} eq 'pricegroup') { - $report = "pricegroup_report"; - $sort = 'pricegroup'; - $form->{title} = $locale->text('Pricegroup'); + $::lxdebug->enter_sub; + $::auth->assert('config'); - $number = qq| - - | . $locale->text('Pricegroup') . qq| - - -|; + $::form->header; + print $::form->parse_html_template('pe/search', { + is_pricegroup => $::form->{type} eq 'pricegroup', + }); - } - - $form->header; - - print qq| - - -
{script}> - - -{type}> - - - - - - - - - - - - -
$form->{title}
- - $number - - - - -
 | . $locale->text('All') . qq| -  | . $locale->text('Orphaned') . qq|
-
- - - -
- -
- - - -|; - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub save { - $main::lxdebug->enter_sub(); - - $main::auth->assert('config'); + $::lxdebug->enter_sub; + $::auth->assert('config'); - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - - if ($form->{type} eq 'partsgroup') { - $form->isblank("partsgroup", $locale->text('Group missing!')); - PE->save_partsgroup(\%myconfig, \%$form); - $form->redirect($locale->text('Group saved!')); + if ($::form->{type} eq 'partsgroup') { + $::form->isblank("partsgroup", $::locale->text('Group missing!')); + PE->save_partsgroup(\%::myconfig, $::form); + $::form->redirect($::locale->text('Group saved!')); } # choice pricegroup and save - if ($form->{type} eq 'pricegroup') { - $form->isblank("pricegroup", $locale->text('Pricegroup missing!')); - PE->save_pricegroup(\%myconfig, \%$form); - $form->redirect($locale->text('Pricegroup saved!')); + if ($::form->{type} eq 'pricegroup') { + $::form->isblank("pricegroup", $::locale->text('Pricegroup missing!')); + PE->save_pricegroup(\%::myconfig, $::form); + $::form->redirect($::locale->text('Pricegroup saved!')); } # saving the history - if(!exists $form->{addition} && $form->{id} ne "") { - $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber}; - $form->{addition} = "SAVED"; - $form->save_history; + if(!exists $::form->{addition} && $::form->{id} ne "") { + $::form->{snumbers} = qq|projectnumber_| . $::form->{projectnumber}; + $::form->{addition} = "SAVED"; + $::form->save_history; } # /saving the history - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub delete { - $main::lxdebug->enter_sub(); - - $main::auth->assert('config'); - - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; + $::lxdebug->enter_sub; + $::auth->assert('config'); - PE->delete_tuple(\%myconfig, \%$form); + PE->delete_tuple(\%::myconfig, $::form); - if ($form->{type} eq 'partsgroup') { - $form->redirect($locale->text('Group deleted!')); + if ($::form->{type} eq 'partsgroup') { + $::form->redirect($::locale->text('Group deleted!')); } - if ($form->{type} eq 'pricegroup') { - $form->redirect($locale->text('Pricegroup deleted!')); + if ($::form->{type} eq 'pricegroup') { + $::form->redirect($::locale->text('Pricegroup deleted!')); } # saving the history - if(!exists $form->{addition}) { - $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber}; - $form->{addition} = "DELETED"; - $form->save_history; + if(!exists $::form->{addition}) { + $::form->{snumbers} = qq|projectnumber_| . $::form->{projectnumber}; + $::form->{addition} = "DELETED"; + $::form->save_history; } # /saving the history - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } -sub continue { call_sub($main::form->{"nextsub"}); } +sub continue { call_sub($::form->{nextsub}); } sub partsgroup_report { - $main::lxdebug->enter_sub(); + $::lxdebug->enter_sub; + $::auth->assert('config'); - $main::auth->assert('config'); + $::form->{$_} = $::form->unescape($::form->{$_}) for qw(partsgroup); + PE->partsgroups(\%::myconfig, $::form); - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; + my $callback = build_std_url("action=partsgroup_report", qw(type status)); - map { $form->{$_} = $form->unescape($form->{$_}) } qw(partsgroup); - PE->partsgroups(\%myconfig, \%$form); + my $option = ''; + $option .= $::locale->text('All') if $::form->{status} eq 'all'; + $option .= $::locale->text('Orphaned') if $::form->{status} eq 'orphaned'; - my $callback = - "$form->{script}?action=partsgroup_report&type=$form->{type}&status=$form->{status}"; - - my ($option); - if ($form->{status} eq 'all') { - $option = $locale->text('All'); - } - if ($form->{status} eq 'orphaned') { - $option .= $locale->text('Orphaned'); - } - if ($form->{partsgroup}) { - $callback .= "&partsgroup=$form->{partsgroup}"; - $option .= "\n
" . $locale->text('Group') . " : $form->{partsgroup}"; + if ($::form->{partsgroup}) { + $callback .= "&partsgroup=$::form->{partsgroup}"; + $option .= ", " . $::locale->text('Group') . " : $::form->{partsgroup}"; } - my @column_index = $form->sort_columns(qw(partsgroup)); - my %column_header; - $column_header{partsgroup} = - qq|| . $locale->text('Group') . qq||; - - $form->{title} = $locale->text('Groups'); - - $form->header; - - print qq| - - - - - - - - - - - - - - - - -
$form->{title}
$option
- - -|; - - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; - # escape callback - $form->{callback} = $callback; - - # escape callback for href - $callback = $form->escape($callback); - - my ($i, %column_data); - foreach my $ref (@{ $form->{item_list} }) { - - $i++; - $i %= 2; - - print qq| - -|; - - $column_data{partsgroup} = - qq||; - map { print "$column_data{$_}\n" } @column_index; - - print " - -"; - } - - print qq| -
{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&callback=$callback>$ref->{partsgroup}
-
- -
-
{script}> - - - -{type}> - - + $::form->{callback} = $callback; -
+ $::form->header; + print $::form->parse_html_template('pe/partsgroup_report', { + option => $option, + callback => $callback, + editlink => build_std_url('action=edit', qw(type status callback)), + }); - - -|; - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } -sub form_partsgroup_header { - $main::lxdebug->enter_sub(); - - $main::auth->assert('config'); - - my $form = $main::form; - my $locale = $main::locale; - - $form->{title} = $locale->text("$form->{title} Group"); +sub form_partsgroup { + $::lxdebug->enter_sub; + $::auth->assert('config'); # $locale->text('Add Group') # $locale->text('Edit Group') + $::form->{title} = $::locale->text("$::form->{title} Group"); - $form->{partsgroup} =~ s/\"/"/g; - - $form->header; - - print qq| - - -
{script}> - -{id}> -{type}> - - - - - - - - - - - - -
$form->{title}
- - - - - -
| . $locale->text('Group') . qq|
-
-|; - - $main::lxdebug->leave_sub(); -} + $::form->header; + print $::form->parse_html_template('pe/partsgroup_form'); -sub form_partsgroup_footer { - $main::lxdebug->enter_sub(); - - $main::auth->assert('config'); - - my $form = $main::form; - my $locale = $main::locale; - - print qq| - - - -
-|; - - if ($form->{id} && $form->{orphaned}) { - print qq| -|; - } - -# button for saving history -print qq| - {id} - . qq|); name=history id=history value=| - . $locale->text('history') - . qq|>|; -# /button for saving history - print qq| -
- - - -|; - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } -################################# -# get pricesgroups and build up html-code -# sub pricegroup_report { - $main::lxdebug->enter_sub(); + $::lxdebug->enter_sub; + $::auth->assert('config'); - $main::auth->assert('config'); + $::form->{$_} = $::form->unescape($::form->{$_}) for qw(pricegroup); + PE->pricegroups(\%::myconfig, $::form); - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; + my $callback = build_std_url('action=pricegroup_report', qw(type status)); - map { $form->{$_} = $form->unescape($form->{$_}) } qw(pricegroup); - PE->pricegroups(\%myconfig, \%$form); + my $option = ''; + $option .= $::locale->text('All') if $::form->{status} eq 'all'; + $option .= $::locale->text('Orphaned') if $::form->{status} eq 'orphaned'; - my $callback = - "$form->{script}?action=pricegroup_report&type=$form->{type}&status=$form->{status}"; - - my $option; - if ($form->{status} eq 'all') { - $option = $locale->text('All'); - } - if ($form->{status} eq 'orphaned') { - $option .= $locale->text('Orphaned'); + if ($::form->{pricegroup}) { + $callback .= "&pricegroup=$::form->{pricegroup}"; + $option .= ", " . $::locale->text('Pricegroup') . " : $::form->{pricegroup}"; } - if ($form->{pricegroup}) { - $callback .= "&pricegroup=$form->{pricegroup}"; - $option .= - "\n
" . $locale->text('Pricegroup') . " : $form->{pricegroup}"; - } - - my @column_index = $form->sort_columns(qw(pricegroup)); - my %column_header; - $column_header{pricegroup} = - qq|| - . $locale->text('Pricegroup') - . qq||; - - $form->{title} = $locale->text('Pricegroup'); - - $form->header; - - print qq| - - - - - - - - - - - - - - - - -
$form->{title}
$option
- - -|; - - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; # escape callback - $form->{callback} = $callback; - - # escape callback for href - $callback = $form->escape($callback); - - my ($i, %column_data); - foreach my $ref (@{ $form->{item_list} }) { - - $i++; - $i %= 2; + $::form->{callback} = $callback; - print qq| - -|; - $column_data{pricegroup} = - qq||; + $::form->header; + print $::form->parse_html_template('pe/pricegroup_report', { + option => $option, + callback => $callback, + editlink => build_std_url('action=edit', qw(type status callback)), + }); - map { print "$column_data{$_}\n" } @column_index; - - print " - -"; - } - - print qq| -
{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&callback=$callback>$ref->{pricegroup}
-
- -
-
{script}> - - - -{type}> - - - -
- - - -|; - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } -####################### -#build up pricegroup_header -# -sub form_pricegroup_header { - $main::lxdebug->enter_sub(); - - $main::auth->assert('config'); - - my $form = $main::form; - my $locale = $main::locale; +sub form_pricegroup { + $::lxdebug->enter_sub; + $::auth->assert('config'); # $locale->text('Add Pricegroup') # $locale->text('Edit Pricegroup') + $::form->{title} = $::locale->text("$::form->{title} Pricegroup"); - $form->{title} = $locale->text("$form->{title} Pricegroup"); - - $form->{pricegroup} =~ s/\"/"/g; - - $form->header; - - print qq| - - -
{script}> - -{id}> -{type}> - - - - - - - - - - - - -
$form->{title}
- - - - - -
| . $locale->text('Preisgruppe') . qq|
-
-|; - - $main::lxdebug->leave_sub(); -} -###################### -#build up pricegroup_footer -# -sub form_pricegroup_footer { - $main::lxdebug->enter_sub(); - - $main::auth->assert('config'); - - my $form = $main::form; - my $locale = $main::locale; - - print qq| - - - -
-|; - - if ($form->{id} && $form->{orphaned}) { - print qq| -|; - } + $::form->header; + print $::form->parse_html_template('pe/pricegroup_form'); -# button for saving history -print qq| - {id} - . qq|); name=history id=history value=| - . $locale->text('history') - . qq|>|; -# /button for saving history - print qq| -
- - - -|; - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } diff --git a/templates/webpages/pe/partsgroup_form.html b/templates/webpages/pe/partsgroup_form.html new file mode 100644 index 000000000..99ea2334e --- /dev/null +++ b/templates/webpages/pe/partsgroup_form.html @@ -0,0 +1,44 @@ +[%- USE L %] +[%- USE T8 %] +[%- USE HTML %] +[% L.javascript_tag('show_history.js') %] + + +
+ + + + + + + + + + + + + + + +
[% title %]
+ + + + + +
[% 'Group' | $T8 %]
+
+ +
+ + + +[%- IF id && orphaned %] + +[%- END %] + + +
+ + + diff --git a/templates/webpages/pe/partsgroup_report.html b/templates/webpages/pe/partsgroup_report.html new file mode 100644 index 000000000..c66bb4932 --- /dev/null +++ b/templates/webpages/pe/partsgroup_report.html @@ -0,0 +1,41 @@ +[%- USE HTML %] +[%- USE T8 %] + + + + + + + + + + + + + + + + +
[% 'Groups' | $T8 %]
[% option %]
+ + + + +[%- FOREACH row = item_list %] + + + +[%- END %] +
[% 'Group' | $T8 %]
[% row.partsgroup %]
+
+ +
+
+ + + +
+ + + + diff --git a/templates/webpages/pe/pricegroup_form.html b/templates/webpages/pe/pricegroup_form.html new file mode 100644 index 000000000..d1b022d1e --- /dev/null +++ b/templates/webpages/pe/pricegroup_form.html @@ -0,0 +1,44 @@ +[%- USE L %] +[%- USE T8 %] +[%- USE HTML %] +[% L.javascript_tag('show_history.js') %] + + +
+ + + + + + + + + + + + + + +
[% title %]
+ + + + + +
[% 'Pricegroup' | $T8 %]
+
+ +
+ + + +[%- IF id && orphaned %] + +[%- END %] + + +
+ + + diff --git a/templates/webpages/pe/pricegroup_report.html b/templates/webpages/pe/pricegroup_report.html new file mode 100644 index 000000000..c205a1b3f --- /dev/null +++ b/templates/webpages/pe/pricegroup_report.html @@ -0,0 +1,41 @@ +[%- USE HTML %] +[%- USE T8 %] + + + + + + + + + + + + + + + + +
[% 'Pricegroup' | $T8 %]
[% option %]
+ + + + +[%- FOREACH row = item_list %] + + + +[%- END %] +
[% 'Pricegroup' | $T8 %]
[% row.pricegroup %]
+
+ +
+
+ + + +
+ + + + diff --git a/templates/webpages/pe/search.html b/templates/webpages/pe/search.html new file mode 100644 index 000000000..6ea5be4a8 --- /dev/null +++ b/templates/webpages/pe/search.html @@ -0,0 +1,48 @@ +[%- USE T8 %] +[%- USE LxERP %] + + +
+ + + + + + + + + + + + + + + +
[% is_pricegroup ? LxERP.t8('Pricegroup') : LxERP.t8('Groups') %]
+ + +[%- IF is_pricegroup %] + + +[%- ELSE %] + + +[%- END %] + + + + + +
[% 'Pricegroup' | $T8 %][% 'Group' | $T8 %]
[% 'All' | $T8 %] + [% 'Orphaned' | $T8 %]
+
+ + + +
+ +
+ + + +