From a9de33537dd23f690936487d2c9a76e350697970 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Tue, 24 Jul 2012 13:30:23 +0200 Subject: [PATCH 2/2] Bug 7896: follow-up: Allow translation of strings --- .../prog/en/modules/reports/acquisitions_stats.tt | 35 ++++++++++++++---- reports/acquisitions_stats.pl | 38 +++----------------- 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt index 9b25715..0742336 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -18,10 +18,26 @@ [% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %]

Acquisitions statistics

- [% IF ( mainloo.loopfilter.size ) %] -

Filtered on:

- [% FOREACH loopfilte IN mainloo.loopfilter %] -

[% loopfilte.crit %]: [% loopfilte.filter %]

+ [% IF ( mainloo.loopfilter.size ) %] +

Filtered on:

+ [% FOREACH loopfilte IN mainloo.loopfilter %] +

+ [% SWITCH loopfilte.crit %] + [% CASE '0' %] Placed on (from) + [% CASE '1' %] Placed on (to) + [% CASE '2' %] Received on (from) + [% CASE '3' %] Received on (to) + [% CASE '4' %] Supplier + [% CASE '5' %] Home branch + [% CASE '6' %] Collection + [% CASE '7' %] Item type + [% CASE '8' %] Budget + [% CASE '9' %] Sort1 + [% CASE '10' %] Sort2 + [% CASE %] Unknown filter + [% END %] + : [% loopfilte.filter %] +

[% END %] [% END %] @@ -242,8 +258,15 @@ Vendor - [% CGIBookSeller %] - + + + + Home branch diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl index 9a74365..de4b0f3 100755 --- a/reports/acquisitions_stats.pl +++ b/reports/acquisitions_stats.pl @@ -117,30 +117,15 @@ if ($do_it) { } else { my $dbh = C4::Context->dbh; - my @select; - my %select; my $req; $req = $dbh->prepare("SELECT distinctrow id,name FROM aqbooksellers ORDER BY name"); $req->execute; - push @select, ""; - $select{''} = "All Suppliers"; - while ( my ( $value, $desc ) = $req->fetchrow ) { - push @select, $desc; - $select{$value}=$desc; - } - my $CGIBookSellers = CGI::scrolling_list( - -name => 'Filter', - -id => 'supplier', - -values => \@select, - -labels => \%select, - -size => 1, - -multiple => 0 - ); + my $booksellers = $req->fetchall_arrayref({}); $req = $dbh->prepare("SELECT DISTINCTROW itemtype,description FROM itemtypes ORDER BY description"); $req->execute; - undef @select; - undef %select; + my @select; + my %select; push @select, ""; $select{''} = "All Item Types"; while ( my ( $value, $desc ) = $req->fetchrow ) { @@ -256,7 +241,7 @@ else { } $template->param( - CGIBookSeller => $CGIBookSellers, + booksellers => $booksellers, CGIItemType => $CGIItemTypes, CGIBudget => $CGIBudget, hassort1 => $hassort1, @@ -305,20 +290,7 @@ sub calculate { } else { $cell{filter} = format_date(@$filters[$i]); } - given ($i) { - when (0) { $cell{crit} = "Placed On From" } - when (1) { $cell{crit} = "Placed On To" } - when (2) { $cell{crit} = "Received On From" } - when (3) { $cell{crit} = "Received On To" } - when (4) { $cell{crit} = "Bookseller" } - when (5) { $cell{crit} = "Home branch" } - when (6) { $cell{crit} = "Collection" } - when (7) { $cell{crit} = "Doc Type" } - when (8) { $cell{crit} = "Budget" } - when (9) { $cell{crit} = "Sort1" } - when (10) { $cell{crit} = "Sort2" } - default { $cell{crit} = "" } - } + $cell{crit} = $i; push @loopfilter, \%cell; } } -- 1.7.10.4