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

Bug Fixing : 

Using items.location where items.holdingbranch should have been used.
This commit is contained in:
hdl 2005-08-02 15:53:40 +00:00
parent e03cf24cce
commit dc5c9ebcc2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/default/en/reports/catalogue_stats.tmpl
View File

@ -157,8 +157,8 @@
</tr>
<!--TMPL_IF Name="hglghtLOC"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
<td>Location</td>
<td align="center"><input type="radio" name="Line" value="items.location"></td>
<td align="center"><input type="radio" name="Column" value="items.location"></td>
<td align="center"><input type="radio" name="Line" value="items.holdingbranch"></td>
<td align="center"><input type="radio" name="Column" value="items.holdingbranch"></td>
<td><!-- TMPL_VAR NAME="CGILocation" --> </td>
</tr>
</tbody>

12
reports/catalogue_stats.pl
View File

@ -216,12 +216,12 @@ if ($do_it) {
-size => 1,
-multiple => 0 );
$req = $dbh->prepare("select distinctrow location from items order by location");
$req = $dbh->prepare("select distinctrow holdingbranch from items order by holdingbranch");
$req->execute;
undef @select;
push @select,"";
my $CGIlocation=CGI::scrolling_list( -name => 'Filter',
-id => 'location',
-id => 'holdingbranch',
-values => \@select,
-size => 1,
-multiple => 0 );
@ -333,7 +333,7 @@ sub calculate {
$linefilter[0] = @$filters[8] if ($line =~ /publicationyear/ ) ;
$linefilter[1] = @$filters[9] if ($line =~ /publicationyear/ ) ;
@linefilter[0] = @$filters[10] if ($line =~ /items.homebranch/ ) ;
@linefilter[0] = @$filters[11] if ($line =~ /items.location/ ) ;
@linefilter[0] = @$filters[11] if ($line =~ /items.holdingbranch/ ) ;
#
my @colfilter ;
$colfilter[0] = @$filters[0] if ($column =~ /dewey/ ) ;
@ -347,7 +347,7 @@ sub calculate {
$colfilter[0] = @$filters[8] if ($column =~ /publicationyear/ ) ;
$colfilter[1] = @$filters[9] if ($column =~ /publicationyear/ ) ;
@colfilter[0] = @$filters[10] if ($column =~ /items.homebranch/ ) ;
@colfilter[0] = @$filters[11] if ($column =~ /items.location/ ) ;
@colfilter[0] = @$filters[11] if ($column =~ /items.holdingbranch/ ) ;
# 1st, loop rows.
my $linefield;
@ -559,9 +559,9 @@ sub calculate {
if (@$filters[11]){
@$filters[11]=~ s/\*/%/g;
if ($cond){
$strcalc .= " AND items.location like '" . @$filters[11] ."'" if ( @$filters[11] );
$strcalc .= " AND items.holdingbranch like '" . @$filters[11] ."'" if ( @$filters[11] );
} else {
$strcalc .= " WHERE items.location like '" . @$filters[11] ."'" if ( @$filters[11] );
$strcalc .= " WHERE items.holdingbranch like '" . @$filters[11] ."'" if ( @$filters[11] );
}
}