[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/Members.pm circ/bookcount.pl circ/branc... [rel_3_0]
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha C4/Members.pm circ/bookcount.pl circ/branc... [rel_3_0] |
|
Date: |
Mon, 20 Nov 2006 11:01:04 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/11/20 11:01:03
Modified files:
C4 : Members.pm
circ : bookcount.pl branchoverdues.pl
branchreserves.pl branchtransfers.pl
circulation.pl currenttransfers.pl reserve.pl
returns.pl selectbranchprinter.pl
waitingreservestransfers.pl
Log message:
- removing Date::Manip.
- re-indenting.
- removing warn compilation.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.19&r2=1.32.2.20
http://cvs.savannah.gnu.org/viewcvs/koha/circ/bookcount.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchoverdues.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchreserves.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.5&r2=1.2.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.24.2.3&r2=1.24.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.97.2.6&r2=1.97.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/circ/currenttransfers.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/reserve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.5&r2=1.43.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/circ/selectbranchprinter.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.16&r2=1.16.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/circ/waitingreservestransfers.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.1&r2=1.4.2.2
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.19
retrieving revision 1.32.2.20
diff -u -b -r1.32.2.19 -r1.32.2.20
--- C4/Members.pm 20 Nov 2006 10:26:10 -0000 1.32.2.19
+++ C4/Members.pm 20 Nov 2006 11:01:03 -0000 1.32.2.20
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.32.2.19 2006/11/20 10:26:10 toins Exp $
+# $Id: Members.pm,v 1.32.2.20 2006/11/20 11:01:03 toins Exp $
use strict;
require Exporter;
@@ -29,7 +29,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.32.2.19 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.20 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -1309,9 +1309,9 @@
#'
-sub fixEthnicity($) {
-
+sub fixEthnicity {
my $ethnicity = shift;
+ return unless $ethnicity;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("Select name from ethnicity where code = ?");
$sth->execute($ethnicity);
Index: circ/bookcount.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/bookcount.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- circ/bookcount.pl 17 Nov 2006 13:18:59 -0000 1.1.2.2
+++ circ/bookcount.pl 20 Nov 2006 11:01:03 -0000 1.1.2.3
@@ -1,11 +1,10 @@
#!/usr/bin/perl
-# $Id: bookcount.pl,v 1.1.2.2 2006/11/17 13:18:59 tipaul Exp $
+# $Id: bookcount.pl,v 1.1.2.3 2006/11/20 11:01:03 toins Exp $
#written 7/3/2002 by Finlay
#script to display reports
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -36,71 +35,74 @@
# get all the data ....
my %env;
-my $main='#cccc99';
-my $secondary='#ffffcc';
+my $main = '#cccc99';
+my $secondary = '#ffffcc';
my $input = new CGI;
my $itm = $input->param('itm');
my $bi = $input->param('bi');
my $biblionumber = $input->param('biblioitemnumber');
-my $branches = GetBranches(\%env);
+my $branches = GetBranches( \%env );
my $idata = itemdatanum($itm);
my $data = bibitemdata($bi);
-my $homebranch = $branches->{$idata->{'homebranch'}}->{'branchname'};
-my $holdingbranch = $branches->{$idata->{'holdingbranch'}}->{'branchname'};
+my $homebranch = $branches->{ $idata->{'homebranch'} }->{'branchname'};
+my $holdingbranch = $branches->{ $idata->{'holdingbranch'} }->{'branchname'};
-my ($lastmove, $message) = lastmove($itm);
+my ( $lastmove, $message ) = lastmove($itm);
my $lastdate;
my $count;
-if (not $lastmove) {
+if ( not $lastmove ) {
$lastdate = $message;
- $count = issuessince($itm , 0);
-} else {
+ $count = issuessince( $itm, 0 );
+}
+else {
$lastdate = $lastmove->{'datearrived'};
- $count = issuessince($itm ,$lastdate);
+ $count = issuessince( $itm, $lastdate );
}
# make the page ...
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "circ/bookcount.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/bookcount.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {borrowers => 1},
+ flagsrequired => { borrowers => 1 },
debug => 1,
- });
-
-
+ }
+);
my @branchloop;
-foreach my $branchcode (keys %$branches) {
+foreach my $branchcode ( keys %$branches ) {
my %linebranch;
- $linebranch{issues} = issuesat($itm, $branchcode);
- my $date = lastseenat($itm, $branchcode);
+ $linebranch{issues} = issuesat( $itm, $branchcode );
+ my $date = lastseenat( $itm, $branchcode );
$linebranch{seen} = slashdate($date);
- $linebranch{branchname}=$branches->{$branchcode}->{'branchname'};
- push(@branchloop,\%linebranch);
+ $linebranch{branchname} = $branches->{$branchcode}->{'branchname'};
+ push( @branchloop, \%linebranch );
}
-$template->param( biblionumber => $biblionumber,
+$template->param(
+ biblionumber => $biblionumber,
title =>
$data->{'title'},
author =>
$data->{'author'},
barcode =>
$idata->{'barcode'},
biblioitemnumber => $bi,
- homebranch
=>$homebranch,
+ homebranch => $homebranch,
holdingbranch
=> $holdingbranch,
lastdate =>
format_date($lastdate),
count =>
$count,
branchloop =>
address@hidden,
-
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet =>
C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
- );
+);
print "Content-Type: text/html\n\n", $template->output;
@@ -110,82 +112,106 @@
use DBI;
sub itemdatanum {
- my ($itemnumber)address@hidden;
+ my ($itemnumber) = @_;
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("select * from items where itemnumber=?");
+ my $sth = $dbh->prepare("select * from items where itemnumber=?");
$sth->execute($itemnumber);
- my $data=$sth->fetchrow_hashref;
+ my $data = $sth->fetchrow_hashref;
$sth->finish;
- return($data);
+ return ($data);
}
sub lastmove {
- my ($itemnumber)address@hidden;
+ my ($itemnumber) = @_;
my $dbh = C4::Context->dbh;
- my $sth =$dbh->prepare("select max(branchtransfers.datearrived) from
branchtransfers where branchtransfers.itemnumber=?");
+ my $sth =
+ $dbh->prepare(
+"select max(branchtransfers.datearrived) from branchtransfers where
branchtransfers.itemnumber=?"
+ );
$sth->execute($itemnumber);
my ($date) = $sth->fetchrow_array;
- return(0, "Item has no branch transfers record") if not $date;
- $sth=$dbh->prepare("Select * from branchtransfers where
branchtransfers.itemnumber=? and branchtransfers.datearrived=?");
- $sth->execute($itemnumber,$date);
+ return ( 0, "Item has no branch transfers record" ) if not $date;
+ $sth =
+ $dbh->prepare(
+"Select * from branchtransfers where branchtransfers.itemnumber=? and
branchtransfers.datearrived=?"
+ );
+ $sth->execute( $itemnumber, $date );
my ($data) = $sth->fetchrow_hashref;
- return(0, "Item has no branch transfers record") if not $data;
+ return ( 0, "Item has no branch transfers record" ) if not $data;
$sth->finish;
- return($data,"");
- }
+ return ( $data, "" );
+}
sub issuessince {
- my ($itemnumber, $date)address@hidden;
+ my ( $itemnumber, $date ) = @_;
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("Select count(*) from issues where
issues.itemnumber=? and issues.timestamp > ?");
- $sth->execute($itemnumber,$date);
- my $count=$sth->fetchrow_hashref;
+ my $sth =
+ $dbh->prepare(
+"Select count(*) from issues where issues.itemnumber=? and issues.timestamp >
?"
+ );
+ $sth->execute( $itemnumber, $date );
+ my $count = $sth->fetchrow_hashref;
$sth->finish;
- return($count->{'count(*)'});
+ return ( $count->{'count(*)'} );
}
sub issuesat {
- my ($itemnumber, $brcd)address@hidden;
+ my ( $itemnumber, $brcd ) = @_;
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("Select count(*) from issues where itemnumber=?
and branchcode = ?");
- $sth->execute($itemnumber,$brcd);
- my ($count)=$sth->fetchrow_array;
+ my $sth =
+ $dbh->prepare(
+ "Select count(*) from issues where itemnumber=? and branchcode = ?");
+ $sth->execute( $itemnumber, $brcd );
+ my ($count) = $sth->fetchrow_array;
$sth->finish;
- return($count);
+ return ($count);
}
sub lastseenat {
- my ($itm, $brc)address@hidden;
+ my ( $itm, $brc ) = @_;
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("Select max(timestamp) from issues where
itemnumber=? and branchcode = ?");
- $sth->execute($itm,$brc);
- my ($date1)=$sth->fetchrow_array;
- $sth->finish;
- $sth=$dbh->prepare("Select max(datearrived) from branchtransfers where
itemnumber=? and tobranch = ?");
- $sth->execute($itm,$brc);
- my ($date2)=$sth->fetchrow_array;
+ my $sth =
+ $dbh->prepare(
+"Select max(timestamp) from issues where itemnumber=? and branchcode = ?"
+ );
+ $sth->execute( $itm, $brc );
+ my ($date1) = $sth->fetchrow_array;
+ $sth->finish;
+ $sth =
+ $dbh->prepare(
+"Select max(datearrived) from branchtransfers where itemnumber=? and tobranch
= ?"
+ );
+ $sth->execute( $itm, $brc );
+ my ($date2) = $sth->fetchrow_array;
$sth->finish;
+
#FIXME: MJR thinks unsafe
$date2 =~ s/-//g;
$date2 =~ s/://g;
$date2 =~ s/ //g;
my $date;
- if ($date1 < $date2) {
+ if ( $date1 < $date2 ) {
$date = $date2;
- } else {
+ }
+ else {
$date = $date1;
}
- return($date);
+ return ($date);
}
-
#####################################################
# write date....
sub slashdate {
my ($date) = @_;
- if (not $date) {
+ if ( not $date ) {
return "never";
}
- my ($yr, $mo, $da, $hr, $mi) = (substr($date, 0, 4), substr($date, 4, 2),
substr($date, 6, 2), substr($date, 8, 2), substr($date, 10, 2));
+ my ( $yr, $mo, $da, $hr, $mi ) = (
+ substr( $date, 0, 4 ),
+ substr( $date, 4, 2 ),
+ substr( $date, 6, 2 ),
+ substr( $date, 8, 2 ),
+ substr( $date, 10, 2 )
+ );
return "$hr:$mi " . format_date("$yr-$mo-$da");
}
Index: circ/branchoverdues.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/branchoverdues.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- circ/branchoverdues.pl 17 Nov 2006 14:57:21 -0000 1.1.2.3
+++ circ/branchoverdues.pl 20 Nov 2006 11:01:03 -0000 1.1.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: branchoverdues.pl,v 1.1.2.3 2006/11/17 14:57:21 tipaul Exp $
+# $Id: branchoverdues.pl,v 1.1.2.4 2006/11/20 11:01:03 toins Exp $
#
# This file is part of Koha.
#
@@ -19,120 +19,118 @@
use strict;
use C4::Context;
-use C4::Output;
use CGI;
use C4::Interface::CGI::Output;
use HTML::Template;
use C4::Auth;
use C4::Date;
-use C4::Circulation::Circ2;
-use C4::Reserves2;
-use C4::Search;
-use C4::Koha;
-use C4::Date;
-use Mail::Sendmail; # comment out if not doing e-mail notices
+use C4::Circulation::Circ2; # AddNotifyLine
+use C4::Koha; # GetDepartement...
+use Mail::Sendmail;
use Getopt::Long;
-#use C4::Calendar;
-#use Date::Calc qw/Today Today_and_Now Now/;
-
-
-# this module is a new interface, allow to the librarian to check all items on
overdues (based on the acountlines type 'FU' )
-# this interface is filtered by branches (automaticly), and by departement
(optional) ....
-# all informations are stocked in the notifys BDD
+use Date::Calc qw/Today Today_and_Now Now/;
-# FIXME for this time, we have only four methods to notify :
-# - mail : work with a batch programm
-# - letter : for us, the letters are generated by an open-office program
-# - phone : Simple method, when the method 'phone' is selected, we
consider, that the borrower as been notified, and the notify send date is
implemented
-# - considered lost : for us if the document is on the third
overduelevel,
+=head1 branchoverdues.pl
+ this module is a new interface, allow to the librarian to check all items on
overdues (based on the acountlines type 'FU' )
+ this interface is filtered by branches (automaticly), and by departement
(optional) ....
+ all informations are stocked in the notifys BDD
-# FIXME the methods are actually hardcoded for the levels : (maybe can be
improved by a new possibility in overduerule)
+ FIXME for this time, we have only four methods to notify :
+ - mail : work with a batch programm
+ - letter : for us, the letters are generated by an open-office program
+ - phone : Simple method, when the method 'phone' is selected, we
consider, that the borrower as been notified, and the notify send date is
implemented
+ - considered lost : for us if the document is on the third overduelevel,
-# level 1 : three methods are possible : - mail, letter, phone
-# level 2 : only one method is possible : - letter
-# level 3 : only methode is possible : - Considered Lost
+ FIXME the methods are actually hardcoded for the levels : (maybe can be
improved by a new possibility in overduerule)
+ level 1 : three methods are possible : - mail, letter, phone
+ level 2 : only one method is possible : - letter
+ level 3 : only methode is possible : - Considered Lost
-# the documents displayed on this interface, are checked on three points
-# - 1) the document must be on accountlines (Type 'FU')
-# - 2) item issues is not returned
-# - 3) this item as not been already notify
+ the documents displayed on this interface, are checked on three points
+ - 1) the document must be on accountlines (Type 'FU')
+ - 2) item issues is not returned
+ - 3) this item as not been already notify
-
-# -----------------------------------------------------------
+=cut
my $input = new CGI;
-my $departement=$input->param('departement');
-
+my $departement = $input->param('departement');
my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "circ/branchoverdues.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/branchoverdues.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {borrowers => 1},
+ flagsrequired => { borrowers => 1 },
debug => 1,
- });
+ }
+);
my $default = C4::Context->userenv->{'branch'};
# Initate localtime
-my @datearr = localtime(time());
-my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d",
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
-
+my ( $year, $month, $day ) = &Today;
+my $todaysdate = join "-", ( $year, $month, $day );
- # Deal with the vars recept from the template
-my $borrowernumber=$input->param('borrowernumber');
-my $itemnumber=$input->param('itemnumber');
-my $method=$input->param('method');
-my $overduelevel=$input->param('overduelevel');
-my $notifyId=$input->param('notifyId');
+# Deal with the vars recept from the template
+my $borrowernumber = $input->param('borrowernumber');
+my $itemnumber = $input->param('itemnumber');
+my $method = $input->param('method');
+my $overduelevel = $input->param('overduelevel');
+my $notifyId = $input->param('notifyId');
# now create the line in bdd (notifys)
- if($input->param('action') eq 'add'){
- my $addnotify =
AddNotifyLine($borrowernumber,$itemnumber,$overduelevel,$method,$notifyId);
- }
+if ( $input->param('action') eq 'add' ) {
+ my $addnotify =
+ AddNotifyLine( $borrowernumber, $itemnumber, $overduelevel, $method,
+ $notifyId );
+}
# possibility to remove notify line
- if($input->param('action') eq 'remove'){
- my $notify_date=$input->param('notify_date');
- my $removenotify =
RemoveNotifyLine($borrowernumber,$itemnumber,$notify_date);
- }
+if ( $input->param('action') eq 'remove' ) {
+ my $notify_date = $input->param('notify_date');
+ my $removenotify =
+ RemoveNotifyLine( $borrowernumber, $itemnumber, $notify_date );
+}
my @overduesloop;
my @todayoverduesloop;
-my $counter=0;
+my $counter = 0;
-my @getoverdues = GetOverduesForBranch($default,$departement);
+my @getoverdues = GetOverduesForBranch( $default, $departement );
# filter by departement
-if ($departement){
- my ($departementlib,$departementValue) =
GetDepartementLib($departement);
- $template->param(departement => $departementlib,
+if ($departement) {
+ my ( $departementlib, $departementValue ) =
GetDepartementLib($departement);
+ $template->param(
+ departement => $departementlib,
departementValue => $departementValue,
);
}
else {
+
# initiate the selector of departements .....
- my @getdepartements=GetDepartements();
+ my @getdepartements = GetDepartements();
my @departementsloop;
- foreach my $dpt(@getdepartements){
+ foreach my $dpt (@getdepartements) {
my %departement;
$departement{'authorised_value'} = $dpt->{'authorised_value'};
$departement{'lib'} = $dpt->{'lib'};
- push(@departementsloop, \%departement);
+ push( @departementsloop, \%departement );
}
- $template->param( departementsloop => address@hidden,);
+ $template->param( departementsloop => address@hidden, );
}
# now display infos
- foreach my $num (@getoverdues) {
+foreach my $num (@getoverdues) {
my %overdueforbranch;
- $overdueforbranch{'date_due'} = format_date($num->{'date_due'});
+ $overdueforbranch{'date_due'} = format_date( $num->{'date_due'} );
$overdueforbranch{'title'} = $num->{'title'};
$overdueforbranch{'description'} = $num->{'description'};
$overdueforbranch{'barcode'} = $num->{'barcode'};
@@ -145,30 +143,30 @@
$overdueforbranch{'borrowernumber'} = $num->{'borrowernumber'};
$overdueforbranch{'itemnumber'} = $num->{'itemnumber'};
-# now we add on the template, the differents values of
notify_level
- if ($num->{'notify_level'} eq '1') {
+ # now we add on the template, the differents values of notify_level
+ if ( $num->{'notify_level'} eq '1' ) {
$overdueforbranch{'overdue1'} = 1;
$overdueforbranch{'overdueLevel'} = 1;
}
- if ($num->{'notify_level'} eq '2') {
+ if ( $num->{'notify_level'} eq '2' ) {
$overdueforbranch{'overdue2'} = 1;
$overdueforbranch{'overdueLevel'} = 2;
}
- if ($num->{'notify_level'} eq '3') {
+ if ( $num->{'notify_level'} eq '3' ) {
$overdueforbranch{'overdue3'} = 1;
$overdueforbranch{'overdueLevel'} = 3;
}
$overdueforbranch{'notify_id'} = $num->{'notify_id'};
- push(@overduesloop, \%overdueforbranch);
- }
+ push( @overduesloop, \%overdueforbranch );
+}
+
# initiate the templates for the overdueloop
- $template->param( overduesloop => address@hidden,
+$template->param(
+ overduesloop => address@hidden,
show_date => format_date($todaysdate),
- );
-
-
+);
output_html_with_http_headers $input, $cookie, $template->output;
Index: circ/branchreserves.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchreserves.pl,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -b -r1.2.2.5 -r1.2.2.6
--- circ/branchreserves.pl 7 Nov 2006 10:07:33 -0000 1.2.2.5
+++ circ/branchreserves.pl 20 Nov 2006 11:01:03 -0000 1.2.2.6
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: branchreserves.pl,v 1.2.2.5 2006/11/07 10:07:33 btoumi Exp $
+# $Id: branchreserves.pl,v 1.2.2.6 2006/11/20 11:01:03 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -27,7 +27,13 @@
use C4::Auth;
use C4::Date;
use C4::Circulation::Circ2;
-use Date::Manip;
+
+#use Date::Manip;
+use Date::Calc qw(
+ Today
+ Add_Delta_YM
+ Date_to_Days
+);
use C4::Reserves2;
use C4::Search;
use C4::Koha;
@@ -35,50 +41,54 @@
my $input = new CGI;
-my $item=$input->param('itemnumber');
-my $borrowernumber=$input->param('borrowernumber');
-my $fbr=$input->param('fbr');
-my $tbr=$input->param('tbr');
+my $item = $input->param('itemnumber');
+my $borrowernumber = $input->param('borrowernumber');
+my $fbr = $input->param('fbr');
+my $tbr = $input->param('tbr');
my $cancel;
-
my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "circ/branchreserves.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/branchreserves.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {borrowers => 1},
+ flagsrequired => { borrowers => 1 },
debug => 1,
- });
+ }
+);
my $default = C4::Context->userenv->{'branch'};
-my @datearr = localtime(time());
-my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d",
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
-
+my @datearr = localtime( time() );
+my $todaysdate =
+ ( 1900 + $datearr[5] ) . '-'
+ . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
+ . sprintf( "%0.2d", $datearr[3] );
# if we have a return from the form we launch the subroutine CancelReserve
- if ($item){
+if ($item) {
my $messages;
my $nextreservinfo;
my %env;
my $waiting;
- ($messages,$nextreservinfo) =
GlobalCancel($item,$borrowernumber);
-# if we have a result
- if ($nextreservinfo){
- my $borrowerinfo =
getpatroninformation(\%env,$nextreservinfo);
+ ( $messages, $nextreservinfo ) = GlobalCancel( $item, $borrowernumber );
+
+ # if we have a result
+ if ($nextreservinfo) {
+ my $borrowerinfo = getpatroninformation( \%env, $nextreservinfo );
my $iteminfo =
C4::Circulation::Circ2::getiteminformation($item);
- if ($messages->{'transfert'}){
- my $branchname =
getbranchname($messages->{'transfert'});
+ if ( $messages->{'transfert'} ) {
+ my $branchname = getbranchname( $messages->{'transfert'} );
$template->param(
messagetransfert =>
$messages->{'transfert'},
branchname => $branchname,
);
}
- if ($messages->{'waiting'}){
+ if ( $messages->{'waiting'} ) {
$waiting = 1;
}
@@ -92,24 +102,40 @@
waiting => $waiting
);
}
+
# if the document is not in his homebranch location and there is
not reservation after, we transfer it
- if (($fbr ne $tbr) and (not $nextreservinfo)){
- C4::Circulation::Circ2::dotransfer($item,$fbr,$tbr);
- }
+ if ( ( $fbr ne $tbr ) and ( not $nextreservinfo ) ) {
+ C4::Circulation::Circ2::dotransfer( $item, $fbr, $tbr );
}
+}
my @reservloop;
+warn $default;
+$default = "TEST";
+
my @getreserves = GetReservesForBranch($default);
+use Data::Dumper;
+warn "reserves=>" . Dumper(@getreserves);
+
foreach my $num (@getreserves) {
my %getreserv;
my %env;
- my $gettitle = getiteminformation($num->{'itemnumber'});
- my $getborrower = getpatroninformation (\%env,$num->{'borrowernumber'});
- my $itemtypeinfo = getitemtypeinfo($gettitle->{'itemtype'});
- $getreserv{'waitingdate'} = format_date($num->{'waitingdate'});
- my
$calcDate=DateCalc($num->{'waitingdate'},"+".C4::Context->preference('ReservesMaxPickUpDelay')."
days");
- my $warning=Date_Cmp(ParseDate("today"),$calcDate);
- if ($warning>0){
+ my $gettitle = getiteminformation( $num->{'itemnumber'} );
+ my $getborrower = getpatroninformation( \%env, $num->{'borrowernumber'} );
+ my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
+ $getreserv{'waitingdate'} = format_date( $num->{'waitingdate'} );
+
+ next unless $num->{'waitingdate'};
+ my ( $waiting_year, $waiting_month, $waiting_day ) = split /-/,
+ $num->{'waitingdate'};
+ ( $waiting_year, $waiting_month, $waiting_day ) =
+ Add_Delta_YM( $waiting_year, $waiting_month, $waiting_day,
+ C4::Context->preference('ReservesMaxPickUpDelay'), 0 );
+ my $calcDate = Date_to_Days( $waiting_year, $waiting_month, $waiting_day );
+ my $today = Date_to_Days(&Today);
+ my $warning = ( $today > $calcDate );
+
+ if ( $warning > 0 ) {
$getreserv{'messcompa'} = 1;
}
$getreserv{'title'} = $gettitle->{'title'};
@@ -119,22 +145,23 @@
$getreserv{'itemtype'} = $itemtypeinfo->{'description'};
$getreserv{'homebranch'} = $gettitle->{'homebranch'};
$getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};
- if ($gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'}){
+ if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
$getreserv{'dotransfer'} = 1;
}
$getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
$getreserv{'borrowernum'} = $getborrower->{'borrowernumber'};
$getreserv{'borrowername'} = $getborrower->{'surname'};
- $getreserv{'borrowerfirstname'} = $getborrower->{'firstname'} ;
- if ($getborrower->{'emailaddress'}){
- $getreserv{'borrowermail'} = $getborrower->{'emailaddress'} ;
+ $getreserv{'borrowerfirstname'} = $getborrower->{'firstname'};
+ if ( $getborrower->{'emailaddress'} ) {
+ $getreserv{'borrowermail'} = $getborrower->{'emailaddress'};
}
$getreserv{'borrowerphone'} = $getborrower->{'phone'};
- push(@reservloop, \%getreserv);
+ push( @reservloop, \%getreserv );
}
- $template->param( reserveloop => address@hidden,
+$template->param(
+ reserveloop => address@hidden,
show_date => format_date($todaysdate),
- );
+);
output_html_with_http_headers $input, $cookie, $template->output;
Index: circ/branchtransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -u -b -r1.24.2.3 -r1.24.2.4
--- circ/branchtransfers.pl 17 Nov 2006 14:57:21 -0000 1.24.2.3
+++ circ/branchtransfers.pl 20 Nov 2006 11:01:03 -0000 1.24.2.4
@@ -4,7 +4,6 @@
#written 11/3/2002 by Finlay
#script to execute branch transfers of books
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -36,23 +35,21 @@
# constants
my %env;
-my $linecolor1= 0;
-my $linecolor2= 1;
+my $linecolor1 = 0;
+my $linecolor2 = 1;
my $branches = GetBranches();
-my $printers = getprinters(\%env);
-
+my $printers = getprinters( \%env );
###############################################
# Getting state
-my $query=new CGI;
+my $query = new CGI;
+my $branch = getbranch( $query, $branches );
+my $printer = getprinter( $query, $printers );
-my $branch = getbranch($query, $branches);
-my $printer = getprinter($query, $printers);
-
-my $genbrname = $branches->{$branch}->{'branchname'} ;
+my $genbrname = $branches->{$branch}->{'branchname'};
my $genprname = $printers->{$printer}->{'printername'};
my $messages;
@@ -65,150 +62,150 @@
my $reqbrchname;
my $allmessages;
-my $request=$query->param('request');
+my $request = $query->param('request');
my $borrowernumber = $query->param('borrowernumber');
-my $tobranchcd=$query->param('tobranchcd');
-my $frbranchcd='';
+my $tobranchcd = $query->param('tobranchcd');
+my $frbranchcd = '';
############
# Deal with the requests....
-if ($request eq "KillWaiting") {
+if ( $request eq "KillWaiting" ) {
my $item = $query->param('itemnumber');
- CancelReserve(0, $item, $borrowernumber);
+
+ CancelReserve( 0, $item, $borrowernumber );
$cancelled = 1;
- $reqmessage =1;
+ $reqmessage = 1;
$allmessages = 1;
}
my $ignoreRs = 0;
-if ($request eq "SetWaiting") {
+if ( $request eq "SetWaiting" ) {
my $item = $query->param('itemnumber');
- $tobranchcd = ReserveWaiting($item, $borrowernumber);
+ $tobranchcd = ReserveWaiting( $item, $borrowernumber );
$reqbrchname = $branches->{$tobranchcd}->{'branchname'};
$ignoreRs = 1;
$setwaiting = 1;
- $reqmessage =1;
+ $reqmessage = 1;
$allmessages = 1;
}
-if ($request eq 'KillReserved'){
+if ( $request eq 'KillReserved' ) {
my $biblio = $query->param('biblionumber');
- CancelReserve($biblio, 0, $borrowernumber);
+ CancelReserve( $biblio, 0, $borrowernumber );
$cancelled = 1;
- $reqmessage =1;
+ $reqmessage = 1;
$allmessages = 1;
}
-
-
# set up the branchselect options....
my @branchoptionloop;
-foreach my $br (keys %$branches) {
+foreach my $br ( keys %$branches ) {
+
#(next) unless $branches->{$br}->{'CU'}; #FIXME disabled to fix bug 202
my %branch;
- $branch{selected}=($br eq $tobranchcd);
- $branch{code}=$br;
- $branch{name}=$branches->{$br}->{'branchname'};
- push (@branchoptionloop, \%branch);
+ $branch{selected} = ( $br eq $tobranchcd );
+ $branch{code} = $br;
+ $branch{name} = $branches->{$br}->{'branchname'};
+ push( @branchoptionloop, \%branch );
}
-
# collect the stack of books already transfered so they can printed...
my @trsfitemloop;
my %transfereditems;
my %frbranchcds;
my %tobranchcds;
-my $color=$linecolor2;
+my $color = $linecolor2;
my $transfered;
my $barcode = $query->param('barcode');
if ($barcode) {
my $iteminformation;
- ($transfered, $messages, $iteminformation)
- = transferbook($tobranchcd, $barcode, $ignoreRs);
+ ( $transfered, $messages, $iteminformation ) =
+ transferbook( $tobranchcd, $barcode, $ignoreRs );
$found = $messages->{'ResFound'};
if ($transfered) {
my %item;
my $frbranchcd = $iteminformation->{'frbranchcd'};
- if (not ($found)) {
- ($color eq $linecolor1) ? ($color=$linecolor2) :
($color=$linecolor1);
- $item{'color'}=$color;
-
$item{'biblionumber'}=$iteminformation->{'biblionumber'};
- $item{'title'}=$iteminformation->{'title'};
- $item{'author'}=$iteminformation->{'author'};
- $item{'itemtype'}=$iteminformation->{'itemtype'};
- $item{'ccode'}=$iteminformation->{'ccode'};
-
$item{'frbrname'}=$branches->{$frbranchcd}->{'branchname'};
-
$item{'tobrname'}=$branches->{$tobranchcd}->{'branchname'};
+ if ( not($found) ) {
+ ( $color eq $linecolor1 )
+ ? ( $color = $linecolor2 )
+ : ( $color = $linecolor1 );
+ $item{'color'} = $color;
+ $item{'biblionumber'} = $iteminformation->{'biblionumber'};
+ $item{'title'} = $iteminformation->{'title'};
+ $item{'author'} = $iteminformation->{'author'};
+ $item{'itemtype'} = $iteminformation->{'itemtype'};
+ $item{'ccode'} = $iteminformation->{'ccode'};
+ $item{'frbrname'} = $branches->{$frbranchcd}->{'branchname'};
+ $item{'tobrname'} = $branches->{$tobranchcd}->{'branchname'};
}
- $item{counter}=0;
- $item{barcode}=$barcode;
- $item{frombrcd}=$frbranchcd;
- $item{tobrcd}=$tobranchcd;
+ $item{counter} = 0;
+ $item{barcode} = $barcode;
+ $item{frombrcd} = $frbranchcd;
+ $item{tobrcd} = $tobranchcd;
##########
-#Are these lines still useful ???
- $transfereditems{0}=$barcode;
- $frbranchcds{0}=$frbranchcd;
- $tobranchcds{0}=$tobranchcd;
+ #Are these lines still useful ???
+ $transfereditems{0} = $barcode;
+ $frbranchcds{0} = $frbranchcd;
+ $tobranchcds{0} = $tobranchcd;
##########
- push (@trsfitemloop, \%item);
+ push( @trsfitemloop, \%item );
}
}
-foreach ($query->param){
+foreach ( $query->param ) {
(next) unless (/bc-(\d*)/);
- my $counter=$1;
+ my $counter = $1;
my %item;
- my $bc=$query->param("bc-$counter");
- my $frbcd=$query->param("fb-$counter");
- my $tobcd=$query->param("tb-$counter");
+ my $bc = $query->param("bc-$counter");
+ my $frbcd = $query->param("fb-$counter");
+ my $tobcd = $query->param("tb-$counter");
$counter++;
- $item{counter}=$counter;
- $item{barcode}=$bc;
- $item{frombrcd}=$frbcd;
- $item{tobrcd}=$tobcd;
- my ($iteminformation) = getiteminformation( 0, $bc);
- ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
- $item{'color'}=$color;
- $item{'biblionumber'}=$iteminformation->{'biblionumber'};
- $item{'title'}=$iteminformation->{'title'};
- $item{'author'}=$iteminformation->{'author'};
- $item{'itemtype'}=$iteminformation->{'itemtype'};
- $item{'ccode'}=$iteminformation->{'ccode'};
- $item{'frbrname'}=$branches->{$frbcd}->{'branchname'};
- $item{'tobrname'}=$branches->{$tobcd}->{'branchname'};
+ $item{counter} = $counter;
+ $item{barcode} = $bc;
+ $item{frombrcd} = $frbcd;
+ $item{tobrcd} = $tobcd;
+ my ($iteminformation) = getiteminformation( 0, $bc );
+ ( $color eq $linecolor1 )
+ ? ( $color = $linecolor2 )
+ : ( $color = $linecolor1 );
+ $item{'color'} = $color;
+ $item{'biblionumber'} = $iteminformation->{'biblionumber'};
+ $item{'title'} = $iteminformation->{'title'};
+ $item{'author'} = $iteminformation->{'author'};
+ $item{'itemtype'} = $iteminformation->{'itemtype'};
+ $item{'ccode'} = $iteminformation->{'ccode'};
+ $item{'frbrname'} = $branches->{$frbcd}->{'branchname'};
+ $item{'tobrname'} = $branches->{$tobcd}->{'branchname'};
##########
-#Are these lines still useful ???
- $transfereditems{$counter}=$bc;
- $frbranchcds{$counter}=$frbcd;
- $tobranchcds{$counter}=$tobcd;
+ #Are these lines still useful ???
+ $transfereditems{$counter} = $bc;
+ $frbranchcds{$counter} = $frbcd;
+ $tobranchcds{$counter} = $tobcd;
#########
- push (@trsfitemloop, \%item);
+ push( @trsfitemloop, \%item );
}
my $title;
my $surname;
my $firstname;
-my $borrowernumber;
my $borphone;
my $borstraddress;
my $borcity;
my $borzip;
my $boremail;
-my $borrowernumber;
my $borcnum;
my $itemnumber;
my $biblionum;
my $branchname;
my $wastransferred;
-
#####################
if ($found) {
my $res = $messages->{'ResFound'};
- $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
- my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
+ $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
+ my ($borr) = getpatroninformation( \%env, $res->{'borrowernumber'}, 0 );
$title = $borr->{'title'};
$surname = $borr->{'surname'};
$firstname = $borr->{'firstname'};
@@ -223,10 +220,10 @@
$borcnum = $borr->{'cardnumber'};
$itemnumber = $res->{'itemnumber'};
- if ($res->{'ResFound'} eq "Waiting") {
+ if ( $res->{'ResFound'} eq "Waiting" ) {
$waiting = 1;
}
- if ($res->{'ResFound'} eq "Reserved") {
+ if ( $res->{'ResFound'} eq "Reserved" ) {
$reserved = 1;
$biblionum = $res->{'biblionumber'};
}
@@ -235,55 +232,62 @@
#####################
my @errmsgloop;
-foreach my $code (keys %$messages) {
+foreach my $code ( keys %$messages ) {
my %err;
- if ($code eq 'BadBarcode') {
- $err{msg}=$messages->{'BadBarcode'};
+ if ( $code eq 'BadBarcode' ) {
+ $err{msg} = $messages->{'BadBarcode'};
$err{errbadcode} = 1;
$allmessages = 1;
}
- if ($code eq 'IsPermanent'){
+ if ( $code eq 'IsPermanent' ) {
$err{errispermanent} = 1;
- $err{msg} =
$branches->{$messages->{'IsPermanent'}}->{'branchname'};
+ $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
+
# Here, msg contains the branchname
# Not so satisfied with this... But should work
$allmessages = 1;
}
- $err{errdesteqholding} = ($code eq 'DestinationEqualsHolding');
+ $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
- if ($code eq 'WasReturned') {
+ if ( $code eq 'WasReturned' ) {
$err{errwasreturned} = 1;
$allmessages = 1;
- my ($borrowerinfo) = getpatroninformation(\%env,
$messages->{'WasReturned'}, 0);
+ my ($borrowerinfo) =
+ getpatroninformation( \%env, $messages->{'WasReturned'}, 0 );
$title = $borrowerinfo->{'title'};
$surname = $borrowerinfo->{'surname'};
$firstname = $borrowerinfo->{'firstname'};
- $borrowernumber =$borrowerinfo->{'borrowernumber'};
- $borcnum =$borrowerinfo->{'cardnumber'};
+ $borrowernumber = $borrowerinfo->{'borrowernumber'};
+ $borcnum = $borrowerinfo->{'cardnumber'};
}
-# if ($code eq 'WasTransfered'){
-# Put code here if you want to notify the user that item was transfered...
-# $wastransferred = 1;
-# }
- push (@errmsgloop, \%err);
+
+ # if ($code eq 'WasTransfered'){
+ # Put code here if you want to notify the user that item was transfered...
+ # $wastransferred = 1;
+ # }
+ push( @errmsgloop, \%err );
}
#######################################################################################
# Make the page .....
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "circ/branchtransfers.tmpl",
+my ( $template, $cookie );
+( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/branchtransfers.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {circulate => 1},
- });
-if($allmessages){
- $template->param(allmessages => 1);
+ flagsrequired => { circulate => 1 },
+ }
+);
+if ($allmessages) {
+ $template->param( allmessages => 1 );
}
-$template->param( genbrname => $genbrname,
+$template->param(
+ genbrname => $genbrname,
genprname =>
$genprname,
branch =>
$branch,
printer =>
$printer,
@@ -312,16 +316,18 @@
trsfitemloop =>
address@hidden,
branchoptionloop => address@hidden,
errmsgloop =>
address@hidden,
-
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet =>
C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
- );
+);
output_html_with_http_headers $query, $cookie, $template->output;
-
sub name {
my ($borinfo) = @_;
- return $borinfo->{'surname'}." ".$borinfo->{'title'}."
".$borinfo->{'firstname'};
+ return $borinfo->{'surname'} . " "
+ . $borinfo->{'title'} . " "
+ . $borinfo->{'firstname'};
}
# Local Variables:
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.97.2.6
retrieving revision 1.97.2.7
diff -u -b -r1.97.2.6 -r1.97.2.7
--- circ/circulation.pl 17 Nov 2006 14:57:21 -0000 1.97.2.6
+++ circ/circulation.pl 20 Nov 2006 11:01:03 -0000 1.97.2.7
@@ -30,14 +30,14 @@
use C4::Print;
use C4::Auth;
use C4::Interface::CGI::Output;
-use C4::Koha;
use HTML::Template;
use Date::Calc qw(
-Today
-Today_and_Now
-Add_Delta_YM
-Date_to_Days
+ Today
+ Today_and_Now
+ Add_Delta_YM
+ Date_to_Days
);
+
#use C4::Date;
use C4::Biblio;
use C4::Reserves2;
@@ -58,6 +58,7 @@
}
);
my $branches = GetBranches();
+
# my $printers = getprinters();
# my $printer = getprinter($query, $printers);
@@ -65,15 +66,16 @@
$findborrower =~ s|,| |g;
$findborrower =~ s|'| |g;
my $borrowernumber = $query->param('borrowernumberber');
+
# new op dev the branch and the printer are now defined by the userenv
my $branch = C4::Context->userenv->{'branch'};
-my $printer=C4::Context->userenv->{'branchprinter'};
+my $printer = C4::Context->userenv->{'branchprinter'};
my $barcode = $query->param('barcode') || '';
-my $year=$query->param('year');
-my $month=$query->param('month');
-my $day=$query->param('day');
-my $stickyduedate=$query->param('stickyduedate');
+my $year = $query->param('year');
+my $month = $query->param('month');
+my $day = $query->param('day');
+my $stickyduedate = $query->param('stickyduedate');
my $issueconfirmed = $query->param('issueconfirmed');
my $cancelreserve = $query->param('cancelreserve');
my $organisation = $query->param('organisations');
@@ -87,18 +89,23 @@
# $printercookie = $query->cookie(-name=>'printer', -value=>"$printer",
-expires=>'+1y');
# }
-my %env; # FIXME env is used as an "environment" variable. Could be dropped
probably...
+my %env
+ ; # FIXME env is used as an "environment" variable. Could be dropped
probably...
+
#
-my $print;
-$env{'branchcode'}= $branch;
-$env{'printer'}= $printer;
+$env{'branchcode'} = $branch;
+$env{'printer'} = $printer;
$env{'organisation'} = $organisation;
+
# $env{'queue'}=$printer;
-my @datearr = localtime(time());
-# FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
-my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf
("%0.2d", ($datearr[3]));
+my @datearr = localtime( time() );
+# FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
+my $todaysdate =
+ ( 1900 + $datearr[5] )
+ . sprintf( "%0.2d", ( $datearr[4] + 1 ) )
+ . sprintf( "%0.2d", ( $datearr[3] ) );
# check and see if we should print
if ( $barcode eq '' && $print eq 'maybe' ) {
@@ -106,16 +113,18 @@
}
my $inprocess = $query->param('inprocess');
-if ($barcode eq ''){
- $inprocess='';
+if ( $barcode eq '' ) {
+ $inprocess = '';
}
else {
}
-if ($barcode eq '' && $query->param('charges') eq 'yes'){
- $template->param( PAYCHARGES=>'yes',
- borrowernumber=>$borrowernumber);
- }
+if ( $barcode eq '' && $query->param('charges') eq 'yes' ) {
+ $template->param(
+ PAYCHARGES => 'yes',
+ borrowernumber => $borrowernumber
+ );
+}
if ( $print eq 'yes' && $borrowernumber ne '' ) {
printslip( \%env, $borrowernumber );
@@ -154,25 +163,35 @@
if ($borrowernumber) {
$borrower = getpatroninformation( \%env, $borrowernumber, 0 );
my ( $od, $issue, $fines ) = borrdata2( \%env, $borrowernumber );
+
# Warningdate is the date that the warning starts appearing
- my ($today_year,$today_month,$today_day) = Today();
- my ($warning_year,$warning_month,$warning_day) = split /-/,
$borrower->{'dateexpiry'};
+ my ( $today_year, $today_month, $today_day ) = Today();
+ my ( $warning_year, $warning_month, $warning_day ) = split /-/,
+ $borrower->{'dateexpiry'};
# Renew day is calculated by adding the enrolment period to today
- my ($renew_year,$renew_month,$renew_day) =
Add_Delta_YM($today_year,$today_month,$today_day,
$borrower->{'enrolmentperiod'},0);
+ my ( $renew_year, $renew_month, $renew_day ) =
+ Add_Delta_YM( $today_year, $today_month, $today_day,
+ $borrower->{'enrolmentperiod'}, 0 );
# if the expiry date is before today
- if (Date_to_Days($today_year,$today_month,$today_day) >
Date_to_Days($warning_year,$warning_month,$warning_day)) {
+ if ( Date_to_Days( $today_year, $today_month, $today_day ) >
+ Date_to_Days( $warning_year, $warning_month, $warning_day ) )
+ {
#borrowercard expired or nearly expired, warn the librarian
- $template->param( flagged=>"1",
- warndeparture=>"1",
-
renewaldate=>"$renew_year-$renew_month-$renew_day");
+ $template->param(
+ flagged => "1",
+ warndeparture => "1",
+ renewaldate => "$renew_year-$renew_month-$renew_day"
+ );
}
- $template->param( overduecount => $od,
+ $template->param(
+ overduecount => $od,
issuecount => $issue,
- finetotal => $fines);
- }
+ finetotal => $fines
+ );
+}
#
# STEP 3 : ISSUING
@@ -184,11 +203,12 @@
my ( $datedue, $invalidduedate ) = fixdate( $year, $month, $day );
if ($issueconfirmed) {
issuebook( \%env, $borrower, $barcode, $datedue, $cancelreserve );
- $inprocess=1;
+ $inprocess = 1;
}
else {
my ( $error, $question ) =
- canbookbeissued( \%env, $borrower, $barcode, $year, $month, $day,
$inprocess );
+ canbookbeissued( \%env, $borrower, $barcode, $year, $month, $day,
+ $inprocess );
my $noerror = 1;
my $noquestion = 1;
foreach my $impossible ( keys %$error ) {
@@ -212,7 +232,7 @@
);
if ( $noerror && ( $noquestion || $issueconfirmed ) ) {
issuebook( \%env, $borrower, $barcode, $datedue );
- $inprocess=1;
+ $inprocess = 1;
}
}
}
@@ -226,51 +246,57 @@
# BUILD HTML
# show all reserves of this borrower, and the position of the reservation ....
if ($borrowernumber) {
-# new op dev
-# now we show the status of the borrower's reservations
- my @borrowerreserv = GetReservations(0,$borrowernumber);
+
+ # new op dev
+ # now we show the status of the borrower's reservations
+ my @borrowerreserv = GetReservations( 0, $borrowernumber );
my @reservloop;
foreach my $num_res (@borrowerreserv) {
my %getreserv;
my %env;
- my $getiteminfo = getiteminformation($num_res->{'itemnumber'});
- my $itemtypeinfo = getitemtypeinfo($getiteminfo->{'itemtype'});
- my ($transfertwhen,$transfertfrom,$transfertto) =
checktransferts($num_res->{'itemnumber'});
+ my $getiteminfo = getiteminformation( $num_res->{'itemnumber'} );
+ my $itemtypeinfo = getitemtypeinfo( $getiteminfo->{'itemtype'} );
+ my ( $transfertwhen, $transfertfrom, $transfertto ) =
+ checktransferts( $num_res->{'itemnumber'} );
$getreserv{waiting} = 0;
$getreserv{transfered} = 0;
$getreserv{nottransfered} = 0;
- $getreserv{reservedate} =
format_date($num_res->{'reservedate'});
+ $getreserv{reservedate} = format_date( $num_res->{'reservedate'} );
$getreserv{biblionumber} = $getiteminfo->{'biblionumber'};
$getreserv{title} = $getiteminfo->{'title'};
$getreserv{itemtype} = $itemtypeinfo->{'description'};
$getreserv{author} = $getiteminfo->{'author'};
$getreserv{barcodereserv} = $getiteminfo->{'barcode'};
$getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
-# check if we have a waitin status for reservations
- if ($num_res->{'found'} eq 'W'){
+
+ # check if we have a waitin status for reservations
+ if ( $num_res->{'found'} eq 'W' ) {
$getreserv{color} = 'reserved';
$getreserv{waiting} = 1;
}
-# check transfers with the itemnumber foud in th reservation loop
- if ($transfertwhen){
+ # check transfers with the itemnumber foud in th
reservation loop
+ if ($transfertwhen) {
$getreserv{color} = 'transfered';
$getreserv{transfered} = 1;
$getreserv{datesent} = format_date($transfertwhen);
$getreserv{frombranch} = getbranchname($transfertfrom);
}
- if (($getiteminfo->{'holdingbranch'} ne
$num_res->{'branchcode'}) and not $transfertwhen){
+ if ( ( $getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'} )
+ and not $transfertwhen )
+ {
$getreserv{nottransfered} = 1;
- $getreserv{nottransferedby} =
getbranchname($getiteminfo->{'holdingbranch'});
+ $getreserv{nottransferedby} =
+ getbranchname( $getiteminfo->{'holdingbranch'} );
}
# if we don't have a reserv on item, we put the biblio infos and
the waiting position
- if ($getiteminfo->{'title'} eq '' ){
- my $getbibinfo =
bibitemdata($num_res->{'biblionumber'});
- my $getbibtype =
getitemtypeinfo($getbibinfo->{'itemtype'});
+ if ( $getiteminfo->{'title'} eq '' ) {
+ my $getbibinfo = bibitemdata( $num_res->{'biblionumber'} );
+ my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} );
$getreserv{color} = 'inwait';
$getreserv{title} = $getbibinfo->{'title'};
$getreserv{waitingposition} = $num_res->{'priority'};
@@ -281,14 +307,14 @@
}
- push(@reservloop, \%getreserv);
+ push( @reservloop, \%getreserv );
}
+
# return result to the template
- $template->param(reservloop => address@hidden);
+ $template->param( reservloop => address@hidden );
}
-
# make the issued books table.....
my $todaysissues = '';
my $previssues = '';
@@ -315,26 +341,64 @@
my $issuedate = $issueslist->{$it}->{'timestamp'};
$issuedate =~ s/-//g;
$issuedate = substr( $issuedate, 0, 8 );
+
# to let perl sort this correctly
$issueslist->{$it}->{'timestamp'} =~ s/(-|\:| )//g;
-# warn "today: $todaysdate issue: $issuedate";
+
+ # warn "today: $todaysdate issue: $issuedate";
if ( $todaysdate == $issuedate ) {
- ($issueslist->{$it}->{'charge'},
$issueslist->{$it}->{'itemtype_charge'})=calc_charges($dbh,$issueslist->{$it}->{'itemnumber'},$borrower->{'borrowernumber'});
- $issueslist->{$it}->{'charge'} =
sprintf("%.2f",$issueslist->{$it}->{'charge'});
- ($issueslist->{$it}->{'can_renew'},
$issueslist->{$it}->{'can_renew_error'})
=renewstatus(\%env,$borrower->{'borrowernumber'},
$issueslist->{$it}->{'itemnumber'});
- my
($restype,$reserves)=CheckReserves($issueslist->{$it}->{'itemnumber'});
- if ($restype){
- $issueslist->{$it}->{'can_renew'}=0;
+ (
+ $issueslist->{$it}->{'charge'},
+ $issueslist->{$it}->{'itemtype_charge'}
+ )
+ = calc_charges(
+ $dbh,
+ $issueslist->{$it}->{'itemnumber'},
+ $borrower->{'borrowernumber'}
+ );
+ $issueslist->{$it}->{'charge'} =
+ sprintf( "%.2f", $issueslist->{$it}->{'charge'} );
+ (
+ $issueslist->{$it}->{'can_renew'},
+ $issueslist->{$it}->{'can_renew_error'}
+ )
+ = renewstatus(
+ \%env,
+ $borrower->{'borrowernumber'},
+ $issueslist->{$it}->{'itemnumber'}
+ );
+ my ( $restype, $reserves ) =
+ CheckReserves( $issueslist->{$it}->{'itemnumber'} );
+ if ($restype) {
+ $issueslist->{$it}->{'can_renew'} = 0;
}
push @todaysissues, $issueslist->{$it};
}
else {
- ($issueslist->{$it}->{'charge'},
$issueslist->{$it}->{'itemtype_charge'})=calc_charges($dbh,$issueslist->{$it}->{'itemnumber'},$borrower->{'borrowernumber'});
- $issueslist->{$it}->{'charge'} =
sprintf("%.2f",$issueslist->{$it}->{'charge'});
- ($issueslist->{$it}->{'can_renew'},
$issueslist->{$it}->{'can_renew_error'})
=renewstatus(\%env,$borrower->{'borrowernumber'},
$issueslist->{$it}->{'itemnumber'});
- my
($restype,$reserves)=CheckReserves($issueslist->{$it}->{'itemnumber'});
- if ($restype){
- $issueslist->{$it}->{'can_renew'}=0;
+ (
+ $issueslist->{$it}->{'charge'},
+ $issueslist->{$it}->{'itemtype_charge'}
+ )
+ = calc_charges(
+ $dbh,
+ $issueslist->{$it}->{'itemnumber'},
+ $borrower->{'borrowernumber'}
+ );
+ $issueslist->{$it}->{'charge'} =
+ sprintf( "%.2f", $issueslist->{$it}->{'charge'} );
+ (
+ $issueslist->{$it}->{'can_renew'},
+ $issueslist->{$it}->{'can_renew_error'}
+ )
+ = renewstatus(
+ \%env,
+ $borrower->{'borrowernumber'},
+ $issueslist->{$it}->{'itemnumber'}
+ );
+ my ( $restype, $reserves ) =
+ CheckReserves( $issueslist->{$it}->{'itemnumber'} );
+ if ($restype) {
+ $issueslist->{$it}->{'can_renew'} = 0;
}
push @previousissues, $issueslist->{$it};
}
@@ -342,14 +406,19 @@
my $od; # overdues
my $i = 0;
my $togglecolor;
+
# parses today & build Template array
- foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}}
@todaysissues){
+ foreach my $book ( sort { $b->{'timestamp'} <=> $a->{'timestamp'} }
+ @todaysissues )
+ {
+
#warn "TIMESTAMP".$book->{'timestamp'};
# ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
- $issued_itemtypes_count->{$book->{'itemtype'}}++;
+ $issued_itemtypes_count->{ $book->{'itemtype'} }++;
my $dd = $book->{'date_due'};
my $datedue = $book->{'date_due'};
+
#$dd=format_date($dd);
$datedue =~ s/-//g;
if ( $datedue < $todaysdate ) {
@@ -376,13 +445,16 @@
# parses previous & build Template array
$i = 0;
- foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}}
@previousissues){
+ foreach my $book ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
+ @previousissues )
+ {
# ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
- $issued_itemtypes_count->{$book->{'itemtype'}}++;
+ $issued_itemtypes_count->{ $book->{'itemtype'} }++;
my $dd = $book->{'date_due'};
my $datedue = $book->{'date_due'};
+
#$dd=format_date($dd);
my $pcolor = '';
my $od = '';
@@ -414,26 +486,35 @@
# FIXME: This should utilize all the issuingrules options rather than just the
defaults
# and it should be moved to a module
my $dbh = C4::Context->dbh;
+
# how many of each is allowed?
-my $issueqty_sth = $dbh->prepare("
-SELECT itemtypes.description AS description,issuingrules.itemtype,maxissueqty
FROM issuingrules
+my $issueqty_sth = $dbh->prepare( "
+SELECT itemtypes.description AS description,issuingrules.itemtype,maxissueqty
+FROM issuingrules
LEFT JOIN itemtypes ON (itemtypes.itemtype=issuingrules.itemtype)
WHERE categorycode=?
-");
+" );
my @issued_itemtypes_count;
$issueqty_sth->execute("*");
-while (my $data = $issueqty_sth->fetchrow_hashref()) {
+while ( my $data = $issueqty_sth->fetchrow_hashref() ) {
+
# subtract how many of each this borrower has
- $data->{'count'} = $issued_itemtypes_count->{$data->{'description'}};
- $data->{'left'} = ($data->{'maxissueqty'} -
$issued_itemtypes_count->{$data->{'description'}});
+ $data->{'count'} = $issued_itemtypes_count->{ $data->{'description'} };
+ $data->{'left'} =
+ ( $data->{'maxissueqty'} -
+ $issued_itemtypes_count->{ $data->{'description'} } );
+
# can't have a negative number of remaining
- if ($data->{'left'} < 0) { $data->{'left'} = "0" };
- $data->{'flag'} = 1 unless ($data->{'maxissueqty'} > $data->{'count'});
- unless (($data->{'maxissueqty'} < 1) || ($data->{'itemtype'} eq "*") ||
($data->{'itemtype'} eq "CIRC")) {
+ if ( $data->{'left'} < 0 ) { $data->{'left'} = "0" }
+ $data->{'flag'} = 1 unless ( $data->{'maxissueqty'} > $data->{'count'} );
+ unless ( ( $data->{'maxissueqty'} < 1 )
+ || ( $data->{'itemtype'} eq "*" )
+ || ( $data->{'itemtype'} eq "CIRC" ) )
+ {
push @issued_itemtypes_count, $data;
}
}
-my $issued_itemtypes_loop = address@hidden;
+$issued_itemtypes_loop = address@hidden;
#### / JF
@@ -441,16 +522,26 @@
my %labels;
my $CGIselectborrower;
if ($borrowerslist) {
- foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp
$b->{'surname'}.$b->{'firstname'}} @$borrowerslist){
+ foreach (
+ sort {
+ $a->{'surname'}
+ . $a->{'firstname'} cmp $b->{'surname'}
+ . $b->{'firstname'}
+ } @$borrowerslist
+ )
+ {
push @values, $_->{'borrowernumber'};
- $labels{$_->{'borrowernumber'}} ="$_->{'surname'},
$_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ...
$_->{'address'} ";
+ $labels{ $_->{'borrowernumber'} } =
+"$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} -
$_->{'categorycode'}) ... $_->{'address'} ";
}
- $CGIselectborrower=CGI::scrolling_list( -name =>
'borrowernumberber',
+ $CGIselectborrower = CGI::scrolling_list(
+ -name => 'borrowernumberber',
-values => address@hidden,
-labels => \%labels,
-size => 7,
- -tabindex=>'',
- -multiple => 0 );
+ -tabindex => '',
+ -multiple => 0
+ );
}
#title
@@ -481,7 +572,7 @@
}
$amountold = $temp[1];
-warn "borrowernumber=>".$borrowernumber;
+
$template->param(
issued_itemtypes_count_loop => $issued_itemtypes_loop,
findborrower => $findborrower,
@@ -492,7 +583,8 @@
printername => $printer,
firstname => $borrower->{'firstname'},
surname => $borrower->{'surname'},
- expiry => $borrower->{'dateexpiry'},
#format_date($borrower->{'dateexpiry'}),
+ expiry =>
+ $borrower->{'dateexpiry'}, #format_date($borrower->{'dateexpiry'}),
categorycode => $borrower->{'categorycode'},
streetaddress => $borrower->{'address'},
emailaddress => $borrower->{'emailaddress'},
@@ -524,17 +616,18 @@
);
}
-
#if ($branchcookie) {
#$cookie=[$cookie, $branchcookie, $printercookie];
#}
-$template->param(intranetcolorstylesheet =>
C4::Context->preference("intranetcolorstylesheet"),
+$template->param(
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet =>
C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
patronimages => C4::Context->preference("patronimages"),
SpecifyDueDate => C4::Context->preference("SpecifyDueDate")
- );
+);
output_html_with_http_headers $query, $cookie, $template->output;
####################################################################
@@ -573,7 +666,7 @@
chargesmsg => $flags->{'CHARGES'}->{'message'}
);
}
- if ($flag eq 'CREDITS') {
+ if ( $flag eq 'CREDITS' ) {
$template->param(
credits => 'true',
creditsmsg => $flags->{'CREDITS'}->{'message'}
@@ -588,7 +681,7 @@
chargesmsg => $flags->{'CHARGES'}->{'message'}
);
}
- if ($flag eq 'CREDITS') {
+ if ( $flag eq 'CREDITS' ) {
$template->param(
credits => 'true',
creditsmsg => $flags->{'CREDITS'}->{'message'}
@@ -626,7 +719,7 @@
my @itemswaiting;
foreach my $item (@$items) {
my ($iteminformation) =
- getiteminformation($item->{'itemnumber'}, 0 );
+ getiteminformation( $item->{'itemnumber'}, 0 );
push @itemswaiting, $iteminformation;
}
}
Index: circ/currenttransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/currenttransfers.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- circ/currenttransfers.pl 7 Nov 2006 10:07:33 -0000 1.3.2.2
+++ circ/currenttransfers.pl 20 Nov 2006 11:01:03 -0000 1.3.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: currenttransfers.pl,v 1.3.2.2 2006/11/07 10:07:33 btoumi Exp $
+# $Id: currenttransfers.pl,v 1.3.2.3 2006/11/20 11:01:03 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -27,7 +27,9 @@
use C4::Auth;
use C4::Date;
use C4::Circulation::Circ2;
-use Date::Manip;
+
+#use Date::Manip;
+use Date::Calc qw/Today/;
use C4::Koha;
use C4::Search;
use C4::Reserves2;
@@ -36,91 +38,118 @@
my $theme = $input->param('theme'); # only used if allowthemeoverride is set
my $itemnumber = $input->param('itemnumber');
+
# if we have a resturn of the form to delete the transfer, we launch the
subrroutine
-if ($itemnumber){
+if ($itemnumber) {
C4::Circulation::Circ2::DeleteTransfer($itemnumber);
}
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "circ/currenttransfers.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/currenttransfers.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {borrowers => 1},
+ flagsrequired => { borrowers => 1 },
debug => 1,
- });
-
+ }
+);
# set the userenv branch
my $default = C4::Context->userenv->{'branch'};
-
-my @datearr = localtime(time());
-my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d",
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
+my @datearr = localtime( time() );
+my $todaysdate =
+ ( 1900 + $datearr[5] ) . '-'
+ . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
+ . sprintf( "%0.2d", $datearr[3] );
+
+warn "todaysdate=>" . $todaysdate;
+my $todaysdate2 = join "-", &Today;
+warn "todaysdate2=>" . $todaysdate2;
# get the all the branches for reference
my $branches = GetBranches();
my @branchesloop;
-foreach my $br (keys %$branches) {
+foreach my $br ( keys %$branches ) {
my @transferloop;
my %branchloop;
$branchloop{'branchname'} = $branches->{$br}->{'branchname'};
$branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
+
# # # # # # # # # # # # # # # # # # # # # #
- my @gettransfers =
GetTransfersFromBib($branches->{$br}->{'branchcode'},$default);
- if (@gettransfers){
+ my @gettransfers =
+ GetTransfersFromBib( $branches->{$br}->{'branchcode'}, $default );
+ if (@gettransfers) {
foreach my $num (@gettransfers) {
my %getransf;
my %env;
- my
$calcDate=DateCalc($num->{'datesent'},"+".C4::Context->preference('TransfersMaxDaysWarning')."
days");
- my $warning=Date_Cmp(ParseDate("today"),$calcDate);
- if ($warning>0){
+
+#my
$calcDate=DateCalc($num->{'datesent'},"+".C4::Context->preference('TransfersMaxDaysWarning')."
days");
+#my $warning=Date_Cmp(ParseDate("today"),$calcDate);
+
+ #new
+ my ( $sent_year, $sent_month, $sent_day ) = split "-",
+ $num->{'datesent'};
+ ( $sent_year, $sent_month, $sent_day ) =
+ Add_Delta_YM( $sent_year, $sent_month, $sent_day,
+ C4::Context->preference('TransfersMaxDaysWarning'), 0 );
+ my $calcDate = Date_to_Days( $sent_year, $sent_month, $sent_day );
+ my $today = Date_to_Days(&Today);
+ my $warning = ( $today > $calcDate );
+
+ #endnew
+
+ if ( $warning > 0 ) {
$getransf{'messcompa'} = 1;
}
- my $gettitle = getiteminformation($num->{'itemnumber'});
- my $itemtypeinfo =
getitemtypeinfo($gettitle->{'itemtype'});
+ my $gettitle = getiteminformation( $num->{'itemnumber'} );
+ my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
$getransf{'title'} = $gettitle->{'title'};
- $getransf{'datetransfer'} =
format_date($num->{'datesent'});
+ $getransf{'datetransfer'} = format_date( $num->{'datesent'} );
$getransf{'biblionumber'} =
$gettitle->{'biblionumber'};
$getransf{'itemnumber'} =
$gettitle->{'itemnumber'};
$getransf{'barcode'} = $gettitle->{'barcode'};
-# $getransf{'barcode'} = 'toto le bozo';
+
+ # $getransf{'barcode'} = 'toto le bozo';
$getransf{'itemtype'} =
$itemtypeinfo->{'description'};
$getransf{'homebranch'} =
$gettitle->{'homebranch'};
$getransf{'holdingbranch'} =
$gettitle->{'holdingbranch'};
$getransf{'itemcallnumber'} =
$gettitle->{'itemcallnumber'};
-# we check if we have a reserv for this transfer
- my @checkreserv =
GetReservations($num->{'itemnumber'});
- if (@checkreserv[0]){
- my $getborrower = getpatroninformation
(\%env,$checkreserv[1]);
+ # we check if we have a reserv for this
transfer
+ my @checkreserv = GetReservations( $num->{'itemnumber'} );
+ if ( $checkreserv[0] ) {
+ my $getborrower =
+ getpatroninformation( \%env, $checkreserv[1] );
$getransf{'borrowernum'} =
$getborrower->{'borrowernumber'};
$getransf{'borrowername'} =
$getborrower->{'surname'};
$getransf{'borrowerfirstname'} =
$getborrower->{'firstname'};
- if
($getborrower->{'emailaddress'}){
-
$getransf{'borrowermail'} = $getborrower->{'emailaddress'} ;
+ if ( $getborrower->{'emailaddress'} ) {
+ $getransf{'borrowermail'} = $getborrower->{'emailaddress'};
}
$getransf{'borrowerphone'} =
$getborrower->{'phone'};
}
- push(@transferloop, \%getransf);
+ push( @transferloop, \%getransf );
}
-# If we have a return of reservloop we put it in the branchloop
sequence
- $branchloop{'reserv'} = address@hidden ;
+
+ # If we have a return of reservloop we put it in the
branchloop sequence
+ $branchloop{'reserv'} = address@hidden;
}
else {
+
# if we don't have a retrun from reservestobranch we unset branchname and
branchcode
$branchloop{'branchname'} = 0;
$branchloop{'branchcode'} = 0;
}
-push(@branchesloop, \%branchloop);
+ push( @branchesloop, \%branchloop );
}
- $template->param( branchesloop => address@hidden,
+$template->param(
+ branchesloop => address@hidden,
show_date => format_date($todaysdate)
- );
-
- print "Content-Type: text/html\n\n", $template->output;
-
+);
+print "Content-Type: text/html\n\n", $template->output;
Index: circ/reserve.pl
===================================================================
RCS file: /sources/koha/koha/circ/reserve.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- circ/reserve.pl 17 Nov 2006 14:57:21 -0000 1.3.2.2
+++ circ/reserve.pl 20 Nov 2006 11:01:03 -0000 1.3.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: reserve.pl,v 1.3.2.2 2006/11/17 14:57:21 tipaul Exp $
+# $Id: reserve.pl,v 1.3.2.3 2006/11/20 11:01:03 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -29,19 +29,22 @@
use C4::Interface::CGI::Output;
my $input = new CGI;
-my $type=$input->param('type');
-my $order=$input->param('order');
+my $type = $input->param('type');
+my $order = $input->param('order');
my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "circ/reserve.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/reserve.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {borrowers => 1},
+ flagsrequired => { borrowers => 1 },
debug => 1,
- });
+ }
+);
+
# borrowernumber int(11)
# reservedate date
# biblionumber int(11)
@@ -67,22 +70,31 @@
my $biblionumber;
my $title;
my $author;
-my @datearr = localtime(time());
-my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d",
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
+my @datearr = localtime( time() );
+my $todaysdate =
+ ( 1900 + $datearr[5] ) . '-'
+ . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
+ . sprintf( "%0.2d", $datearr[3] );
my $dbh = C4::Context->dbh;
-my $strsth="select reservedate,reserves.borrowernumber as borrowernumber,
concat(firstname,' ',surname) as borrower, borrowers.phone,
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch,
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes,
notificationdate, reminderdate, priority, reserves.found, biblio.title,
biblio.author from reserves left join items on
items.itemnumber=reserves.itemnumber, borrowers,biblio where
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber &&
reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
-$strsth="select reservedate,reserves.borrowernumber as
borrowernumber,concat(firstname,' ',surname) as borrower, borrowers.phone,
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch,
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes,
notificationdate, reminderdate, priority, reserves.found, biblio.title,
biblio.author from reserves left join items on
items.itemnumber=reserves.itemnumber , borrowers,biblio where
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber &&
reserves.biblionumber=biblio.biblionumber order by borrower,reservedate " if
($order eq "borrower");
-$strsth="select reservedate,reserves.borrowernumber as
borrowernumber,concat(firstname,' ',surname) as borrower, borrowers.phone,
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch,
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes,
notificationdate, reminderdate, priority, reserves.found, biblio.title,
biblio.author from reserves left join items on
items.itemnumber=reserves.itemnumber, borrowers,biblio where
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber &&
reserves.biblionumber=biblio.biblionumber order by biblio.title,
priority,reservedate " if ($order eq "biblio");
-my $sth=$dbh->prepare($strsth);
-warn "".$strsth;
+my $strsth =
+"select reservedate,reserves.borrowernumber as borrowernumber,
concat(firstname,' ',surname) as borrower, borrowers.phone,
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch,
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes,
notificationdate, reminderdate, priority, reserves.found, biblio.title,
biblio.author from reserves left join items on
items.itemnumber=reserves.itemnumber, borrowers,biblio where
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber &&
reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
+$strsth =
+"select reservedate,reserves.borrowernumber as
borrowernumber,concat(firstname,' ',surname) as borrower, borrowers.phone,
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch,
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes,
notificationdate, reminderdate, priority, reserves.found, biblio.title,
biblio.author from reserves left join items on
items.itemnumber=reserves.itemnumber , borrowers,biblio where
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber &&
reserves.biblionumber=biblio.biblionumber order by borrower,reservedate "
+ if ( $order eq "borrower" );
+$strsth =
+"select reservedate,reserves.borrowernumber as
borrowernumber,concat(firstname,' ',surname) as borrower, borrowers.phone,
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch,
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes,
notificationdate, reminderdate, priority, reserves.found, biblio.title,
biblio.author from reserves left join items on
items.itemnumber=reserves.itemnumber, borrowers,biblio where
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber &&
reserves.biblionumber=biblio.biblionumber order by biblio.title,
priority,reservedate "
+ if ( $order eq "biblio" );
+my $sth = $dbh->prepare($strsth);
+warn "" . $strsth;
$sth->execute();
my @reservedata;
-while (my $data=$sth->fetchrow_hashref) {
- push (@reservedata,
+while ( my $data = $sth->fetchrow_hashref ) {
+ push(
+ @reservedata,
{
- reservedate =>
format_date($data->{reservedate}),
+ reservedate => format_date( $data->{reservedate} ),
priority => $data->{priority},
name => $data->{borrower},
title => $data->{title},
@@ -92,8 +104,8 @@
phone => $data->{phone},
email => $data->{email},
biblionumber => $data->{biblionumber},
- statusw => ($data->{found} eq "w"),
- statusf => ($data->{found} eq "f"),
+ statusw => ( $data->{found} eq "w" ),
+ statusf => ( $data->{found} eq "f" ),
holdingbranch =>
$data->{holdingbranch},
branch => $data->{branch},
itemcallnumber => $data->{itemcallnumber},
@@ -108,11 +120,13 @@
$sth->finish;
-$template->param(todaysdate => format_date($todaysdate),
+$template->param(
+ todaysdate => format_date($todaysdate),
reserveloop => address@hidden,
- intranetcolorstylesheet =>
C4::Context->preference("intranetcolorstylesheet"),
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet =>
C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
- );
+);
output_html_with_http_headers $input, $cookie, $template->output;
Index: circ/returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.43.2.5
retrieving revision 1.43.2.6
diff -u -b -r1.43.2.5 -r1.43.2.6
--- circ/returns.pl 17 Nov 2006 14:57:21 -0000 1.43.2.5
+++ circ/returns.pl 20 Nov 2006 11:01:03 -0000 1.43.2.6
@@ -57,7 +57,7 @@
my $linecolor1 = '#ffffcc';
my $linecolor2 = 'white';
-my $branches = GetBranches('IS');
+my $branches = GetBranches();
my $printers = getprinters( \%env );
my $branch = C4::Context->userenv->{'branch'};
@@ -100,7 +100,7 @@
$input{barcode} = $barcode;
$input{duedate} = $duedate;
$input{borrowernumber} = $borrowernumber;
- push ( @inputloop, \%input );
+ push( @inputloop, \%input );
}
############
@@ -111,24 +111,28 @@
my $resbarcode = $query->param('resbarcode');
# set to waiting....
- my $iteminfo = getiteminformation($item );
+ my $iteminfo = getiteminformation($item);
my $tobranchcd = ReserveWaiting( $item, $borrowernumber );
+
# if($iteminfo->{'holdingbranch'} ne $branch){
# UpdateHoldingbranch($branch,$item);
# }
# check if we have other reservs for this document, if we have a return send
the message of transfer
- my ($messages,$nextreservinfo) = OtherReserves($item);
- # my $branchname = $branches->{$tobranchcd}->{'branchname'}; - not sure if
this line + $tobranchcd line do the same thing
- # as the $messages{'transfert'} code
- my $branchname = getbranchname($messages->{'transfert'});
+ my ( $messages, $nextreservinfo ) = OtherReserves($item);
+
+# my $branchname = $branches->{$tobranchcd}->{'branchname'}; - not sure if
this line + $tobranchcd line do the same thing
+# as the $messages{'transfert'} code
+ my $branchname = getbranchname( $messages->{'transfert'} );
my ($borr) = getpatroninformation( \%env, $nextreservinfo, 0 );
my $borcnum = $borr->{'cardnumber'};
my $name =
$borr->{'surname'} . ", " . $borr->{'title'} . " " .
$borr->{'firstname'};
my $slip = $query->param('resslip');
+
#printreserve( $branchname, $borr, $iteminfo );
-# if ( $tobranchcd ne $branch ) { - not sure if line below is doing the same
+ # if ( $tobranchcd ne $branch ) { - not sure if line below is doing the
same
if ( $messages->{'transfert'} ) {
+
# add the transfer routine
#
C4::Circulation::Circ2::dotransfer($item,$iteminfo->{'holdingbranch'},$tobranchcd);
$template->param(
@@ -153,6 +157,7 @@
# actually return book and prepare item table.....
if ($barcode) {
+
# decode cuecat
$barcode = cuecatbarcodedecode($barcode);
( $returned, $messages, $iteminformation, $borrower ) =
@@ -167,11 +172,12 @@
$input{barcode} = $barcode;
$input{duedate} = $riduedate{0};
$input{borrowernumber} = $riborrowernumber{0};
- push ( @inputloop, \%input );
+ push( @inputloop, \%input );
+
# check if the branch is the same as homebranch
# if not, we want to put a message
- if ($iteminformation->{'homebranch'} ne $branch){
- $template->param( homebranch =>$iteminformation->{'homebranch'});
+ if ( $iteminformation->{'homebranch'} ne $branch ) {
+ $template->param( homebranch => $iteminformation->{'homebranch'} );
}
}
elsif ( !$messages->{'BadBarcode'} ) {
@@ -192,7 +198,7 @@
$input{borrowernumber} = " ";
$riborrowernumber{0} = ' ';
}
- push ( @inputloop, \%input );
+ push( @inputloop, \%input );
}
$template->param(
returned => $returned,
@@ -213,6 +219,7 @@
# if the document is transfered, we have warning message .
if ( $messages->{'WasTransfered'} ) {
+
# my $res = $messages->{'ResFound'};
# my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
# my ($borr) = getpatroninformation( \%env, $res->{'borrowernumber'}, 0 );
@@ -220,20 +227,21 @@
# $borr->{'surname'} . " " . $borr->{'title'} . " " .
$borr->{'firstname'};
my ($iteminfo) = getiteminformation( 0, $barcode );
-# if ( $res->{'ResFound'} eq "Waiting" ) {
-# if($branch eq $res->{'branchcode'}){
-# $template->param(intransit => 0);
-# } else {
-# $template->param(intransit => 1);
-# }
+ # if ( $res->{'ResFound'} eq "Waiting" ) {
+ # if($branch eq $res->{'branchcode'}){
+ # $template->param(intransit => 0);
+ # } else {
+ # $template->param(intransit => 1);
+ # }
$template->param(
found => 1,
transfer => 1,
- itemhomebranch => $branches->{$iteminfo->{'homebranch'}
}->{'branchname'}
+ itemhomebranch =>
+ $branches->{ $iteminfo->{'homebranch'} }->{'branchname'}
);
- }
+}
if ( $messages->{'ResFound'} ) {
my $res = $messages->{'ResFound'};
@@ -244,10 +252,11 @@
my ($iteminfo) = getiteminformation( 0, $barcode );
if ( $res->{'ResFound'} eq "Waiting" ) {
- if($branch eq $res->{'branchcode'}){
- $template->param(intransit => 0);
- } else {
- $template->param(intransit => 1);
+ if ( $branch eq $res->{'branchcode'} ) {
+ $template->param( intransit => 0 );
+ }
+ else {
+ $template->param( intransit => 1 );
}
$template->param(
@@ -265,8 +274,9 @@
borcnum => $borr->{'cardnumber'},
debarred => $borr->{'debarred'},
gonenoaddress => $borr->{'gonenoaddress'},
- currentbranch => $branches->{ $branch }->{'branchname'},
- destbranchname => $branches->{ $res->{'branchcode'}
}->{'branchname'},
+ currentbranch => $branches->{$branch}->{'branchname'},
+ destbranchname =>
+ $branches->{ $res->{'branchcode'} }->{'branchname'},
waiting => 1,
itemnumber => $res->{'itemnumber'},
itemtitle => $iteminfo->{'title'},
@@ -285,19 +295,21 @@
. sprintf( "%0.2d", ( $da[4] + 1 ) ) . "/"
. ( $da[5] + 1900 );
- if($branch eq $res->{'branchcode'}){
- $template->param(intransit => 0);
- } else {
- $template->param(intransit => 1);
+ if ( $branch eq $res->{'branchcode'} ) {
+ $template->param( intransit => 0 );
+ }
+ else {
+ $template->param( intransit => 1 );
}
-warn "RES FOR : ".$res->{'branchcode'};
+ warn "RES FOR : " . $res->{'branchcode'};
$template->param(
found => 1,
- currentbranch => $branches->{ $branch }->{'branchname'},
+ currentbranch => $branches->{$branch}->{'branchname'},
name => $name,
- destbranchname => $branches->{ $res->{'branchcode'}
}->{'branchname'},
- transfertodo => ($branch eq $res->{'branchcode'}?0:1),
+ destbranchname =>
+ $branches->{ $res->{'branchcode'} }->{'branchname'},
+ transfertodo => ( $branch eq $res->{'branchcode'} ? 0 : 1 ),
reserved => 1,
today => $todaysdate,
itemnumber => $res->{'itemnumber'},
@@ -367,7 +379,7 @@
die "Unknown error code $code"; # XXX
}
if (%err) {
- push ( @errmsgloop, \%err );
+ push( @errmsgloop, \%err );
}
last if $exit_required_p;
}
@@ -406,9 +418,9 @@
$waitingitem{barcode} = $iteminformation->{'barcode'};
$waitingitem{title} = $iteminformation->{'title'};
$waitingitem{brname} =
- $branches->{ $iteminformation->{'holdingbranch'} }->{
- 'branchname'};
- push ( @waitingitemloop, \%waitingitem );
+ $branches->{ $iteminformation->{'holdingbranch'} }
+ ->{'branchname'};
+ push( @waitingitemloop, \%waitingitem );
}
$flaginfo{itemloop} = address@hidden;
}
@@ -421,14 +433,14 @@
my ($iteminformation) =
getiteminformation( $item->{'itemnumber'}, 0 );
my %overdueitem;
- $overdueitem{duedate} = format_date($item->{'date_due'});
+ $overdueitem{duedate} = format_date( $item->{'date_due'} );
$overdueitem{biblionum} = $iteminformation->{'biblionumber'};
$overdueitem{barcode} = $iteminformation->{'barcode'};
$overdueitem{title} = $iteminformation->{'title'};
$overdueitem{brname} =
- $branches->{ $iteminformation->{'holdingbranch'} }->{
- 'branchname'};
- push ( @itemloop, \%overdueitem );
+ $branches->{ $iteminformation->{'holdingbranch'} }
+ ->{'branchname'};
+ push( @itemloop, \%overdueitem );
}
$flaginfo{itemloop} = address@hidden;
$flaginfo{overdue} = 1;
@@ -437,7 +449,7 @@
$flaginfo{other} = 1;
$flaginfo{msg} = $flags->{$flag}->{'message'};
}
- push ( @flagloop, \%flaginfo );
+ push( @flagloop, \%flaginfo );
}
$template->param(
flagset => $flagset,
@@ -467,17 +479,17 @@
my $overduetext;
my $borrowerinfo;
if ($duedate) {
- my @tempdate = split ( /-/, $duedate );
- $ri{year}=$tempdate[0];
- $ri{month}=$tempdate[1];
- $ri{day}=$tempdate[2];
+ my @tempdate = split( /-/, $duedate );
+ $ri{year} = $tempdate[0];
+ $ri{month} = $tempdate[1];
+ $ri{day} = $tempdate[2];
my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
my @datearr = localtime( time() );
my $todaysdate =
$datearr[5] . '-'
. sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
. sprintf( "%0.2d", $datearr[3] );
- $ri{duedate}=format_date($duedate);
+ $ri{duedate} = format_date($duedate);
my ($borrower) =
getpatroninformation( \%env, $riborrowernumber{$_}, 0 );
$ri{borrowernumber} = $borrower->{'borrowernumber'};
@@ -489,7 +501,8 @@
else {
$ri{borrowernumber} = $riborrowernumber{$_};
}
-# my %ri;
+
+ # my %ri;
my ($iteminformation) = getiteminformation( 0, $barcode );
$ri{color} = $color;
$ri{itembiblionumber} = $iteminformation->{'biblionumber'};
@@ -503,7 +516,7 @@
last;
}
$count++;
- push ( @riloop, \%ri );
+ push( @riloop, \%ri );
}
$template->param( riloop => address@hidden );
@@ -513,7 +526,8 @@
branchname => $branches->{$branch}->{'branchname'},
printer => $printer,
errmsgloop => address@hidden,
- intranetcolorstylesheet =>
C4::Context->preference("intranetcolorstylesheet"),
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet =>
C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
);
@@ -524,7 +538,7 @@
sub cuecatbarcodedecode {
my ($barcode) = @_;
chomp($barcode);
- my @fields = split ( /\./, $barcode );
+ my @fields = split( /\./, $barcode );
my @results = map( decode($_), @fields[ 1 .. $#fields ] );
if ( $#results == 2 ) {
return $results[2];
@@ -534,8 +548,6 @@
}
}
-
-
# Local Variables:
# tab-width: 4
# End:
Index: circ/selectbranchprinter.pl
===================================================================
RCS file: /sources/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -b -r1.16 -r1.16.2.1
--- circ/selectbranchprinter.pl 21 Jul 2006 10:10:29 -0000 1.16
+++ circ/selectbranchprinter.pl 20 Nov 2006 11:01:03 -0000 1.16.2.1
@@ -1,7 +1,6 @@
#!/usr/bin/perl
# WARNING: This file uses 4-character tabs!
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -30,33 +29,25 @@
use DBI;
use C4::Koha;
-
# this is a reorganisation of circulationold.pl
# dividing it up into three scripts......
# this will be the first one that chooses branch and printer settings....
#general design stuff...
-my $headerbackgroundcolor='#99cc33';
-my $circbackgroundcolor='#ffffcc';
-my $circbackgroundcolor='white';
-my $linecolor1='#ffffcc';
-my $linecolor2='white';
-my $backgroundimage="/images/background-mem.gif";
# try to get the branch and printer settings from the http....
my %env;
-my $query=new CGI;
-my $branches=GetBranches('IS');
-my $printers=getprinters(\%env);
-my $branch=$query->param('branch');
-my $printer=$query->param('printer');
+my $query = new CGI;
+my $branches = GetBranches();
+my $printers = getprinters( \%env );
+my $branch = $query->param('branch');
+my $printer = $query->param('printer');
-($branch) || ($branch=$query->cookie('branch'));
-($printer) || ($printer=$query->cookie('printer'));
-
-($branches->{$branch}) || ($branch=(keys %$branches)[0]);
-($printers->{$printer}) || ($printer=(keys %$printers)[0]);
+($branch) || ( $branch = $query->cookie('branch') );
+($printer) || ( $printer = $query->cookie('printer') );
+( $branches->{$branch} ) || ( $branch = ( keys %$branches )[0] );
+( $printers->{$printer} ) || ( $printer = ( keys %$printers )[0] );
# is you force a selection....
my $oldbranch = $branch;
@@ -65,83 +56,85 @@
#$branch='';
#$printer='';
-
-$env{'branchcode'}=$branch;
-$env{'printer'}=$printer;
-$env{'queue'}=$printer;
+$env{'branchcode'} = $branch;
+$env{'printer'} = $printer;
+$env{'queue'} = $printer;
# set up select options....
-my $branchcount=0;
-my $printercount=0;
+my $branchcount = 0;
+my $printercount = 0;
my @branchloop;
-foreach my $br (keys %$branches) {
+foreach my $br ( keys %$branches ) {
next unless $br =~ /\S/;
+
#(next) unless ($branches->{$_}->{'IS'}); # FIXME disabled to fix bug 202
$branchcount++;
my %branch;
- $branch{selected}=($br eq $oldbranch);
- $branch{name}=$branches->{$br}->{'branchname'};
- $branch{value}=$br;
- push(@branchloop,\%branch);
+ $branch{selected} = ( $br eq $oldbranch );
+ $branch{name} = $branches->{$br}->{'branchname'};
+ $branch{value} = $br;
+ push( @branchloop, \%branch );
}
my @printerloop;
-foreach (keys %$printers) {
+foreach ( keys %$printers ) {
(next) unless ($_);
$printercount++;
my %printer;
- $printer{selected}=($_ eq $oldprinter);
- $printer{name}=$printers->{$_}->{'printername'};
- $printer{value}=$_;
- push(@printerloop,\%printer);
+ $printer{selected} = ( $_ eq $oldprinter );
+ $printer{name} = $printers->{$_}->{'printername'};
+ $printer{value} = $_;
+ push( @printerloop, \%printer );
}
# if there is only one....
my $printername;
my $branchname;
-my $oneprinter=($printercount==1) ;
-my $onebranch=($branchcount==1) ;
-if ($printercount==1) {
- my ($tmpprinter)=keys %$printers;
- $printername=$printers->{$tmpprinter}->{printername};
+my $oneprinter = ( $printercount == 1 );
+my $onebranch = ( $branchcount == 1 );
+if ( $printercount == 1 ) {
+ my ($tmpprinter) = keys %$printers;
+ $printername = $printers->{$tmpprinter}->{printername};
}
-if ($branchcount==1) {
- my ($tmpbranch)=keys %$branches;
- $branchname=$branches->{$tmpbranch}->{branchname};
+if ( $branchcount == 1 ) {
+ my ($tmpbranch) = keys %$branches;
+ $branchname = $branches->{$tmpbranch}->{branchname};
}
-
#############################################################################################
# Start writing page....
# set header with cookie....
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "circ/selectbranchprinter.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/selectbranchprinter.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {circulate => 1},
- });
-$template->param(headerbackgroundcolor => $headerbackgroundcolor,
- backgroundimage =>
$backgroundimage,
+ flagsrequired => { circulate => 1 },
+ }
+);
+$template->param(
oneprinter =>
$oneprinter,
onebranch => $onebranch,
printername =>
$printername,
branchname =>
$branchname,
printerloop =>
address@hidden,
branchloop =>
address@hidden,
- intranetcolorstylesheet
=> C4::Context->preference("intranetcolorstylesheet"),
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet =>
C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
- );
+);
-my $branchcookie=$query->cookie(-name => 'branch', -value => "$branch",
-expires => '+1y');
-my $printercookie=$query->cookie(-name => 'printer', -value => "$printer",
-expires => '+1y');
+my $branchcookie =
+ $query->cookie( -name => 'branch', -value => "$branch", -expires => '+1y' );
+my $printercookie =
+ $query->cookie( -name => 'printer', -value => "$printer", -expires => '+1y'
);
-my $cookies=[$cookie,$branchcookie, $printercookie];
+my $cookies = [ $cookie, $branchcookie, $printercookie ];
output_html_with_http_headers $query, $cookies, $template->output;
-
# Local Variables:
# tab-width: 4
# End:
Index: circ/waitingreservestransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/waitingreservestransfers.pl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- circ/waitingreservestransfers.pl 30 Aug 2006 16:38:51 -0000 1.4.2.1
+++ circ/waitingreservestransfers.pl 20 Nov 2006 11:01:03 -0000 1.4.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: waitingreservestransfers.pl,v 1.4.2.1 2006/08/30 16:38:51 toins Exp $
+# $Id: waitingreservestransfers.pl,v 1.4.2.2 2006/11/20 11:01:03 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -27,7 +27,7 @@
use C4::Auth;
use C4::Date;
use C4::Circulation::Circ2;
-use Date::Manip;
+
use C4::Koha;
use C4::Biblio;
@@ -35,52 +35,74 @@
my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"circ/waitingreservestransfers.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/waitingreservestransfers.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {borrowers => 1},
+ flagsrequired => { borrowers => 1 },
debug => 1,
- });
-
+ }
+);
# set the userenv branch
my $default = C4::Context->userenv->{'branch'};
+my @datearr = localtime( time() );
+my $todaysdate =
+ ( 1900 + $datearr[5] ) . '-'
+ . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
+ . sprintf( "%0.2d", $datearr[3] );
+
+my $item = $input->param('itemnumber');
+my $fbr = $input->param('fbr');
+my $tbr = $input->param('tbr');
-my @datearr = localtime(time());
-my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d",
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
-
-my $item=$input->param('itemnumber');
-my $fbr=$input->param('fbr');
-my $tbr=$input->param('tbr');
# If we have a return of the form dotransfer, we launch the subroutine
dotransfer
-if ($item){
- C4::Circulation::Circ2::dotransfer($item,$fbr,$tbr);
+if ($item) {
+ C4::Circulation::Circ2::dotransfer( $item, $fbr, $tbr );
}
# get the all the branches for reference
my $branches = GetBranches();
+
my @branchesloop;
-foreach my $br (keys %$branches) {
+foreach my $br ( keys %$branches ) {
my @reservloop;
my %branchloop;
$branchloop{'branchname'} = $branches->{$br}->{'branchname'};
$branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
- my @getreserves =
GetReservesToBranch($branches->{$br}->{'branchcode'},$default);
- if (@getreserves){
+
+ # warn " branch=>".$branches->{$br}->{'branchcode'};
+ my @getreserves =
+ GetReservesToBranch( $branches->{$br}->{'branchcode'}, $default );
+ if (@getreserves) {
foreach my $num (@getreserves) {
my %getreserv;
my %env;
- my $gettitle = getiteminformation($num->{'itemnumber'});
- my $itemtypeinfo =
getitemtypeinfo($gettitle->{'itemtype'});
- if ($gettitle->{'holdingbranch'} eq $default){
- my $getborrower = getpatroninformation
(\%env,$num->{'borrowernumber'});
- $getreserv{'reservedate'} =
format_date($num->{'reservedate'});
- my
$calcDate=DateCalc($num->{'reservedate'},"+".C4::Context->preference('TransfersMaxDaysWarning')."
days");
- my
$warning=Date_Cmp(ParseDate("today"),$calcDate);
- if ($warning>0){
+ my $gettitle = getiteminformation( $num->{'itemnumber'} );
+ my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
+ if ( $gettitle->{'holdingbranch'} eq $default ) {
+ my $getborrower =
+ getpatroninformation( \%env, $num->{'borrowernumber'} );
+ $getreserv{'reservedate'} =
+ format_date( $num->{'reservedate'} );
+
+#my
$calcDate=DateCalc($num->{'reservedate'},"+".C4::Context->preference('TransfersMaxDaysWarning')."
days");
+#my $warning=Date_Cmp(ParseDate("today"),$calcDate);
+
+ my ( $reserve_year, $reserve_month, $reserve_day ) = split /-/,
+ $num->{'reservedate'};
+ ( $reserve_year, $reserve_month, $reserve_day ) =
+ Add_Delta_YM( $reserve_year, $reserve_month, $reserve_day,
+ C4::Context->preference('ReservesMaxPickUpDelay'), 0 );
+ my $calcDate =
+ Date_to_Days( $reserve_year, $reserve_month, $reserve_day );
+ my $today = Date_to_Days(&Today);
+ my $warning = ( $today > $calcDate );
+
+ if ( $warning > 0 ) {
$getreserv{'messcompa'} = 1;
}
$getreserv{'title'} = $gettitle->{'title'};
@@ -92,36 +114,39 @@
$getreserv{'itemcallnumber'} =
$gettitle->{'itemcallnumber'};
$getreserv{'borrowernum'} =
$getborrower->{'borrowernumber'};
$getreserv{'borrowername'} =
$getborrower->{'surname'};
- $getreserv{'borrowerfirstname'} =
$getborrower->{'firstname'} ;
- if ($getborrower->{'emailaddress'}){
- $getreserv{'borrowermail'} =
$getborrower->{'emailaddress'} ;
+ $getreserv{'borrowerfirstname'} = $getborrower->{'firstname'};
+
+ if ( $getborrower->{'emailaddress'} ) {
+ $getreserv{'borrowermail'} =
$getborrower->{'emailaddress'};
}
$getreserv{'borrowerphone'} =
$getborrower->{'phone'};
- push(@reservloop, \%getreserv);
+ push( @reservloop, \%getreserv );
}
}
-# If we have a return of reservloop we put it in the branchloop
sequence
- if (@reservloop){
- $branchloop{'reserv'} = address@hidden ;
+
+ # If we have a return of reservloop we put it in the
branchloop sequence
+ if (@reservloop) {
+ $branchloop{'reserv'} = address@hidden;
}
-# else, we unset the value of the branchcode .
- else{
+
+ # else, we unset the value of the branchcode .
+ else {
$branchloop{'branchcode'} = 0;
}
}
else {
+
# if we don't have a retrun from reservestobranch we unset branchname and
branchcode
$branchloop{'branchname'} = 0;
$branchloop{'branchcode'} = 0;
}
- push(@branchesloop, \%branchloop);
+ push( @branchesloop, \%branchloop );
}
- $template->param( branchesloop => address@hidden,
+$template->param(
+ branchesloop => address@hidden,
show_date => format_date($todaysdate)
- );
-
- print "Content-Type: text/html\n\n", $template->output;
-
+);
+print "Content-Type: text/html\n\n", $template->output;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha C4/Members.pm circ/bookcount.pl circ/branc... [rel_3_0],
Antoine Farnault <=