Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Now uses Circ2.pm generic interface subroutines.

Browse source
This commit is contained in:
tonnesen 2001-01-15 19:22:19 +00:00
parent 01f6f6a796
commit 40397605a1
1 changed files with 182 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

335
tkperl/tkcirc
View file

@ -1,23 +1,13 @@
#!/usr/bin/perl #!/usr/bin/perl
use C4::Format;
use C4::Database;
use Tk; use Tk;
require Tk::Dialog; require Tk::Dialog;
require Tk::ROText; use C4::Circulation::Circ2;
use C4::Accounts;
use C4::Circulation::Borrissues;
use C4::Circulation::Renewals;
use C4::Stats;
use C4::Search;
require Exporter; require Exporter;
use DBI; use DBI;
my %env; my %env;
$env->{'bornum'}=2;
$env->{'bcard'}=42;
my $dbh=&C4Connect;
my $issuebut, $returnbut, $mainholder; my $issuebut, $returnbut, $mainholder;
my $borrnumber, $borrower, $borrowerlist; my $borrnumber, $borrower, $borrowerlist;
@ -29,24 +19,19 @@ $MW->fontCreate('C_normal',-family => 'courier', -size => -12);
my $titlebar=$MW->Frame(-height => 100, -width => 600, -relief => 'ridge', -borderwidth => '4'); my $titlebar=$MW->Frame(-height => 100, -width => 600, -relief => 'ridge', -borderwidth => '4');
my $frametop=$MW->Frame(-height => 100, -width => 600, -relief => 'ridge', -borderwidth => '2'); my $frametop=$MW->Frame(-height => 100, -width => 600, -relief => 'ridge', -borderwidth => '2');
my $framebot=$MW->Frame(-height => 430, -width => 600, -relief => 'ridge', -borderwidth => '2'); my $framebot=$MW->Frame(-height => 430, -width => 600, -relief => 'ridge', -borderwidth => '2');
#$framebot->gridPropagate(0);
my $kohalabel=$titlebar->Label(-text => 'Koha'); my $kohalabel=$titlebar->Label(-text => 'Koha');
my $menulabel=$titlebar->Label(-text => 'Main Menu'); my $menulabel=$titlebar->Label(-text => 'Main Menu');
my $branchlabel=$titlebar->Label(-text => 'Stewart Elementary-lp'); my $branchlabel=$titlebar->Label(-text => 'Stewart Elementary-lp');
$kohalabel->pack(qw/-side left -padx 10/); $kohalabel->pack(qw/-side left -padx 10/);
$branchlabel->pack(qw/-side left -padx 10 -fill x -expand 1/); $branchlabel->pack(qw/-side left -padx 10 -fill x -expand 1/);
$menulabel->pack(qw/-side left -padx 10/); $menulabel->pack(qw/-side left -padx 10/);
my $issuesbut=$frametop->Button(-text => 'Issues', -command => sub { $data='Issues'; getborrnumber(); }); my $issuesbut=$frametop->Button(-text => 'Issues', -underline => 0, -command => sub { $data='Issues'; getborrnumber(); });
$issuesbut->pack(qw/-side left -padx 2 -pady 2 -expand 1 -fill x/); $issuesbut->pack(qw/-side left -padx 2 -pady 2 -expand 1 -fill x/);
my $returnsbut=$frametop->Button(-text => 'Returns', -command => sub { $data='Returns'; returns(); }); my $returnsbut=$frametop->Button(-text => 'Returns', -underline => 0, -command => sub { $data='Returns'; returns(); });
$returnsbut->pack(qw/-side right -padx 2 -pady 2 -expand 1 -fill x/); $returnsbut->pack(qw/-side right -padx 2 -pady 2 -expand 1 -fill x/);
#$titlebar->pack(qw/-fill x -side top/);
#$frametop->pack(qw/-fill x/);
#$framebot->pack(-fill => both, -expand => 1);
Tk::grid($titlebar, -col => 0, -row => 0, -sticky => 'nsew'); Tk::grid($titlebar, -col => 0, -row => 0, -sticky => 'nsew');
Tk::grid($frametop, -col => 0, -row => 1, -sticky => 'nsew'); Tk::grid($frametop, -col => 0, -row => 1, -sticky => 'nsew');
Tk::grid($framebot, -col => 0, -row => 2, -sticky => 'nsew'); Tk::grid($framebot, -col => 0, -row => 2, -sticky => 'nsew');
#$MW->gridPropagate(0);
MainLoop; MainLoop;
@ -71,71 +56,43 @@ sub getborrnumber {
sub checkborrower { sub checkborrower {
$borrnumber=$borrentry->get(); $key=$borrentry->get();
my $sth=$dbh->prepare("Select * from borrowers where cardnumber=\"$borrnumber\""); my ($borrowers, $flags) = findborrower($env, $key);
$sth->execute; my @borrowers=@$borrowers;
if ($borrower=$sth->fetchrow_hashref) { if ($#borrowers==0) {
$sth->finish; $borrnumber=$borrowers[0]->{'borrowernumber'};
$borrnumber=$borrower->{'borrowernumber'};
issues(); issues();
} else { } elsif ($#borrowers>0) {
$sth->finish; ($mainholder) && ($mainholder->destroy);
$borrnumber=lc($borrnumber); $mainholder=$framebot->Frame(-height => 500, -width => 500);
my $borquery = "Select * from borrowers Tk::grid($mainholder, -col => 0, -row => 0, -sticky => 'nsew');
where lower(surname) like \"$borrnumber%\" order by surname,firstname"; my $frame=$mainholder->Frame(-height => 500, -width => 500, -relief => 'ridge', -borderwidth => '5');
my $sthb =$dbh->prepare($borquery); Tk::grid($frame, -col=>0, -row=>0, -sticky => 'nsew');
$sthb->execute; $frame->pack(-ipadx=>10, -ipady=>10);
my $cntbor = 0; my $label=$frame->Label(-text => 'Pick a Patron', -justify => 'center', -relief => 'ridge', -borderwidth => 3);
my @borrows; Tk::grid($label, -col => 0, -row => 0, -sticky => 'nsew');
my @bornums; $borrowerlist=$frame->Scrolled(Listbox, -width => '50', -height => '10', -setgrid => '1', -scrollbars => 'se', -font => 'C_normal');
if ($sthb->rows == 1) { $borrowerlist->bind('<Double-1>' => \&pickborrower);
$borrower= $sthb->fetchrow_hashref; $borrowerlist->bind('<Return>' => \&pickborrower);
$borrnumber=$borrower->{'borrowernumber'}; Tk::grid($borrowerlist, -col => 0, -row => 1, -sticky => 'n', -pady => 10);
issues(); my $buttonframe=$frame->Frame(-height=>40, -width =>500);
} elsif ($sthb->rows > 0) { Tk::grid($buttonframe, -col => 0, -row => 2);
# Select a borrower my $okbutton=$buttonframe->Button(-text => 'OK', -command => \&pickborrower);
($mainholder) && ($mainholder->destroy); $okbutton->pack(-side => 'left', -padx => 10, -pady => 10);
$mainholder=$framebot->Frame(-height => 500, -width => 500); my $cancelbutton=$buttonframe->Button(-text => 'Cancel', -command => \&getborrnumber);
Tk::grid($mainholder, -col => 0, -row => 0, -sticky => 'nsew'); $cancelbutton->pack(-side => 'left', -padx => 10, -pady => 10);
my $frame=$mainholder->Frame(-height => 500, -width => 500, -relief => 'ridge', -borderwidth => '5'); my @borrowerlist;
Tk::grid($frame, -col=>0, -row=>0, -sticky => 'nsew'); my $borrower;
$frame->pack(-ipadx=>10, -ipady=>10); foreach $borrower (@borrowers) {
my $label=$frame->Label(-text => 'Pick a Patron', -justify => 'center', -relief => 'ridge', -borderwidth => 3); my $cardnumber=$borrower->{'cardnumber'};
Tk::grid($label, -col => 0, -row => 0, -sticky => 'nsew'); my $categorycode=$borrower->{'categorycode'};
$borrowerlist=$frame->Scrolled(Listbox, -width => '50', -height => '10', -setgrid => '1', -scrollbars => 'se', -font => 'C_normal'); my $name=$borrower->{'surname'}.", ".$borrower->{'firstname'};
$borrowerlist->bind('<Double-1>' => \&pickborrower); my $line = sprintf "%10s %4s %-25s", $cardnumber, $categorycode, $name;
$borrowerlist->bind('<Return>' => \&pickborrower); push (@borrowerlist, $line);
#$borrowerlist->bind('<ESC>' => \&issues); }
Tk::grid($borrowerlist, -col => 0, -row => 1, -sticky => 'n', -pady => 10); $borrowerlist->insert(0,@borrowerlist);
my $buttonframe=$frame->Frame(-height=>40, -width =>500); $borrowerlist->activate(0);
Tk::grid($buttonframe, -col => 0, -row => 2); $borrowerlist->focus();
my $okbutton=$buttonframe->Button(-text => 'OK', -command => \&pickborrower);
$okbutton->pack(-side => 'left', -padx => 10, -pady => 10);
my $cancelbutton=$buttonframe->Button(-text => 'Cancel', -command => \&getborrnumber);
$cancelbutton->pack(-side => 'left', -padx => 10, -pady => 10);
my @borrowerlist;
while ($borrower= $sthb->fetchrow_hashref) {
my $cardnumber=$borrower->{'cardnumber'};
my $categorycode=$borrower->{'categorycode'};
my $name=$borrower->{'surname'}.", ".$borrower->{'firstname'};
my $line = sprintf "%10s %4s %-25s", $cardnumber, $categorycode, $name;
push (@borrowerlist, $line);
}
$borrowerlist->insert(0,@borrowerlist);
$borrowerlist->activate(0);
$borrowerlist->focus();
#Tk::grid($borrowerlist, -col => 0, -row => 0, -sticky => 'n');
#my ($cardnum) = C4::InterfaceCDK::selborrower($env,$dbh,\@borrows,\@bornums);
my $query = "select * from borrowers where cardnumber = '$cardnum'";
$sth = $dbh->prepare($query);
$sth->execute;
$borrower =$sth->fetchrow_hashref;
$sth->finish;
$bornum=$borrower->{'borrowernumber'};
if ($bornum eq '') {
#error_msg($env,"Borrower not found");
}
}
} }
} }
@ -143,24 +100,21 @@ sub pickborrower {
my $line=$borrowerlist->get('active'); my $line=$borrowerlist->get('active');
$line=~s/^\s*//; $line=~s/^\s*//;
my $borcardnumber=(split(/\s+/, $line))[0]; my $borcardnumber=(split(/\s+/, $line))[0];
my $sth=$dbh->prepare("select borrowernumber from borrowers where cardnumber='$borcardnumber'"); my ($borrower,$flags)=getpatroninformation($env, 0, $borcardnumber);
$sth->execute; $borrnumber = $borrower->{'borrowernumber'};
($borrnumber) = $sth->fetchrow;
issues(); issues();
} }
sub issues { sub issues {
my $query = "select * from borrowers where borrowernumber = '$borrnumber'"; my ($borrower, $flags) = getpatroninformation($env,$borrnumber,0);
$sth = $dbh->prepare($query); my ($items) = currentissues($env, $borrower);
$sth->execute; #my $previssues='';
$borrower =$sth->fetchrow_hashref; #open O, ">>/root/tkcirc.out";
$sth->finish; #foreach (sort {$items->{$a} cmp $items->{$b}} keys %$items) {
my ($items,$items2) = C4::Circulation::Main::pastitems($env, $borrower->{'borrowernumber'}, $dbh); # $previssues.="$_->{'title'} $_->{'author'} $_->{'barcode'}\n";
my $previssues=''; # }
foreach (@$items) { # print O "PREVISSUES\n$previssues\n";
$previssues.="$_\n"; # close O;
}
$sth->finish;
$mainholder->destroy; $mainholder->destroy;
$mainholder=$framebot->Frame(); $mainholder=$framebot->Frame();
Tk::grid($mainholder, -col => 0, -row => 0, -sticky => 'n'); Tk::grid($mainholder, -col => 0, -row => 0, -sticky => 'n');
@ -174,13 +128,14 @@ sub issues {
$barcodelabel=$barcodeduedate->Label(-text => 'Item Barcode:', -justify => right, -anchor => e); $barcodelabel=$barcodeduedate->Label(-text => 'Item Barcode:', -justify => right, -anchor => e);
Tk::grid($barcodelabel, -col => 0, -row => 0, -sticky => 'e'); Tk::grid($barcodelabel, -col => 0, -row => 0, -sticky => 'e');
$barcodeentry=$barcodeduedate->Entry(-width => 15); $barcodeentry=$barcodeduedate->Entry(-width => 15);
$barcodeentry->bind('<Return>' => \&issuebook); $barcodeentry->bind('<Return>' => \&issuebk);
$barcodeentry->bind('<Escape>' => \&getborrnumber);
$barcodeentry->grid(-col => 1, -row => 0); $barcodeentry->grid(-col => 1, -row => 0);
$barcodeentry->focus; $barcodeentry->focus;
$duedatelabel=$barcodeduedate->Label(-text => 'Due Date:', -justify => right, -anchor => e); $duedatelabel=$barcodeduedate->Label(-text => 'Due Date:', -justify => right, -anchor => e);
Tk::grid($duedatelabel, -col => 0, -row => 1, -sticky => 'e'); Tk::grid($duedatelabel, -col => 0, -row => 1, -sticky => 'e');
$duedateentry=$barcodeduedate->Entry(-width => 15); $duedateentry=$barcodeduedate->Entry(-width => 15);
$duedateentry->bind('<Return>' => \&issuebook); $duedateentry->bind('<Return>' => \&issuebk);
$duedateentry->grid(-col => 1, -row => 1); $duedateentry->grid(-col => 1, -row => 1);
$middle=$topline->Frame(-width => 40); $middle=$topline->Frame(-width => 40);
Tk::grid($middle, -col => 1, -sticky => 'ew'); Tk::grid($middle, -col => 1, -sticky => 'ew');
@ -200,29 +155,75 @@ sub issues {
$borrowerinfo->pack; $borrowerinfo->pack;
my $ciframe=$mainholder->LabFrame(-label=>'Current Issues', -labelside=>acrosstop); my $ciframe=$mainholder->LabFrame(-label=>'Current Issues', -labelside=>acrosstop);
$ciframe->pack; $ciframe->pack;
$currentissues=$ciframe->Scrolled(Text, -height=>10, -width=>80, -relief => 'flat', -scrollbars => 'e');
$currentissues->insert('0.0','');
$currentissues->configure(-state => 'disabled');
$currentissues->pack(-side => top);
$currentissues=$ciframe->Table(-rows=>10, -columns=>5, -scrollbars=>'e', -fixedrows=>1, -takefocus=>1);
$currentissues->pack();
$currentissues->put(0,0,$currentissues->Label(-text=>"Due Date", -relief => 'groove', borderwidth=>'3'));
$currentissues->put(0,1,$currentissues->Label(-text=>"Bar Code", -relief => 'groove', borderwidth=>'3'));
$currentissues->put(0,2,$currentissues->Label(-text=>"Title", -relief => 'groove', borderwidth=>'3', -width=>35));
$currentissues->put(0,3,$currentissues->Label(-text=>"Author", -relief => 'groove', borderwidth=>'3', -width=>20));
$currentissues->put(0,4,$currentissues->Label(-text=>"Class", -relief => 'groove', borderwidth=>'3'));
$currentissues->see(0,0);
$currentissues->see(0,1);
$currentissues->see(0,2);
$currentissues->see(0,3);
$currentissues->see(0,4);
$currentissues->see(0,5);
my $piframe=$mainholder->LabFrame(-label=>'Previous Issues', -labelside=>acrosstop); my $piframe=$mainholder->LabFrame(-label=>'Previous Issues', -labelside=>acrosstop);
$piframe->pack; $piframe->pack;
$previousissues=$piframe->Scrolled(Text, -height=>10, -width=>80, -relief => 'flat', -setgrid => '1', -scrollbars => 'e'); $previousissues=$piframe->Table(-rows=>10, -columns=>5, -scrollbars=>'e', -fixedrows=>1, -takefocus=>1);
$previousissues->insert('0.0',$previssues); $previousissues->pack();
$previousissues->pack(-side => top, -fill => both, -expand => 1); $previousissues->put(0,0,$previousissues->Label(-text=>"Due Date", -relief => 'groove', borderwidth=>'3'));
$previousissues->configure(-state => 'disabled'); $previousissues->put(0,1,$previousissues->Label(-text=>"Bar Code", -relief => 'groove', borderwidth=>'3'));
$previousissues->put(0,2,$previousissues->Label(-text=>"Title", -relief => 'groove', borderwidth=>'3', -width=>35));
$previousissues->put(0,3,$previousissues->Label(-text=>"Author", -relief => 'groove', borderwidth=>'3', -width=>20));
$previousissues->put(0,4,$previousissues->Label(-text=>"Class", -relief => 'groove', borderwidth=>'3'));
$previousissues->see(0,0);
$previousissues->see(0,1);
$previousissues->see(0,2);
$previousissues->see(0,3);
$previousissues->see(0,4);
my ($borrowerissues) = currentissues($env, $borrower);
my $counter=1;
#foreach (sort {$items->{$a} cmp $items->{$b}} keys %$items) {
foreach (sort keys %$borrowerissues) {
my $bookissue=$borrowerissues->{$_};
$previousissues->put($counter,0,$previousissues->Label(-text=>$bookissue->{'duedate'}, -relief=>'groove', -borderwidth=>'2'));
$previousissues->put($counter,1,$previousissues->Label(-text=>$bookissue->{'barcode'}, -relief=>'groove', -borderwidth=>'2'));
$previousissues->put($counter,2,$previousissues->Label(-text=>$bookissue->{'title'}, -relief=>'groove', -borderwidth=>'2'));
$previousissues->put($counter,3,$previousissues->Label(-text=>$bookissue->{'author'}, -relief=>'groove', -borderwidth=>'2'));
$previousissues->put($counter,4,$previousissues->Label(-text=>$bookissue->{'dewey'}.$bookissue->{'subclass'}, -relief=>'groove', -borderwidth=>'2'));
$previousissues->see($counter,0);
$previousissues->see($counter,1);
$previousissues->see($counter,2);
$previousissues->see($counter,3);
$previousissues->see($counter,4);
$counter++;
}
} }
sub error_msg { sub error_msg {
my ($env, $message) = @_; my ($env, $message) = @_;
$MW->bell();
$MW->bell();
$MW->bell();
my $button = $MW->messageBox(-type => 'OK', -title => 'Error Message', -message => "$message"); my $button = $MW->messageBox(-type => 'OK', -title => 'Error Message', -message => "$message");
} }
sub info_msg { sub info_msg {
$MW->bell();
my ($env, $message) = @_; my ($env, $message) = @_;
my $button = $MW->messageBox(-type => 'OK', -title => 'Informational Message', -message => "$message"); my $button = $MW->messageBox(-type => 'OK', -title => 'Informational Message', -message => "$message");
} }
sub msg_yn { sub msg_yn {
$MW->bell();
my ($env, $message1, $message2, $message3) =@_; my ($env, $message1, $message2, $message3) =@_;
my $message = $message1; my $message = $message1;
($message2) && ($message.="\n$message2"); ($message2) && ($message.="\n$message2");
@ -234,6 +235,7 @@ sub msg_yn {
sub msg_ny { sub msg_ny {
$MW->bell();
my ($env, $message1, $message2, $message3) =@_; my ($env, $message1, $message2, $message3) =@_;
my $message = $message1; my $message = $message1;
($message2) && ($message.="\n$message2"); ($message2) && ($message.="\n$message2");
@ -257,8 +259,6 @@ sub updateissues {
$loanlength = $data->{'loanlength'} $loanlength = $data->{'loanlength'}
} }
$sth->finish; $sth->finish;
open O, ">/root/tkcirc.out";
print O "env->loanlength: ".$env->{'loanlength'}."\n";
my $dateduef; my $dateduef;
if ($env->{'loanlength'} eq "") { if ($env->{'loanlength'} eq "") {
my $ti = time; my $ti = time;
@ -271,8 +271,6 @@ sub updateissues {
my @datearr = localtime($datedue); my @datearr = localtime($datedue);
$dateduef = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3]; $dateduef = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
} }
print O "dateduef: $dateduef\n";
close O;
$query = "Insert into issues (borrowernumber,itemnumber, date_due,branchcode) $query = "Insert into issues (borrowernumber,itemnumber, date_due,branchcode)
values ($bornum,$itemno,'$dateduef','$env->{'branchcode'}')"; values ($bornum,$itemno,'$dateduef','$env->{'branchcode'}')";
my $sth=$dbh->prepare($query); my $sth=$dbh->prepare($query);
@ -288,10 +286,8 @@ sub updateissues {
$sth=$dbh->prepare($query); $sth=$dbh->prepare($query);
$sth->execute; $sth->execute;
$sth->finish; $sth->finish;
#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($datedue);
my @datearr = split('-',$dateduef); my @datearr = split('-',$dateduef);
my $dateret = join('-',$datearr[2],$datearr[1],$datearr[0]); my $dateret = join('-',$datearr[2],$datearr[1],$datearr[0]);
# debug_msg($env,"query $query");
return($dateret); return($dateret);
} }
@ -301,28 +297,19 @@ sub returnrecord {
#my $amt_owing = calc_odues($env,$dbh,$bornum,$itemno); #my $amt_owing = calc_odues($env,$dbh,$bornum,$itemno);
my @datearr = localtime(time); my @datearr = localtime(time);
my $dateret = (1900+$datearr[5])."-".$datearr[4]."-".$datearr[3]; my $dateret = (1900+$datearr[5])."-".$datearr[4]."-".$datearr[3];
my $query = "update issues set returndate = now(), branchcode ='$env->{'branchcode'}' where my $query = "update issues set returndate = now(), branchcode ='$env->{'branchcode'}' where (borrowernumber = '$bornum') and (itemnumber = '$itemno') and (returndate is null)";
(borrowernumber = '$bornum') and (itemnumber = '$itemno')
and (returndate is null)";
my $sth = $dbh->prepare($query); my $sth = $dbh->prepare($query);
$sth->execute; $sth->execute;
$sth->finish; $sth->finish;
updatelastseen($env,$dbh,$itemno); updatelastseen($env,$dbh,$itemno);
# check for overdue fine # check for overdue fine
my $oduecharge; my $oduecharge;
my $query = "select * from accountlines my $query = "select * from accountlines where (borrowernumber = '$bornum') and (itemnumber = '$itemno') and (accounttype = 'FU' or accounttype='O')";
where (borrowernumber = '$bornum')
and (itemnumber = '$itemno')
and (accounttype = 'FU' or accounttype='O')";
my $sth = $dbh->prepare($query); my $sth = $dbh->prepare($query);
$sth->execute; $sth->execute;
if (my $data = $sth->fetchrow_hashref) { if (my $data = $sth->fetchrow_hashref) {
# alter fine to show that the book has been returned. # alter fine to show that the book has been returned.
my $uquery = "update accountlines my $uquery = "update accountlines set accounttype = 'F' where (borrowernumber = '$bornum') and (itemnumber = '$itemno') and (accountno = '$data->{'accountno'}') ";
set accounttype = 'F'
where (borrowernumber = '$bornum')
and (itemnumber = '$itemno')
and (accountno = '$data->{'accountno'}') ";
my $usth = $dbh->prepare($uquery); my $usth = $dbh->prepare($uquery);
$usth->execute(); $usth->execute();
$usth->finish(); $usth->finish();
@ -514,14 +501,58 @@ sub scanbook {
} }
sub issuebook { sub issuebk {
my %responses,@issueditems;
$env->{'loanlength'}=14;
$env->{'branchcode'}='STWE';
$barcode=$barcodeentry->get();
$barcodeentry->delete('0.0','end');
my ($patroninformation, $flags) = getpatroninformation($env,$borrnumber,0);
my $continue=1;
my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
while ($continue) {
($iteminformation, $duedate, $rejected, $question, $questionnumber,
$defaultanswer) = issuebook($env, $patroninformation, $barcode,
\%responses);
if ($rejected) {
if ($rejected == -1) {
last;
} else {
error_msg($env, $rejected);
last;
}
}
if ($question) {
my $response = msg_yn($env, "$question");
$responses{$questionnumber}=$response;
} else {
$continue=0;
}
}
unless ($rejected) {
$iteminformation->{'duedate'}=$duedate;
push (@issueditems, $iteminformation);
my $counter=$#issueditems+1;
$currentissues->put($counter,0,$currentissues->Label(-text=>$iteminformation->{'duedate'}, -relief=>'groove', -borderwidth=>'2'));
$currentissues->put($counter,1,$currentissues->Label(-text=>$iteminformation->{'barcode'}, -relief=>'groove', -borderwidth=>'2'));
$currentissues->put($counter,2,$currentissues->Label(-text=>$iteminformation->{'title'}, -relief=>'groove', -borderwidth=>'2'));
$currentissues->put($counter,3,$currentissues->Label(-text=>$iteminformation->{'author'}, -relief=>'groove', -borderwidth=>'2'));
$currentissues->put($counter,4,$currentissues->Label(-text=>$iteminformation->{'dewey'}.$iteminformation->{'subclass'}, -relief=>'groove', -borderwidth=>'2'));
$currentissues->see($counter,0);
$currentissues->see($counter,1);
$currentissues->see($counter,2);
$currentissues->see($counter,3);
$currentissues->see($counter,4);
}
}
sub issuebook2 {
my $bornum=$borrnumber; my $bornum=$borrnumber;
$barcode=$barcodeentry->get(); $barcode=$barcodeentry->get();
$barcodeentry->delete('0.0', 'end'); $barcodeentry->delete('0.0', 'end');
my $itemnum=$barcode; my $itemnum=$barcode;
#my ($env,$dbh,$itemnum,$bornum,$items)=@_; #my ($env,$dbh,$itemnum,$bornum,$items)=@_;
$env->{'loanlength'}=14;
$env->{'branchcode'}='STWE';
$itemnum=uc $itemnum; $itemnum=uc $itemnum;
my $canissue = 1; my $canissue = 1;
## my ($itemnum,$reason)=&scanbook(); ## my ($itemnum,$reason)=&scanbook();
@ -552,7 +583,7 @@ sub issuebook {
#check if item is on issue already #check if item is on issue already
if ($canissue == 1) { if ($canissue == 1) {
my ($currbor,$issuestat,$newdate) = my ($currbor,$issuestat,$newdate) =
&previousissue($env,$item->{'itemnumber'},$dbh,$bornum); &previousissue($env,$item->{'itemnumber'},$dbh,$bornum);
if ($issuestat eq "N") { if ($issuestat eq "N") {
$canissue = 0; $canissue = 0;
} elsif ($issuestat eq "R") { } elsif ($issuestat eq "R") {
@ -663,10 +694,10 @@ sub formatitem {
return $line; return $line;
} }
sub returnbook { sub returnbk {
my $item = $barcodeentry->get(); my $item = $barcodeentry->get();
$barcodeentry->delete('0.0', 'end'); $barcodeentry->delete('0.0', 'end');
my ($resp, $bornum, $borrower, $itemno, $itemrec, $amt_owing) = checkissue($env, $dbh, $item); my ($iteminformation,$borrower,$messages,$overduecharge) = returnbook($env, $item);
my $line = "$borrower->{'cardnumber'} "; my $line = "$borrower->{'cardnumber'} ";
$line .= "$borrower->{'surname'}, "; $line .= "$borrower->{'surname'}, ";
$line .= "$borrower->{'title'} $borrower->{'firstname'}\n"; $line .= "$borrower->{'title'} $borrower->{'firstname'}\n";
@ -676,32 +707,29 @@ sub returnbook {
$borrowerinfo->delete('0.0', 'end'); $borrowerinfo->delete('0.0', 'end');
$borrowerinfo->insert('0.0',$line); $borrowerinfo->insert('0.0',$line);
$borrowerinfo->configure(-state => 'disabled'); $borrowerinfo->configure(-state => 'disabled');
if ($bornum ne "") { #if ($bornum ne "") {
($issues,$odues,$amt_owing) = borrdata2($env,$bornum); # ($issues,$odues,$amt_owing) = borrdata2($env,$bornum);
} else { # } else {
$issues = ""; # $issues = "";
$odues = ""; # $odues = "";
$amt_owing = ""; # $amt_owing = "";
} # }
if ($resp ne "") { if ($iteminformation->{'itemnumber'} ne "" ) {
if ($itemno ne "" ) { $iteminformation->{'borrower'}=$borrower->{'cardnumber'};
my $item = itemnodata($env,$dbh,$itemno); unshift @items,$iteminformation;
my $fmtitem = C4::Circulation::Issues::formatitem($env,$item,"",$amt_owing); $iteminformation->{'dewey'}=~s/0*$//;
$item->{'borrower'}=$borrower->{'cardnumber'}; if ($items[20] > "") {
unshift @items,$item; #pop @items;
if ($items[20] > "") { }
#pop @items; }
}
}
}
displayitemsreturned(); displayitemsreturned();
} }
sub displayitemsreturned { sub displayitemsreturned {
my $counter=0; my $counter=0;
$itemsreturned->put($counter,0,$itemsreturned->Label(-text=>"Bar Code", -relief => 'groove', borderwidth=>'3')); $itemsreturned->put($counter,0,$itemsreturned->Label(-text=>"Bar Code", -relief => 'groove', borderwidth=>'3'));
$itemsreturned->put($counter,1,$itemsreturned->Label(-text=>"Title", -relief => 'groove', borderwidth=>'3')); $itemsreturned->put($counter,1,$itemsreturned->Label(-text=>"Title", -relief => 'groove', borderwidth=>'3', -width=>35));
$itemsreturned->put($counter,2,$itemsreturned->Label(-text=>"Author", -relief => 'groove', borderwidth=>'3')); $itemsreturned->put($counter,2,$itemsreturned->Label(-text=>"Author", -relief => 'groove', borderwidth=>'3', -width=>20));
$itemsreturned->put($counter,3,$itemsreturned->Label(-text=>"Class", -relief => 'groove', borderwidth=>'3')); $itemsreturned->put($counter,3,$itemsreturned->Label(-text=>"Class", -relief => 'groove', borderwidth=>'3'));
$itemsreturned->put($counter,4,$itemsreturned->Label(-text=>"Borrower", -relief => 'groove', borderwidth=>'3')); $itemsreturned->put($counter,4,$itemsreturned->Label(-text=>"Borrower", -relief => 'groove', borderwidth=>'3'));
$itemsreturned->see($counter,0); $itemsreturned->see($counter,0);
@ -711,7 +739,7 @@ sub displayitemsreturned {
$itemsreturned->see($counter,4); $itemsreturned->see($counter,4);
$counter++; $counter++;
my $itemno; my $itemno;
foreach $itemno (reverse @items) { foreach $itemno (@items) {
$itemno->{'dewey'}=~s/0*$//; $itemno->{'dewey'}=~s/0*$//;
$itemsreturned->put($counter,0,$itemsreturned->Label(-text=>$itemno->{'barcode'}, -relief => 'groove', borderwidth=>'2')); $itemsreturned->put($counter,0,$itemsreturned->Label(-text=>$itemno->{'barcode'}, -relief => 'groove', borderwidth=>'2'));
$itemsreturned->put($counter,1,$itemsreturned->Label(-text=>$itemno->{'title'}, -relief => 'groove', borderwidth=>'2')); $itemsreturned->put($counter,1,$itemsreturned->Label(-text=>$itemno->{'title'}, -relief => 'groove', borderwidth=>'2'));
@ -723,6 +751,7 @@ sub displayitemsreturned {
$itemsreturned->see($counter,2); $itemsreturned->see($counter,2);
$itemsreturned->see($counter,3); $itemsreturned->see($counter,3);
$itemsreturned->see($counter,4); $itemsreturned->see($counter,4);
$itemsreturned->see(1,0);
$counter++; $counter++;
} }
} }
@ -740,7 +769,7 @@ sub returns {
my $barcodeframe=$topline->LabFrame(-label=>'Item Barcode', -height=>80, -width=>100, -labelside=>acrosstop); my $barcodeframe=$topline->LabFrame(-label=>'Item Barcode', -height=>80, -width=>100, -labelside=>acrosstop);
Tk::grid($barcodeframe, -col => 0, -row => 0, -sticky => 'n'); Tk::grid($barcodeframe, -col => 0, -row => 0, -sticky => 'n');
$barcodeentry=$barcodeframe->Entry(-width => 15); $barcodeentry=$barcodeframe->Entry(-width => 15);
$barcodeentry->bind('<Return>' => \&returnbook); $barcodeentry->bind('<Return>' => \&returnbk);
$barcodeentry->grid(-col => 1, -row => 0, -sticky=>'e', -padx=>10, -pady=>10); $barcodeentry->grid(-col => 1, -row => 0, -sticky=>'e', -padx=>10, -pady=>10);
$barcodeentry->focus; $barcodeentry->focus;
@ -753,7 +782,7 @@ sub returns {
$returnedframe=$mainholder->LabFrame(-label=>'Items Returned', -labelside=>acrosstop); $returnedframe=$mainholder->LabFrame(-label=>'Items Returned', -labelside=>acrosstop);
$returnedframe->pack; $returnedframe->pack;
$itemsreturned=$returnedframe->Table(-rows=>10, -columns => 5, -scrollbars=>e, -fixedrows => 1); $itemsreturned=$returnedframe->Table(-rows=>10, -columns => 5, -scrollbars=>e, -fixedrows => 1, -takefocus => 1);
$itemsreturned->pack(-side => top); $itemsreturned->pack(-side => top);
displayitemsreturned(); displayitemsreturned();
#$itemsreturned=$returnedframe->Scrolled(Text, -height=>20, -width=>80, -relief => 'flat', -scrollbars => 'e'); #$itemsreturned=$returnedframe->Scrolled(Text, -height=>20, -width=>80, -relief => 'flat', -scrollbars => 'e');