Fix so that reserves are only showing for the biblioitem not the biblio on

the moremembers screen
This commit is contained in:
rangi 2002-03-13 02:03:56 +00:00
parent 9d891b5f41
commit 5849a03b30
2 changed files with 55 additions and 8 deletions

View file

@ -15,7 +15,8 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
$VERSION = 0.01;
@ISA = qw(Exporter);
@EXPORT = qw(&FindReserves &CreateReserve &updatereserves &getreservetitle);
@EXPORT = qw(&FindReserves &CreateReserve &updatereserves &getreservetitle
Findgroupreserve);
%EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ],
# your exported package globals go here,
@ -89,6 +90,28 @@ sub FindReserves {
return($i,\@results);
}
sub Findgroupreserve {
my ($bibitem)=@_;
my $dbh=C4Connect;
$bibitem=$dbh->quote($bibitem);
my $query="Select * from reserves,reserveconstraints where
reserves.biblionumber=reservesconstraints.biblionumber and
and reserveconstraints.biblioitemnumber=$bibitem
and reserves.cancellationdate is NULL
and (reserves.found <> 'F' or reserves.found is NULL)";
my $sth=$dbh->prepare($query);
$sth->execute;
my $i=0;
my @results;
while (my $data=$sth->fetchrow_hashref){
$results[$i]=$data;
$i++;
}
$sth->finish;
$dbh->disconnect;
return($i,@results);
}
sub CreateReserve {
my
($env,$branch,$borrnum,$biblionumber,$constraint,$bibitems,$priority,$notes,$title)= @_;

View file

@ -59,12 +59,25 @@ print <<printend
<FONT SIZE=2 face="arial, helvetica">$data->{'title'} $data->{'othernames'} $data->{'surname'} ($data->{'firstname'}, $data->{'initials'})<p>
Card Number: $data->{'cardnumber'}<BR>
printend
;
if ($data->{'categorycode'} eq 'C'){
my $data2=borrdata('',$data->{'guarantor'});
$data->{'streetaddress'}=$data2->{'streetaddress'};
$data->{'city'}=$data2->{'city'};
$data->{'physstreet'}=$data2->{'phystreet'};
$data->{'streetcity'}=$data2->{'streetcity'};
$data->{'phone'}=$data2->{'phone'};
$data->{'phoneday'}=$data2->{'phoneday'};
}
print <<printend
Postal Address: $data->{'streetaddress'}, $data->{'city'}<BR>
Home Address: $data->{'physstreet'}, $data->{'streetcity'}<BR>
Phone (Home): $data->{'phone'}<BR>
Phone (Daytime): $data->{'phoneday'}<BR>
Fax: $data->{'faxnumber'}<BR>
E-mail: <a href="mailto:$data->{'emailaddress'}">$data->{'emailaddress'}</a><P>
E-mail: <a href="mailto:$data->{'emailaddress'}">$data->{'emailaddress'}</a><br>
Textmessaging:$data->{'textmessaging'}<p>
Membership Number: $data->{'borrowernumber'}<BR>
Membership: $data->{'categorycode'}<BR>
Area: $data->{'area'}<BR>
@ -79,13 +92,24 @@ Alternative Contact:$data->{'contactname'}<BR>
Phone: $data->{'altphone'}<BR>
Relationship: $data->{'altrelationship'}<BR>
Notes: $data->{'altnotes'}<P>
Guarantees:
printend
;
if ($data->{'categorycode'} ne 'C'){
print " Guarantees:";
my ($count,$guarantees)=findguarantees($data->{'borrowernumber'});
for (my $i=0;$i<$count;$i++){
print "<A HREF=\"/cgi-bin/koha/moremember.pl?bornum=$guarantees->[$i]->{'borrowernumber'}\">$guarantees->[$i]->{'cardnumber'}</a><br>";
}
} else {
print "Guarantor:";
my ($guarantor)=findguarantor($data->{'borrowernumber'});
if ($guarantor->{'borrowernumber'} == 0){
print "no guarantor<br>";
} else {
print "<A HREF=\"/cgi-bin/koha/moremember.pl?bornum=$guarantor->{'borrowernumber'}\">$guarantor->{'cardnumber'}</a><br>";
}
}
print <<printend
@ -202,7 +226,7 @@ for (my $i=0;$i<$count;$i++){
# print "<td> &nbsp; </td>";
# }
#check item is not reserved
my ($rescount,$reserves)=FindReserves($issue->[$i]{'biblionumber'},'');
my ($rescount,$reserves)=Findgroupreserve($issue->[$i]{'biblionumber'},'');
if ($rescount >0){
print "<TD><a href=/cgi-bin/koha/request.pl?bib=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>";
# } elsif ($issue->[$i]->{'renewals'} > 0) {
@ -257,7 +281,7 @@ for (my $i=0;$i<$rescount;$i++){
@temp=split('-',$reserves->[$i]{'reservedate'});
$reserves->[$i]{'reservedate'}="$temp[2]/$temp[1]/$temp[0]";
print "<tr VALIGN=TOP >
<TD><a href=\"/cgi-bin/koha/request.pl?bib=$reserves->[$i]{'biblionumber'}\">$reserves->[$i]{'title'}</a></td>
<TD><a href=\"/cgi-bin/koha/request.pl?bib=$reserves->[$i]{'biblionumber'}\">$reserves->[$i]{'btitle'}</a></td>
<TD>$reserves->[$i]{'reservedate'}</td>
<input type=hidden name=biblio value=$reserves->[$i]{'biblionumber'}>
<input type=hidden name=borrower value=$bornum>