Attachment 3313 Details for Bug 5875 – Proposed Patch

[patch] Proposed Patch

0001-Bug-5875-waitingreserves-highlighting-now-depends-on.patch (text/plain), 7.01 KB, created by Chris Cormack on 2011-03-16 02:01:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2011-03-16 02:01:36 UTC

Size: 7.01 KB

patch

obsolete

>From d00e8be6c34f34fe9366829de09f5125b81a948e Mon Sep 17 00:00:00 2001
>From: Paul Poulain <paul.poulain@biblibre.com>
>Date: Wed, 15 Dec 2010 13:33:51 +0100
>Subject: [PATCH] Bug 5875 : waitingreserves highlighting now depends on maxpickupdate
>
>---
> circ/waitingreserves.pl                            |   32 ++++++++-------
> .../prog/en/includes/reserves_waiting.inc          |   44 ++++++++++++++++++++
> 2 files changed, 61 insertions(+), 15 deletions(-)
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/reserves_waiting.inc
>
>diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
>index 0183f19..c1843db 100755
>--- a/circ/waitingreserves.pl
>+++ b/circ/waitingreserves.pl
>@@ -26,6 +26,7 @@ use C4::Branch; # GetBranchName
> use C4::Auth;
> use C4::Dates qw/format_date/;
> use C4::Circulation;
>+use C4::Reserves; # qw/GetMaxPickUpDelay/;
> use C4::Members;
> use C4::Biblio;
> use C4::Items;
>@@ -112,14 +113,23 @@ foreach my $num (@getreserves) {
>     $gettitle->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $gettitle->{'itype'} : $gettitle->{'itemtype'};
>     my $getborrower  = GetMemberDetails( $num->{'borrowernumber'} );
>     my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );  # using the fixed up itype/itemtype
>-    $getreserv{'waitingdate'} = format_date( $num->{'waitingdate'} );
>+    if ($num->{waitingdate}){
>+	my @maxpickupdate=GetMaxPickupDate($num->{'waitingdate'},$borrowernumber, $num);
>+	$getreserv{'waitingdate'} = format_date( $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 );
>+	$getreserv{'maxpickupdate'} = sprintf("%d-%02d-%02d", @maxpickupdate);
> 
>+	my $calcDate = Date_to_Days( @maxpickupdate );
>+
>+        if ( $today > $calcDate ) {
>+            $getreserv{'messcompa'} = 1;
>+            push @overloop, \%getreserv;
>+            $overcount++;
>+        } else {
>+            push @reservloop, \%getreserv;
>+            $reservcount++;
>+        }
>+    }
>     $getreserv{'itemtype'}       = $itemtypeinfo->{'description'};
>     $getreserv{'title'}          = $gettitle->{'title'};
>     $getreserv{'itemnumber'}     = $gettitle->{'itemnumber'};
>@@ -128,6 +138,7 @@ foreach my $num (@getreserves) {
>     $getreserv{'homebranch'}     = GetBranchName($gettitle->{'homebranch'});
>     $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
>     $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
>+
>     if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
>         $getreserv{'dotransfer'} = 1;
>     }
>@@ -138,15 +149,6 @@ foreach my $num (@getreserves) {
>     if ( $getborrower->{'emailaddress'} ) {
>         $getreserv{'borrowermail'}  = $getborrower->{'emailaddress'};
>     }
>- 
>-    if ($today > $calcDate) {
>-        push @overloop,   \%getreserv;
>-        $overcount++;
>-    }else{
>-        push @reservloop, \%getreserv;
>-        $reservcount++;
>-    }
>-    
> }
> 
> $template->param(
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reserves_waiting.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reserves_waiting.inc
>new file mode 100644
>index 0000000..f3cf244
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reserves_waiting.inc
>@@ -0,0 +1,44 @@
>+
>+
>+	<div class="dialog message" id="reserve">
>+	  <h3>Hold Found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber="></a></h3>
>+        <h4>Notes: </h4>
>+        <h5>Hold for:</h5>
>+		<ul>
>+            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=">
>+                , 
>+            </a> ()</li>
>+            <li><br />
>+			<br />
>+			 </li>
>+            <li></li>
>+            <li><a id="boremail" href="mailto:"></a></li>
>+<li class="error">Patron is RESTRICTED</li>
>+<li class="error">Patron's address is in doubt</li>
>+        </ul>
>+        
>+            <h4><strong>Transfer to:</strong> </h4>
>+		
>+		<h4><strong>Hold at</strong> </h4>
>+        
>+        <form method="post" action="" class="confirm">
>+            
>+		<input type="submit" class="approve" value="Confirm hold and Transfer" />
>+                <input type="submit" value="Print slip, Transfer, and Confirm" class="print" onclick="Dopop('../circ/hold-transfer-slip.pl?transfer=1&amp;borrowernumber=&amp;biblionumber=&amp;op=slip'); $('#reserve').hide(); return false;" />
>+            
>+		<input type="submit" class="approve" value="Confirm hold" />
>+                <input type="submit" value="Print Slip and Confirm" class="print" onclick="Dopop('../circ/hold-transfer-slip.pl?borrowernumber=&amp;biblionumber=&amp;op=slip'); $('#reserve').hide(); return false;" />
>+            
>+            <input type="hidden" name="itemnumber" value="" />
>+            <input type="hidden" name="borrowernumber" value="" />
>+            <input type="hidden" name="resbarcode" value="" />
>+            <input type="hidden" name="reservenumber" value="" />
>+            <input type="hidden" name="diffBranch" value="" />
>+            <input type="hidden" name="exemptfine" value="" />
>+            <input type="hidden" name="dropboxmode" value="" />
>+        </form>
>+	</div>
>+
>+
>+
>+
>-- 
>1.7.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 5875: 3313