gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 7896: follow-up: Allow translation of strings 

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This commit is contained in:
Julian Maurice 2012-07-24 13:30:23 +02:00 committed by Jared Camins-Esakov
parent ae549864b0
commit 3fe43df7f5
2 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
View File

@ -51,10 +51,26 @@
[% IF ( do_it ) %]
[% FOREACH mainloo IN mainloop %]
<h1>Acquisitions statistics </h1>
[% IF ( mainloo.loopfilter.size ) %]
<p><b>Filtered on:</b></p>
[% FOREACH loopfilte IN mainloo.loopfilter %]
<p>[% loopfilte.crit %]: [% loopfilte.filter %]</p>
[% IF ( mainloo.loopfilter.size ) %]
<p><b>Filtered on:</b></p>
[% FOREACH loopfilte IN mainloo.loopfilter %]
<p>
[% 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 %]
</p>
[% END %]
[% END %]
@ -155,8 +171,15 @@
<td>Vendor</td>
<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
<td>[% CGIBookSeller %]</td>
</tr>
<td>
<select name="Filter">
<option value="">All suppliers</option>
[% FOREACH bookseller IN booksellers %]
<option value="[% bookseller.name %]">[% bookseller.name %]</option>
[% END %]
</select>
</td>
</tr>
<tr>
<td>Home branch</td>
<td><input type="radio" name="Line" value="items.homebranch" /></td>

38
reports/acquisitions_stats.pl
View File

@ -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;
}
}