[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/includes/m...
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/includes/m... |
|
Date: |
Mon, 23 Apr 2007 16:43:00 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/04/23 16:43:00
Modified files:
koha-tmpl/intranet-tmpl/prog/en/includes: menu-circ.inc
Added files:
circ : pendingreserves.pl transferstodo.pl
waitingreserves.pl
koha-tmpl/intranet-tmpl/prog/en/circ: pendingreserves.tmpl
transferstodo.tmpl
waitingreserves.tmpl
Removed files:
circ : branchreserves.pl currenttransfers.pl
waitingreservestransfers.pl
koha-tmpl/intranet-tmpl/prog/en/circ: branchreserves.tmpl
currenttransfers.tmpl
reserve.tmpl
waitingreservestransfers.tmpl
Log message:
renaming reserves & branchreserves to pendingreserves and
waitingreserves
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/pendingreserves.pl?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/circ/transferstodo.pl?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/circ/waitingreserves.pl?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchreserves.pl?cvsroot=koha&r1=1.9&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/circ/currenttransfers.pl?cvsroot=koha&r1=1.9&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/circ/waitingreservestransfers.pl?cvsroot=koha&r1=1.11&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl?cvsroot=koha&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl?cvsroot=koha&r1=1.4&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl?cvsroot=koha&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl?cvsroot=koha&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc?cvsroot=koha&r1=1.8&r2=1.9
Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc 23 Apr 2007
15:21:17 -0000 1.8
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc 23 Apr 2007
16:42:59 -0000 1.9
@@ -3,11 +3,11 @@
<a href="/cgi-bin/koha/circ/returns.pl">Returns</a>
<a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a>
<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a>
- <a href="/cgi-bin/koha/circ/reserve.pl">Pending</a>
- <a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting</a>
- <a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers to
do</a>
- <a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfersto receive</a>
- <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues by
branch/department</a>
+ <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="reserves waiting to
have an item affected">Pending reserves</a>
+ <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="reserves waiting
for member pickup">Waiting reserves</a>
+ <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from
your library">Transfers to do</a>
+ <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to
receive at your library">Transfers to receive</a>
+ <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues</a>
<a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily
reconciliation</a>
</div>
Index: circ/pendingreserves.pl
===================================================================
RCS file: circ/pendingreserves.pl
diff -N circ/pendingreserves.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ circ/pendingreserves.pl 23 Apr 2007 16:42:59 -0000 1.1
@@ -0,0 +1,162 @@
+#!/usr/bin/perl
+
+# $Id: pendingreserves.pl,v 1.1 2007/04/23 16:42:59 tipaul Exp $
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+use strict;
+use C4::Context;
+use C4::Output;
+use CGI;
+use C4::Auth;
+use C4::Date;
+use C4::Interface::CGI::Output;
+
+my $input = new CGI;
+my $order = $input->param('order');
+my $startdate=$input->param('from');
+my $enddate=$input->param('to');
+
+my $theme = $input->param('theme'); # only used if allowthemeoverride is set
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/pendingreserves.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { circulate => 1 },
+ debug => 1,
+ }
+);
+
+my $duedate;
+my $borrowernumber;
+my $itemnum;
+my $data1;
+my $data2;
+my $data3;
+my $name;
+my $phone;
+my $email;
+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 $dbh = C4::Context->dbh;
+my ($sqlorderby, $sqldatewhere) = ("","");
+
+$sqldatewhere .= " && reservedate >= " . $dbh->quote($startdate) if
($startdate) ;
+$sqldatewhere .= " && reservedate <= " . $dbh->quote($enddate) if ($enddate) ;
+
+if ($order eq "borrower") {
+ $sqlorderby = " order by borrower, reservedate";
+} elsif ($order eq "biblio") {
+ $sqlorderby = " order by biblio.title, priority,reservedate";
+} elsif ($order eq "priority") {
+ $sqlorderby = "order by priority DESC";
+} else {
+ $sqlorderby = " order by reservedate, borrower";
+}
+my $strsth =
+"SELECT reservedate,
+ reserves.borrowernumber as borrowernumber,
+ concat(firstname,' ',surname) as borrower,
+ borrowers.phone,
+ borrowers.email,
+ 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.biblionumber=reserves.biblionumber,
+ borrowers,biblio
+ WHERE isnull(cancellationdate)
+ && reserves.borrowernumber=borrowers.borrowernumber
+ && reserves.biblionumber=biblio.biblionumber
+ && reserves.found is NULL
+ && items.holdingbranch=?
+ ";
+
+$strsth .= $sqlorderby;
+
+my $sth = $dbh->prepare($strsth);
+
+$sth->execute(C4::Context->userenv->{'branch'});
+
+my @reservedata;
+my $previous;
+my $this;
+while ( my $data = $sth->fetchrow_hashref ) {
+ $this=$data->{biblionumber}.":".$data->{borrowernumber};
+ my @itemlist;
+ push(
+ @reservedata,
+ {
+ reservedate => $previous eq $this?"":format_date(
$data->{reservedate} ),
+ priority => $previous eq $this?"":$data->{priority},
+ name => $previous eq $this?"":$data->{borrower},
+ title => $previous eq $this?"":$data->{title},
+ author => $previous eq $this?"":$data->{author},
+ borrowernumber => $previous eq $this?"":$data->{borrowernumber},
+ itemnum => $previous eq $this?"":$data->{itemnumber},
+ phone => $previous eq $this?"":$data->{phone},
+ email => $previous eq $this?"":$data->{email},
+ biblionumber => $previous eq $this?"":$data->{biblionumber},
+ statusw => ( $data->{found} eq "w" ),
+ statusf => ( $data->{found} eq "f" ),
+ holdingbranch => $data->{holdingbranch},
+ branch => $previous eq $this?"":$data->{branch},
+ itemcallnumber => $data->{itemcallnumber},
+ notes => $previous eq $this?"":$data->{notes},
+ notificationdate => $previous eq
$this?"":$data->{notificationdate},
+ reminderdate => $previous eq $this?"":$data->{reminderdate}
+ }
+ );
+ $previous=$this;
+}
+
+$sth->finish;
+
+$template->param(
+ todaysdate => format_date($todaysdate),
+ from => $startdate,
+ to => $enddate,
+ reserveloop => address@hidden,
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+);
+
+output_html_with_http_headers $input, $cookie, $template->output;
Index: circ/transferstodo.pl
===================================================================
RCS file: circ/transferstodo.pl
diff -N circ/transferstodo.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ circ/transferstodo.pl 23 Apr 2007 16:42:59 -0000 1.1
@@ -0,0 +1,150 @@
+#!/usr/bin/perl
+
+# $Id: transferstodo.pl,v 1.1 2007/04/23 16:42:59 tipaul Exp $
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+use strict;
+use C4::Context;
+use C4::Output;
+use CGI;
+use C4::Branch; # GetBranches
+use C4::Auth;
+use C4::Date;
+use C4::Circulation;
+use C4::Reserves;
+use C4::Members;
+use Date::Calc qw(
+ Today
+ Add_Delta_Days
+ Date_to_Days
+);
+use C4::Koha;
+use C4::Biblio;
+
+my $input = new CGI;
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/transferstodo.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { circulate => 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');
+
+# If we have a return of the form dotransfer, we launch the subroutine
dotransfer
+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 ) {
+ my @reservloop;
+ my %branchloop;
+ $branchloop{'branchname'} = $branches->{$br}->{'branchname'};
+ $branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
+ my @getreserves =
+ GetReservesToBranch( $branches->{$br}->{'branchcode'} );
+ if (@getreserves) {
+ foreach my $num (@getreserves) {
+ my %getreserv;
+ my $gettitle = GetBiblioFromItemNumber( $num->{'itemnumber'} );
+# use Data::Dumper;
+# warn Dumper($gettitle);
+ warn "ITEM : ".$gettitle->{'title'};
+ my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
+ if ( $gettitle->{'holdingbranch'} eq $default ) {
+ my $getborrower =
+ GetMemberDetails( $num->{'borrowernumber'} );
+ $getreserv{'reservedate'} =
+ format_date( $num->{'reservedate'} );
+ my ( $reserve_year, $reserve_month, $reserve_day ) = split /-/,
+ $num->{'reservedate'};
+ ( $reserve_year, $reserve_month, $reserve_day ) =
+ Add_Delta_Days( $reserve_year, $reserve_month, $reserve_day,
+ C4::Context->preference('ReservesMaxPickUpDelay'));
+ 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'};
+ $getreserv{'biblionumber'} = $gettitle->{'biblionumber'};
+ $getreserv{'itemnumber'} = $gettitle->{'itemnumber'};
+ $getreserv{'barcode'} = $gettitle->{'barcode'};
+ $getreserv{'itemtype'} = $itemtypeinfo->{'description'};
+ $getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};
+ $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
+ $getreserv{'borrowernum'} =
$getborrower->{'borrowernumber'};
+ $getreserv{'borrowername'} = $getborrower->{'surname'};
+ $getreserv{'borrowerfirstname'} = $getborrower->{'firstname'};
+ $getreserv{'borrowermail'} = $getborrower->{'emailaddress'};
+ $getreserv{'borrowerphone'} = $getborrower->{'phone'};
+ push( @reservloop, \%getreserv );
+ warn "=".$getreserv{'title'}.">>".$gettitle->{'title'};
+ }
+ }
+
+ # 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 {
+ $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 );
+}
+
+$template->param(
+ branchesloop => address@hidden,
+ show_date => format_date($todaysdate)
+);
+
+print "Content-Type: text/html\n\n", $template->output;
+
Index: circ/waitingreserves.pl
===================================================================
RCS file: circ/waitingreserves.pl
diff -N circ/waitingreserves.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ circ/waitingreserves.pl 23 Apr 2007 16:42:59 -0000 1.1
@@ -0,0 +1,161 @@
+#!/usr/bin/perl
+
+# $Id: waitingreserves.pl,v 1.1 2007/04/23 16:42:59 tipaul Exp $
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+use strict;
+use C4::Context;
+use C4::Output;
+use CGI;
+use C4::Branch; # GetBranchName
+use C4::Auth;
+use C4::Date;
+use C4::Circulation;
+use C4::Members;
+use C4::Biblio;
+
+use Date::Calc qw(
+ Today
+ Add_Delta_Days
+ Date_to_Days
+);
+use C4::Reserves;
+use C4::Koha;
+use C4::Interface::CGI::Output;
+
+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 $cancel;
+
+my $theme = $input->param('theme'); # only used if allowthemeoverride is set
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/waitingreserves.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { circulate => 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] );
+
+# if we have a return from the form we launch the subroutine CancelReserve
+if ($item) {
+ my $messages;
+ my $nextreservinfo;
+ my $waiting;
+ ( $messages, $nextreservinfo ) = GlobalCancel( $item, $borrowernumber );
+
+ # if we have a result
+ if ($nextreservinfo) {
+ my $borrowerinfo = GetMemberDetails( $nextreservinfo );
+ my $iteminfo = GetBiblioFromItemNumber($item);
+ if ( $messages->{'transfert'} ) {
+ my $branchname = GetBranchName( $messages->{'transfert'} );
+ $template->param(
+ messagetransfert => $messages->{'transfert'},
+ branchname => $branchname,
+ );
+ }
+ if ( $messages->{'waiting'} ) {
+ $waiting = 1;
+ }
+
+ $template->param(
+ message => 1,
+ nextreservnumber => $nextreservinfo,
+ nextreservsurname => $borrowerinfo->{'surname'},
+ nextreservfirstname => $borrowerinfo->{'firstname'},
+ nextreservitem => $item,
+ nextreservtitle => $iteminfo->{'title'},
+ 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 ) ) {
+ dotransfer( $item, $fbr, $tbr );
+ }
+}
+
+my @reservloop;
+
+my @getreserves = GetReservesForBranch($default);
+
+foreach my $num (@getreserves) {
+ my %getreserv;
+ my $gettitle = GetBiblioFromItemNumber( $num->{'itemnumber'} );
+ my $getborrower = GetMemberDetails( $num->{'borrowernumber'} );
+ my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
+ $getreserv{'waitingdate'} = format_date( $num->{'waitingdate'} );
+
+ next unless $num->{'waitingdate'} ne '0000-00-00';
+ my ( $waiting_year, $waiting_month, $waiting_day ) = split /-/,
+ $num->{'waitingdate'};
+ ( $waiting_year, $waiting_month, $waiting_day ) =
+ Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day,
+ C4::Context->preference('ReservesMaxPickUpDelay'));
+ 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'};
+ $getreserv{'itemnumber'} = $gettitle->{'itemnumber'};
+ $getreserv{'biblionumber'} = $gettitle->{'biblionumber'};
+ $getreserv{'barcode'} = $gettitle->{'barcode'};
+ $getreserv{'itemtype'} = $itemtypeinfo->{'description'};
+ $getreserv{'homebranch'} = $gettitle->{'homebranch'};
+ $getreserv{'holdingbranch'} = $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{'borrowerphone'} = $getborrower->{'phone'};
+ push( @reservloop, \%getreserv );
+}
+
+$template->param(
+ reserveloop => address@hidden,
+ show_date => format_date($todaysdate),
+);
+
+output_html_with_http_headers $input, $cookie, $template->output;
Index: koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl 23 Apr 2007
16:42:59 -0000 1.1
@@ -0,0 +1,172 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha › Circulation › Reserve</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-system.css">
+<!-- End of additions --><!-- Additions to enable Calendar system -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+
+<h1>Pending reserves as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
+<div id="filters">
+<br />
+<form method="post" >
+<p>
+<label for "from">
+ Start date:
+</label>
+<input type="text"
+ size="10"
+ id="from"
+ name="from"
+ value="<!-- TMPL_VAR NAME="from" -->" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif"
+ border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top"
/>
+<script language="JavaScript" type="text/javascript">
+function validate1(date) {
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var weekDay = date.getDay();
+ var dayMonth = month + '-' + day;
+ var dateString = year + '-' + month + '-' + day;
+ var dateTo = document.getElementById('to').value.split("-");
+ var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+ if (date > limitDate) {
+ return true;
+ } else {
+ return false;
+ }
+}
+Calendar.setup(
+ {
+ inputField : "from",
+ ifFormat : "%Y-%m-%d",
+ button : "openCalendarFrom",
+ disableFunc : validate1,
+ dateStatusFunc : validate1
+ }
+);
+</script>
+<label for "to" >
+ End date:
+</label>
+<input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->"
type="text" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif"
+ id="openCalendarTo"
+ style="cursor: pointer;"
+ valign="top" border="0" />
+<script type="text/javascript">
+ function validate2(date) {
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var weekDay = date.getDay();
+ var dayMonth = month + '-' + day;
+ var dateString = year + '-' + month + '-' + day;
+ var dateFrom = document.getElementById('from').value.split("-");
+ var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1),
dateFrom[2]);
+ if (limitDate > date) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ Calendar.setup(
+ {
+ inputField : "to",
+ ifFormat : "%Y-%m-%d",
+ button : "openCalendarTo",
+ disableFunc : validate2,
+ dateStatusFunc : validate2
+ }
+ );
+</script>
+(inclusive)
+<input type="submit" value="Go" class="submit">
+</p>
+</form>
+<p>The following reserves have not be affected to any item.</p>
+<p>Please go in the shelves, pickup a book and do a return on them :</p>
+</div>
+
+<div class="searchresults">
+ <!-- TMPL_IF NAME="reserveloop" -->
+ <table>
+ <tr>
+ <th >
+ Priority
+ <a href="/cgi-bin/koha/circ/reserve.pl?order=priority">Sort</a>
+ </th>
+ <th >Reserve Date
+ <a href="/cgi-bin/koha/circ/reserve.pl?order=date">Sort</a>
+ </th>
+ <th >Patron
+ <a href="/cgi-bin/koha/circ/reserve.pl?order=borrower">Sort</a>
+ </th>
+ <th >Title
+ <a href="/cgi-bin/koha/circ/reserve.pl?order=biblio">Sort</a>
+ </th>
+ <th >
+ Location
+ </th>
+ </tr>
+
+ <!-- TMPL_LOOP NAME="reserveloop" -->
+ <tr>
+ <!-- TMPL_IF name="borrowernumber" -->
+ <td><p><!-- TMPL_VAR NAME="priority" --></p></td>
+ <td width="15%">
+ <p><!-- TMPL_VAR NAME="reservedate" --></p>
+ <p>in <!-- TMPL_VAR NAME="branch" --></p>
+ <!-- TMPL_IF NAME="statusw" --><p>Waiting</p><!-- /TMPL_IF
--><!-- TMPL_IF NAME="statusf" --><p>Fullfilled</p><!-- /TMPL_IF -->
+ </td>
+ <td>
+ <p><a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR
Name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a><br /><!-- TMPL_VAR
NAME="phone" --><br />
+ <!-- TMPL_IF NAME="email" --><a href="mailto:<!-- TMPL_VAR
NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
+ <!-- TMPL_VAR NAME="email" --></a><!--/TMPL_IF-->
+ </p>
+ </td>
+ <td>
+ <p>
+ <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+ <a
href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
+ </a>
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+ <a
href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
+ </a>
+ <!-- TMPL_ELSE -->
+ <a
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
+ </a>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ </p>
+ <p><!-- TMPL_VAR NAME="notes" --></p>
+ </td>
+ <!-- TMPL_ELSE -->
+ <td colspan="2">
+
+ </td>
+ <td>"</td>
+ <td>"</td>
+ <!-- /TMPL_IF -->
+ <td><p><!-- TMPL_VAR NAME="holdingbranch" --> <!-- TMPL_VAR
NAME="itemcallnumber" --></p></td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+ <!-- TMPL_ELSE -->
+ <b>No items found.</b>
+ <!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl 23 Apr 2007
16:42:59 -0000 1.1
@@ -0,0 +1,61 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha › Circulation
+<!-- TMPL_IF Name="borrowernumber" -->
+: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname"
-->
+(<!-- TMPL_VAR NAME="cardnumber" -->)
+<!-- /TMPL_IF --></title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+
+
+<div id="mainbloc">
+ <h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
+ <div id="resultlist">
+ <!-- TMPL_LOOP NAME="branchesloop" -->
+ <!-- TMPL_IF NAME="branchcode" -->
+ <table>
+ <tr>
+ <th class="circulation" colspan="5">Reserves in wait to
the library : <!-- TMPL_VAR NAME="branchname" --> </th>
+ </tr>
+ <tr>
+ <th class="circulation">Date of reserve</th>
+ <th class="circulation">Title</th>
+ <th class="circulation">Borrower</th>
+ <th class="circulation">Localisation</th>
+ <th class="circulation">Action</th>
+ </tr>
+ <!-- TMPL_LOOP NAME="reserv" -->
+ <tr <!-- TMPL_IF NAME="messcompa" --> class="problem"
<!-- /TMPL_IF -->>
+ <td><p><!-- TMPL_VAR NAME="reservedate" --></p>
<!-- TMPL_IF NAME="messcompa" --> Reserve over <!-- /TMPL_IF --></td>
+ <td>
+ <p>
+ <a
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+ (<b><!-- TMPL_VAR
NAME="itemtype" --> </b>)
+ <br />Barcode : <!-- TMPL_VAR
NAME="barcode" -->
+ </p>
+ </td>
+ <td>
+ <p><a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR
Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!--
TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR
NAME="borrowerphone" --><br />
+ <!-- TMPL_IF NAME="borrowermail" --><a
href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR
NAME="title" -->">
+ <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
+ </p>
+ </td>
+ <td><p><!-- TMPL_VAR NAME="holdingbranch" -->
<!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
+ <td>
+ <form name="dotransfer"
action="waitingreservestransfers.pl" method="post">
+ <input type="hidden"
name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+ <input type="hidden" name="fbr"
value="<!-- TMPL_VAR NAME="holdingbranch" -->">
+ <input type="hidden" name="tbr"
value="<!-- TMPL_VAR NAME="branchcode" -->">
+ <input type="submit" value="Transfer this
document">
+ </form>
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+ <br><br>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ </div>
+</div>
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl 23 Apr 2007
16:42:59 -0000 1.1
@@ -0,0 +1,85 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha › Circulation</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+
+<h1>Circulation: Branch Reserves</h1>
+
+<div id="mainbloc">
+ <h1 class="circulation">Reserves of your library the : <!-- TMPL_VAR
NAME="show_date" --></h1>
+ <!-- TMPL_IF NAME="messagetransfert" -->
+ <div>
+ <h2>Reserve find for the document(<!--
TMPL_VAR NAME="nextreservtitle" -->)must transfered</h2>
+ <p>This documen is reserved by : <b> <!-- TMPL_VAR
NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b>
at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please put this
document in transfer .
+ </p>
+ <form name="cancelReservewithtransfert"
action="waitingreserves.pl" method="post">
+ <input type="submit" class="button
circulation">
+ </form>
+ </div>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="waiting" -->
+ <div id="bloc25">
+ <h2 class="circulation">This document is in
Waiting status</h2>
+ <p>This document (<!-- TMPL_VAR NAME="nextreservtitle"
-->) is reserved by <b> : <!-- TMPL_VAR NAME="nextreservsurname" --> <!--
TMPL_VAR NAME="nextreservfirstname" --></b>,
+ Please keep this document for the next reserve .
+ </p>
+ <form name="cancelReservewithwaiting"
action="waitingreserves.pl" method="post">
+ <input type="submit">
+ </form>
+ </div>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_UNLESS NAME="message" -->
+ <div id="resultlist">
+ <!-- TMPL_IF NAME="reserveloop" -->
+ <table>
+ <tr>
+ <th class="circulation" colspan="5">Reserves of your
library</th>
+ </tr>
+ <tr>
+ <th class="circulation">Available since</th>
+ <th class="circulation">Title</th>
+ <th class="circulation">Borrower</th>
+ <th class="circulation">Localisation</th>
+ <th class="circulation">Action</th>
+ </tr>
+ <!-- TMPL_LOOP NAME="reserveloop" -->
+ <tr <!-- TMPL_IF NAME="messcompa" -->
class="problem" <!-- /TMPL_IF -->>
+ <td><p><!-- TMPL_VAR
NAME="waitingdate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserve Over <!--
/TMPL_IF --></td>
+ <td>
+ <p>
+ <a
href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+ (<b><!--
TMPL_VAR NAME="itemtype" --></b>)
+ <br />Barcode : <!--
TMPL_VAR NAME="barcode" -->
+ </p>
+ </td>
+ <td>
+ <p><a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR
Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!--
TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR
NAME="borrowerphone" --><br />
+ <!-- TMPL_IF NAME="borrowermail" --><a
href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR
NAME="title" -->">
+ <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
+ </p>
+ </td>
+ <td><p><!-- TMPL_VAR NAME="homebranch"
--> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
+ <td>
+ <form name="cancelReserve -->"
action="waitingreserves.pl" method="post">
+ <input type="hidden"
name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernum" -->">
+ <input type="hidden"
name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+ <input type="hidden"
name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->">
+ <input type="hidden"
name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->">
+ <!-- TMPL_IF
NAME="dotransfer" -->
+ <input type="submit"
value="Cancel reserve and return to : <!-- TMPL_VAR NAME="homebranch" -->">
+ <!-- TMPL_ELSE -->
+ <input type="submit"
value="Cancel reserve" >
+ <!-- /TMPL_IF -->
+ </form>
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+ <!-- TMPL_ELSE -->
+ <b>No reserve found.</b>
+ <!-- /TMPL_IF -->
+ </div>
+ <!-- /TMPL_UNLESS -->
+</div>
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: circ/branchreserves.pl
===================================================================
RCS file: circ/branchreserves.pl
diff -N circ/branchreserves.pl
--- circ/branchreserves.pl 23 Apr 2007 14:08:47 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,161 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: branchreserves.pl,v 1.9 2007/04/23 14:08:47 tipaul Exp $
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-
-use strict;
-use C4::Context;
-use C4::Output;
-use CGI;
-use C4::Branch; # GetBranchName
-use C4::Auth;
-use C4::Date;
-use C4::Circulation;
-use C4::Members;
-use C4::Biblio;
-
-use Date::Calc qw(
- Today
- Add_Delta_Days
- Date_to_Days
-);
-use C4::Reserves;
-use C4::Koha;
-use C4::Interface::CGI::Output;
-
-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 $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",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { circulate => 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] );
-
-# if we have a return from the form we launch the subroutine CancelReserve
-if ($item) {
- my $messages;
- my $nextreservinfo;
- my $waiting;
- ( $messages, $nextreservinfo ) = GlobalCancel( $item, $borrowernumber );
-
- # if we have a result
- if ($nextreservinfo) {
- my $borrowerinfo = GetMemberDetails( $nextreservinfo );
- my $iteminfo = GetBiblioFromItemNumber($item);
- if ( $messages->{'transfert'} ) {
- my $branchname = GetBranchName( $messages->{'transfert'} );
- $template->param(
- messagetransfert => $messages->{'transfert'},
- branchname => $branchname,
- );
- }
- if ( $messages->{'waiting'} ) {
- $waiting = 1;
- }
-
- $template->param(
- message => 1,
- nextreservnumber => $nextreservinfo,
- nextreservsurname => $borrowerinfo->{'surname'},
- nextreservfirstname => $borrowerinfo->{'firstname'},
- nextreservitem => $item,
- nextreservtitle => $iteminfo->{'title'},
- 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 ) ) {
- dotransfer( $item, $fbr, $tbr );
- }
-}
-
-my @reservloop;
-
-my @getreserves = GetReservesForBranch($default);
-
-foreach my $num (@getreserves) {
- my %getreserv;
- my $gettitle = GetBiblioFromItemNumber( $num->{'itemnumber'} );
- my $getborrower = GetMemberDetails( $num->{'borrowernumber'} );
- my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
- $getreserv{'waitingdate'} = format_date( $num->{'waitingdate'} );
-
- next unless $num->{'waitingdate'} ne '0000-00-00';
- my ( $waiting_year, $waiting_month, $waiting_day ) = split /-/,
- $num->{'waitingdate'};
- ( $waiting_year, $waiting_month, $waiting_day ) =
- Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day,
- C4::Context->preference('ReservesMaxPickUpDelay'));
- 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'};
- $getreserv{'itemnumber'} = $gettitle->{'itemnumber'};
- $getreserv{'biblionumber'} = $gettitle->{'biblionumber'};
- $getreserv{'barcode'} = $gettitle->{'barcode'};
- $getreserv{'itemtype'} = $itemtypeinfo->{'description'};
- $getreserv{'homebranch'} = $gettitle->{'homebranch'};
- $getreserv{'holdingbranch'} = $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{'borrowerphone'} = $getborrower->{'phone'};
- push( @reservloop, \%getreserv );
-}
-
-$template->param(
- reserveloop => address@hidden,
- show_date => format_date($todaysdate),
-);
-
-output_html_with_http_headers $input, $cookie, $template->output;
Index: circ/currenttransfers.pl
===================================================================
RCS file: circ/currenttransfers.pl
diff -N circ/currenttransfers.pl
--- circ/currenttransfers.pl 23 Apr 2007 14:08:47 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,143 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: currenttransfers.pl,v 1.9 2007/04/23 14:08:47 tipaul Exp $
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Context;
-use C4::Output;
-use C4::Branch;
-use C4::Auth;
-use C4::Date;
-use C4::Biblio;
-use C4::Circulation;
-use C4::Members;
-use C4::Interface::CGI::Output;
-use Date::Calc qw(
- Today
- Add_Delta_Days
- Date_to_Days
-);
-
-use C4::Koha;
-use C4::Reserves;
-
-my $input = new CGI;
-
-my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-my $itemnumber = $input->param('itemnumber');
-my $todaysdate = join "-", &Today;
-
-# if we have a resturn of the form to delete the transfer, we launch the
subrroutine
-if ($itemnumber) {
- C4::Circulation::Circ2::DeleteTransfer($itemnumber);
-}
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- {
- template_name => "circ/currenttransfers.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { circulate => 1 },
- debug => 1,
- }
-);
-
-# set the userenv branch
-my $default = C4::Context->userenv->{'branch'};
-
-# get the all the branches for reference
-my $branches = GetBranches();
-my @branchesloop;
-foreach my $br ( keys %$branches ) {
- my @transferloop;
- my %branchloop;
- $branchloop{'branchname'} = $branches->{$br}->{'branchname'};
- $branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
- my @gettransfers =
- GetTransfersFromTo( $branches->{$br}->{'branchcode'}, $default );
-
- if (@gettransfers) {
- foreach my $num (@gettransfers) {
- my %getransf;
-
- my ( $sent_year, $sent_month, $sent_day ) = split "-",
- $num->{'datesent'};
- $sent_day = ( split " ", $sent_day )[0];
- ( $sent_year, $sent_month, $sent_day ) =
- Add_Delta_Days( $sent_year, $sent_month, $sent_day,
- C4::Context->preference('TransfersMaxDaysWarning'));
- my $calcDate = Date_to_Days( $sent_year, $sent_month, $sent_day );
- my $today = Date_to_Days(&Today);
- my $warning = ( $today > $calcDate );
-
- if ( $warning > 0 ) {
- $getransf{'messcompa'} = 1;
- }
- my $gettitle = GetBiblioFromItemNumber( $num->{'itemnumber'} );
- my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
-
- $getransf{'title'} = $gettitle->{'title'};
- $getransf{'datetransfer'} = format_date( $num->{'datesent'} );
- $getransf{'biblionumber'} = $gettitle->{'biblionumber'};
- $getransf{'itemnumber'} = $gettitle->{'itemnumber'};
- $getransf{'barcode'} = $gettitle->{'barcode'};
- $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 =
- GetMemberDetails( $checkreserv[1] );
- $getransf{'borrowernum'} = $getborrower->{'borrowernumber'};
- $getransf{'borrowername'} = $getborrower->{'surname'};
- $getransf{'borrowerfirstname'} = $getborrower->{'firstname'};
- if ( $getborrower->{'emailaddress'} ) {
- $getransf{'borrowermail'} = $getborrower->{'emailaddress'};
- }
- $getransf{'borrowerphone'} = $getborrower->{'phone'};
-
- }
- push( @transferloop, \%getransf );
- }
-
- # 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 );
-}
-
-$template->param(
- branchesloop => address@hidden,
- show_date => format_date($todaysdate),
-);
-
-output_html_with_http_headers $input, $cookie, $template->output;
-
Index: circ/waitingreservestransfers.pl
===================================================================
RCS file: circ/waitingreservestransfers.pl
diff -N circ/waitingreservestransfers.pl
--- circ/waitingreservestransfers.pl 23 Apr 2007 14:08:47 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,150 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: waitingreservestransfers.pl,v 1.11 2007/04/23 14:08:47 tipaul Exp $
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-
-use strict;
-use C4::Context;
-use C4::Output;
-use CGI;
-use C4::Branch; # GetBranches
-use C4::Auth;
-use C4::Date;
-use C4::Circulation;
-use C4::Reserves;
-use C4::Members;
-use Date::Calc qw(
- Today
- Add_Delta_Days
- Date_to_Days
-);
-use C4::Koha;
-use C4::Biblio;
-
-my $input = new CGI;
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- {
- template_name => "circ/waitingreservestransfers.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { circulate => 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');
-
-# If we have a return of the form dotransfer, we launch the subroutine
dotransfer
-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 ) {
- my @reservloop;
- my %branchloop;
- $branchloop{'branchname'} = $branches->{$br}->{'branchname'};
- $branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
- my @getreserves =
- GetReservesToBranch( $branches->{$br}->{'branchcode'} );
- if (@getreserves) {
- foreach my $num (@getreserves) {
- my %getreserv;
- my $gettitle = GetBiblioFromItemNumber( $num->{'itemnumber'} );
-# use Data::Dumper;
-# warn Dumper($gettitle);
- warn "ITEM : ".$gettitle->{'title'};
- my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
- if ( $gettitle->{'holdingbranch'} eq $default ) {
- my $getborrower =
- GetMemberDetails( $num->{'borrowernumber'} );
- $getreserv{'reservedate'} =
- format_date( $num->{'reservedate'} );
- my ( $reserve_year, $reserve_month, $reserve_day ) = split /-/,
- $num->{'reservedate'};
- ( $reserve_year, $reserve_month, $reserve_day ) =
- Add_Delta_Days( $reserve_year, $reserve_month, $reserve_day,
- C4::Context->preference('ReservesMaxPickUpDelay'));
- 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'};
- $getreserv{'biblionumber'} = $gettitle->{'biblionumber'};
- $getreserv{'itemnumber'} = $gettitle->{'itemnumber'};
- $getreserv{'barcode'} = $gettitle->{'barcode'};
- $getreserv{'itemtype'} = $itemtypeinfo->{'description'};
- $getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};
- $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
- $getreserv{'borrowernum'} =
$getborrower->{'borrowernumber'};
- $getreserv{'borrowername'} = $getborrower->{'surname'};
- $getreserv{'borrowerfirstname'} = $getborrower->{'firstname'};
- $getreserv{'borrowermail'} = $getborrower->{'emailaddress'};
- $getreserv{'borrowerphone'} = $getborrower->{'phone'};
- push( @reservloop, \%getreserv );
- warn "=".$getreserv{'title'}.">>".$gettitle->{'title'};
- }
- }
-
- # 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 {
- $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 );
-}
-
-$template->param(
- branchesloop => address@hidden,
- show_date => format_date($todaysdate)
-);
-
-print "Content-Type: text/html\n\n", $template->output;
-
Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl 17 Apr 2007
08:46:05 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Circulation</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
-<h1>Circulation: Branch Reserves</h1>
-
-<div id="mainbloc">
- <h1 class="circulation">Reserves of your library the : <!-- TMPL_VAR
NAME="show_date" --></h1>
- <!-- TMPL_IF NAME="messagetransfert" -->
- <div>
- <h2>Reserve find for the document(<!-- TMPL_VAR
NAME="nextreservtitle" -->)must transfered</h2>
- <p>This documen is reserved by : <b> <!-- TMPL_VAR
NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b>
at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please put this
document in transfer .
- </p>
- <form name="cancelReservewithtransfert"
action="branchreserves.pl" method="post">
- <input type="submit" class="button circulation">
- </form>
- </div>
- <!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="waiting" -->
- <div id="bloc25">
- <h2 class="circulation">This document is in
Waiting status</h2>
- <p>This document (<!-- TMPL_VAR NAME="nextreservtitle"
-->) is reserved by <b> : <!-- TMPL_VAR NAME="nextreservsurname" --> <!--
TMPL_VAR NAME="nextreservfirstname" --></b>,
- Please keep this document for the next reserve .
- </p>
- <form name="cancelReservewithwaiting"
action="branchreserves.pl" method="post">
- <input type="submit">
- </form>
- </div>
- <!-- /TMPL_IF -->
- <!-- TMPL_UNLESS NAME="message" -->
- <div id="resultlist">
- <!-- TMPL_IF NAME="reserveloop" -->
- <table>
- <tr>
- <th class="circulation" colspan="5">Reserves of your
library</th>
- </tr>
- <tr>
- <th class="circulation">Available since</th>
- <th class="circulation">Title</th>
- <th class="circulation">Borrower</th>
- <th class="circulation">Localisation</th>
- <th class="circulation">Action</th>
- </tr>
- <!-- TMPL_LOOP NAME="reserveloop" -->
- <tr <!-- TMPL_IF NAME="messcompa" -->
class="problem" <!-- /TMPL_IF -->>
- <td><p><!-- TMPL_VAR NAME="waitingdate"
--></p> <!-- TMPL_IF NAME="messcompa" --> Reserve Over <!-- /TMPL_IF --></td>
- <td>
- <p>
- <a
href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
- (<b><!--
TMPL_VAR NAME="itemtype" --></b>)
- <br />Barcode : <!--
TMPL_VAR NAME="barcode" -->
- </p>
- </td>
- <td>
- <p><a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR
Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!--
TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR
NAME="borrowerphone" --><br />
- <!-- TMPL_IF NAME="borrowermail" --><a
href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR
NAME="title" -->">
- <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
- </p>
- </td>
- <td><p><!-- TMPL_VAR NAME="homebranch"
--> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
- <td>
- <form name="cancelReserve -->"
action="branchreserves.pl" method="post">
- <input type="hidden"
name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernum" -->">
- <input type="hidden"
name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
- <input type="hidden"
name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->">
- <input type="hidden"
name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->">
- <!-- TMPL_IF
NAME="dotransfer" -->
- <input type="submit"
value="Cancel reserve and return to : <!-- TMPL_VAR NAME="homebranch" -->">
- <!-- TMPL_ELSE -->
- <input type="submit"
value="Cancel reserve" >
- <!-- /TMPL_IF -->
- </form>
- </td>
- </tr>
- <!-- /TMPL_LOOP -->
- </table>
- <!-- TMPL_ELSE -->
- <b>No reserve found.</b>
- <!-- /TMPL_IF -->
- </div>
- <!-- /TMPL_UNLESS -->
-</div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl
--- koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl 17 Apr 2007
08:46:05 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Circulation</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
-<div id="mainbloc">
- <h1 class="circulation">Transfers made TO your library the : <!--
TMPL_VAR NAME="show_date" --></h1>
- <p>You are the destination of this transfer</p>
- <div id="resultlist">
- <!-- TMPL_LOOP NAME="branchesloop" -->
- <!-- TMPL_IF NAME="branchcode" -->
- <table>
- <tr>
- <th class="circulation" colspan="5">Coming from <!--
TMPL_VAR NAME="branchname" --> </th>
- </tr>
- <tr>
- <th class="circulation">Date of transfer</th>
- <th class="circulation">Title</th>
- <th class="circulation">Reserved by </th>
- <th class="circulation">Localisation</th>
- <th class="circulation">Action</th>
- </tr>
- <!-- TMPL_LOOP NAME="reserv" -->
- <tr <!-- TMPL_IF NAME="messcompa" --> class="problem"
<!-- /TMPL_IF -->>
- <td><p><!-- TMPL_VAR NAME="datetransfer"
--></p> <!-- TMPL_IF NAME="messcompa" --> check this transfer<!-- /TMPL_IF
--></td>
- <td>
- <p>
- <a
href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
- (<b><!-- TMPL_VAR
NAME="itemtype" --> </b>)
- <br />Barcode : <!-- TMPL_VAR
NAME="barcode" -->
- </p>
- </td>
- <td>
- <!-- TMPL_IF NAME="borrowername" -->
- <p><a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR
Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!--
TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR
NAME="borrowerphone" --><br />
- <!-- TMPL_IF NAME="borrowermail" --><a
href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR
NAME="title" -->">
- <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
- </p>
- <!-- TMPL_ELSE -->
- <p>
- None
- </p>
- <!-- /TMPL_IF -->
- </td>
- <td><p><!-- TMPL_VAR NAME="homebranch" --> <!--
TMPL_VAR NAME="itemcallnumber" --></p></td>
- <td>
- <!--<form name="dotransfer"
action="currenttransfers.pl" method="post">
- <input type="hidden"
name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
- <input type="submit" value="Cancel this
transfer">
- </form>-->
- </td>
- </tr>
- <!-- /TMPL_LOOP -->
- </table>
- <br><br>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- </div>
-</div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl
--- koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl 11 Mar 2007 21:08:12
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,172 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Circulation › Reserve</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-system.css">
-<!-- End of additions --><!-- Additions to enable Calendar system -->
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-en.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-setup.js"></script>
-<!-- End of additions -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
-<h1>Pending reserves as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
-<div id="filters">
-<br />
-<form method="post" >
-<p>
-<label for "from">
- Start date:
-</label>
-<input type="text"
- size="10"
- id="from"
- name="from"
- value="<!-- TMPL_VAR NAME="from" -->" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif"
- border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top"
/>
-<script language="JavaScript" type="text/javascript">
-function validate1(date) {
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var weekDay = date.getDay();
- var dayMonth = month + '-' + day;
- var dateString = year + '-' + month + '-' + day;
- var dateTo = document.getElementById('to').value.split("-");
- var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
- if (date > limitDate) {
- return true;
- } else {
- return false;
- }
-}
-Calendar.setup(
- {
- inputField : "from",
- ifFormat : "%Y-%m-%d",
- button : "openCalendarFrom",
- disableFunc : validate1,
- dateStatusFunc : validate1
- }
-);
-</script>
-<label for "to" >
- End date:
-</label>
-<input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->"
type="text" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif"
- id="openCalendarTo"
- style="cursor: pointer;"
- valign="top" border="0" />
-<script type="text/javascript">
- function validate2(date) {
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var weekDay = date.getDay();
- var dayMonth = month + '-' + day;
- var dateString = year + '-' + month + '-' + day;
- var dateFrom = document.getElementById('from').value.split("-");
- var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1),
dateFrom[2]);
- if (limitDate > date) {
- return true;
- } else {
- return false;
- }
- }
-
- Calendar.setup(
- {
- inputField : "to",
- ifFormat : "%Y-%m-%d",
- button : "openCalendarTo",
- disableFunc : validate2,
- dateStatusFunc : validate2
- }
- );
-</script>
-(inclusive)
-<input type="submit" value="Go" class="submit">
-</p>
-</form>
-<p>The following reserves have not be affected to any item.</p>
-<p>Please go in the shelves, pickup a book and do a return on them :</p>
-</div>
-
-<div class="searchresults">
- <!-- TMPL_IF NAME="reserveloop" -->
- <table>
- <tr>
- <th >
- Priority
- <a href="/cgi-bin/koha/circ/reserve.pl?order=priority">Sort</a>
- </th>
- <th >Reserve Date
- <a href="/cgi-bin/koha/circ/reserve.pl?order=date">Sort</a>
- </th>
- <th >Patron
- <a href="/cgi-bin/koha/circ/reserve.pl?order=borrower">Sort</a>
- </th>
- <th >Title
- <a href="/cgi-bin/koha/circ/reserve.pl?order=biblio">Sort</a>
- </th>
- <th >
- Location
- </th>
- </tr>
-
- <!-- TMPL_LOOP NAME="reserveloop" -->
- <tr>
- <!-- TMPL_IF name="borrowernumber" -->
- <td><p><!-- TMPL_VAR NAME="priority" --></p></td>
- <td width="15%">
- <p><!-- TMPL_VAR NAME="reservedate" --></p>
- <p>in <!-- TMPL_VAR NAME="branch" --></p>
- <!-- TMPL_IF NAME="statusw" --><p>Waiting</p><!-- /TMPL_IF
--><!-- TMPL_IF NAME="statusf" --><p>Fullfilled</p><!-- /TMPL_IF -->
- </td>
- <td>
- <p><a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR
Name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a><br /><!-- TMPL_VAR
NAME="phone" --><br />
- <!-- TMPL_IF NAME="email" --><a href="mailto:<!-- TMPL_VAR
NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
- <!-- TMPL_VAR NAME="email" --></a><!--/TMPL_IF-->
- </p>
- </td>
- <td>
- <p>
- <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
- <a
href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
- <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
- </a>
- <!-- TMPL_ELSE -->
- <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
- <a
href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
- <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
- </a>
- <!-- TMPL_ELSE -->
- <a
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
- <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
- </a>
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
- </p>
- <p><!-- TMPL_VAR NAME="notes" --></p>
- </td>
- <!-- TMPL_ELSE -->
- <td colspan="2">
-
- </td>
- <td>"</td>
- <td>"</td>
- <!-- /TMPL_IF -->
- <td><p><!-- TMPL_VAR NAME="holdingbranch" --> <!-- TMPL_VAR
NAME="itemcallnumber" --></p></td>
- </tr>
- <!-- /TMPL_LOOP -->
- </table>
- <!-- TMPL_ELSE -->
- <b>No items found.</b>
- <!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
--- koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl 17 Apr
2007 08:46:05 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Circulation
-<!-- TMPL_IF Name="borrowernumber" -->
-: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname"
-->
-(<!-- TMPL_VAR NAME="cardnumber" -->)
-<!-- /TMPL_IF --></title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
-
-<div id="mainbloc">
- <h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
- <div id="resultlist">
- <!-- TMPL_LOOP NAME="branchesloop" -->
- <!-- TMPL_IF NAME="branchcode" -->
- <table>
- <tr>
- <th class="circulation" colspan="5">Reserves in wait to
the library : <!-- TMPL_VAR NAME="branchname" --> </th>
- </tr>
- <tr>
- <th class="circulation">Date of reserve</th>
- <th class="circulation">Title</th>
- <th class="circulation">Borrower</th>
- <th class="circulation">Localisation</th>
- <th class="circulation">Action</th>
- </tr>
- <!-- TMPL_LOOP NAME="reserv" -->
- <tr <!-- TMPL_IF NAME="messcompa" --> class="problem"
<!-- /TMPL_IF -->>
- <td><p><!-- TMPL_VAR NAME="reservedate" --></p>
<!-- TMPL_IF NAME="messcompa" --> Reserve over <!-- /TMPL_IF --></td>
- <td>
- <p>
- <a
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
- (<b><!-- TMPL_VAR
NAME="itemtype" --> </b>)
- <br />Barcode : <!-- TMPL_VAR
NAME="barcode" -->
- </p>
- </td>
- <td>
- <p><a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR
Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!--
TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR
NAME="borrowerphone" --><br />
- <!-- TMPL_IF NAME="borrowermail" --><a
href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR
NAME="title" -->">
- <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
- </p>
- </td>
- <td><p><!-- TMPL_VAR NAME="holdingbranch" -->
<!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
- <td>
- <form name="dotransfer"
action="waitingreservestransfers.pl" method="post">
- <input type="hidden"
name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
- <input type="hidden" name="fbr"
value="<!-- TMPL_VAR NAME="holdingbranch" -->">
- <input type="hidden" name="tbr"
value="<!-- TMPL_VAR NAME="branchcode" -->">
- <input type="submit" value="Transfer this
document">
- </form>
- </td>
- </tr>
- <!-- /TMPL_LOOP -->
- </table>
- <br><br>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- </div>
-</div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/includes/m...,
paul poulain <=