Bug 7388 [SIGNED-OFF] [enh] - round the corners on the side menus in the staff client

[koha.git] / circ / waitingreserves.pl

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index 812027f..128d1eb 100755 (executable)
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright 2000-2002 Katipo Communications
+# parts copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -13,9 +14,9 @@
 # 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
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -44,6 +45,7 @@ my $item           = $input->param('itemnumber');
 my $borrowernumber = $input->param('borrowernumber');
 my $fbr            = $input->param('fbr') || '';
 my $tbr            = $input->param('tbr') || '';
+my $all_branches   = $input->param('allbranches') || '';
 
 my $cancel;
 
@@ -90,11 +92,18 @@ if ($item) {
         ModItemTransfer( $item, $fbr, $tbr );
     }
 }
+if ( C4::Context->preference('IndependantBranches') ) {
+    undef $all_branches;
+} else {
+    $template->param( all_branches_link => $input->url . '?allbranches=1&' . $input->query_string )
+      unless $all_branches;
+}
 
-my @reservloop;
-my @getreserves = C4::Context->preference('IndependantBranches') ? GetReservesForBranch($default) : GetReservesForBranch();
+my (@reservloop, @overloop);
+my ($reservcount, $overcount);
+my @getreserves = $all_branches ? GetReservesForBranch() : GetReservesForBranch($default);
 # get reserves for the branch we are logged into, or for all branches
-       
+
 my $today = Date_to_Days(&Today);
 foreach my $num (@getreserves) {
     next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
@@ -102,24 +111,21 @@ foreach my $num (@getreserves) {
     my $gettitle     = GetBiblioFromItemNumber( $num->{'itemnumber'} );
     # fix up item type for display
     $gettitle->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $gettitle->{'itype'} : $gettitle->{'itemtype'};
-    my $getborrower  = GetMemberDetails( $num->{'borrowernumber'} );
+    my $getborrower = GetMember(borrowernumber => $num->{'borrowernumber'});
     my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );  # using the fixed up itype/itemtype
     $getreserv{'waitingdate'} = format_date( $num->{'waitingdate'} );
-
-    my ( $waiting_year, $waiting_month, $waiting_day ) = split /-/, $num->{'waitingdate'};
+    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 );
 
-    if ($today > $calcDate) {
-        $getreserv{'messcompa'} = 1;
-    }
     $getreserv{'itemtype'}       = $itemtypeinfo->{'description'};
     $getreserv{'title'}          = $gettitle->{'title'};
     $getreserv{'itemnumber'}     = $gettitle->{'itemnumber'};
     $getreserv{'biblionumber'}   = $gettitle->{'biblionumber'};
     $getreserv{'barcode'}        = $gettitle->{'barcode'};
+    $getreserv{'branchname'}     = GetBranchName($gettitle->{'homebranch'});
     $getreserv{'homebranch'}     = $gettitle->{'homebranch'};
     $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
     $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
@@ -133,13 +139,25 @@ foreach my $num (@getreserves) {
     if ( $getborrower->{'emailaddress'} ) {
         $getreserv{'borrowermail'}  = $getborrower->{'emailaddress'};
     }
-    push @reservloop, \%getreserv;
+ 
+    if ($today > $calcDate) {
+        push @overloop,   \%getreserv;
+        $overcount++;
+    }else{
+        push @reservloop, \%getreserv;
+        $reservcount++;
+    }
+    
 }
 
 $template->param(
     reserveloop => \@reservloop,
+    reservecount => $reservcount,
+    overloop    => \@overloop,
+    overcount   => $overcount,
     show_date   => format_date(C4::Dates->today('iso')),
-       dateformat  => C4::Context->preference("dateformat"),
+    dateformat  => C4::Context->preference("dateformat"),
+    ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;