[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/members/mo... [rel_3_0]
|
From: |
Bruno Toumi |
|
Subject: |
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/members/mo... [rel_3_0] |
|
Date: |
Mon, 27 Nov 2006 09:14:15 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Bruno Toumi <btoumi> 06/11/27 09:14:15
Modified files:
koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl
members : moremember.pl
Log message:
create display of all reserves for the borrower details
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.12&r2=1.12.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.9&r2=1.28.2.10
Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.12.2.12
retrieving revision 1.12.2.13
diff -u -b -r1.12.2.12 -r1.12.2.13
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 17 Nov 2006
14:57:22 -0000 1.12.2.12
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 27 Nov 2006
09:14:15 -0000 1.12.2.13
@@ -225,47 +225,57 @@
</div>
</form>
</div>
- <div>
- <h2>Reserves</h2>
- <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
- <input type="hidden" name="from" value="borrower" />
+<!-- TMPL_IF NAME="reservloop" -->
+<div id="circ_circulation_issue">
+ <h2>Borrower current reserves</h2>
<table>
<tr>
- <th scope="row">Title</th>
- <th scope="row">Requested</th>
- <th scope="row">Remove</th>
+ <th>Reserve date</th>
+ <th>Barcode</th>
+ <th>Title</th>
+ <th>Author</th>
+ <th>Localisation</th>
</tr>
-
- <!-- TMPL_LOOP name="reserveloop" -->
- <!-- TMPL_IF NAME="toggle" -->
- <tr class="highlight">
- <!-- TMPL_ELSE -->
- <tr>
- <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP NAME="reservloop" -->
+ <tr class="<!-- TMPL_VAR NAME="color" -->">
<td>
- <a
href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
- <!-- TMPL_IF name="volumeddesc" -->
- <!-- TMPL_VAR NAME="volumeddesc" -->
- <!-- TMPL_VAR NAME="itemtype" -->
+ <!-- TMPL_VAR
NAME="reservedate" -->
+ </td>
+ <td>
+ <!-- TMPL_IF
name="barcodereserv" -->
+ <a
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->&type=intra" onclick="openWindow(this, 'Item', 480,
640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF
NAME="waitingposition" -->
+ Waiting position for this
document :
+ <b> <!-- TMPL_VAR
NAME="waitingposition" --> </b>
<!-- /TMPL_IF -->
</td>
- <td><!-- TMPL_VAR NAME="reservedate2" --></td>
<td>
- <select name="rank-request">
- <option value="n">No</option>
- <option value="del">Yes</option>
- </select>
+ <!-- TMPL_VAR NAME="title" -->
(<b> <!-- TMPL_VAR NAME="itemtype" --> </b>)
+
+ <!-- TMPL_IF name="waiting" -->
+ <br/>
+ <i>This document is
available</i>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="transfered"
-->
+ <br/>
+ <i>This document has been
transfered from library :
+ <!-- TMPL_VAR NAME="frombranch"
--> the : <!-- TMPL_VAR NAME="datesent" --> </i>
+ <!-- /TMPL_IF -->
+
+ <!-- TMPL_IF
name="nottransfered" -->
+ <br/>
+ <i>This document hasn't been
transfered yet from library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
+ <!-- /TMPL_IF -->
+
</td>
- <input type="hidden" name="biblio" value="<!-- TMPL_VAR
NAME="biblionumber" -->" />
- <input type="hidden" name="borrowernumber" value="<!--
TMPL_VAR NAME="borrowernumber" -->" />
+ <td><!-- TMPL_VAR NAME="author" --></td>
+ <td><!-- TMPL_VAR NAME="itemcallnumber"
--></td>
</tr>
- <!-- /tmpl_loop -->
+ <!-- /TMPL_LOOP -->
</table>
- <!-- TMPL_IF name="reserveloop" -->
- <input type="submit" class="cancel" name="submit" value="Cancel
Marked Requests" />
- <!-- /TMPL_IF -->
- </form>
- </div>
+</div>
+
<script language="JavaScript" type="text/javascript">
function confirm_deletion() {
var is_confirmed = confirm('Do you confirm deletion ?');
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.28.2.9
retrieving revision 1.28.2.10
diff -u -b -r1.28.2.9 -r1.28.2.10
--- members/moremember.pl 21 Nov 2006 10:45:54 -0000 1.28.2.9
+++ members/moremember.pl 27 Nov 2006 09:14:15 -0000 1.28.2.10
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.28.2.9 2006/11/21 10:45:54 toins Exp $
+# $Id: moremember.pl,v 1.28.2.10 2006/11/27 09:14:15 btoumi Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -204,21 +204,94 @@
#
# find reserves
#
-my ($rescount,$reserves)=FindReserves('',$borrowernumber); #From C4::Reserves2
-my @reservedata;
-$toggle = 0;
-foreach my $reserveline (@$reserves) {
- $reserveline->{'reservedate2'} =
format_date($reserveline->{'reservedate'});
- my $restitle;
- my %row = %$reserveline;
- $row{toggle} = $toggle++%2;
- if ($reserveline->{'constrainttype'} eq 'o'){
-
$restitle=GetReserveTitle($reserveline->{'biblionumber'},$reserveline->{'borrowernumber'},$reserveline->{'reservedate'},$reserveline->{'rtimestamp'});
- %row = (%row , %$restitle) if $restitle;
+# my ($rescount,$reserves)=FindReserves('',$borrowernumber); #From
C4::Reserves2
+# my @reservedata;
+# $toggle = 0;
+# foreach my $reserveline (@$reserves) {
+# $reserveline->{'reservedate2'} =
format_date($reserveline->{'reservedate'});
+# my $restitle;
+# my %row = %$reserveline;
+# $row{toggle} = $toggle++%2;
+# if ($reserveline->{'constrainttype'} eq 'o'){
+#
$restitle=GetReserveTitle($reserveline->{'biblionumber'},$reserveline->{'borrowernumber'},$reserveline->{'reservedate'},$reserveline->{'rtimestamp'});
+# %row = (%row , %$restitle) if $restitle;
+# }
+# push (@reservedata, \%row);
+# }
+
+
+##################################################################################
+# 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 );
+ 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'} );
+
+ $getreserv{waiting} = 0;
+ $getreserv{transfered} = 0;
+ $getreserv{nottransfered} = 0;
+
+ $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' ) {
+ $getreserv{color} = 'reserved';
+ $getreserv{waiting} = 1;
}
- push (@reservedata, \%row);
-}
+ # 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 )
+ {
+ $getreserv{nottransfered} = 1;
+ $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'} );
+ $getreserv{color} = 'inwait';
+ $getreserv{title} = $getbibinfo->{'title'};
+ $getreserv{waitingposition} = $num_res->{'priority'};
+ $getreserv{nottransfered} = 0;
+ $getreserv{itemtype} = $getbibtype->{'description'};
+ $getreserv{author} = $getbibinfo->{'author'};
+ $getreserv{itemcallnumber} = '----------';
+
+ }
+
+ push( @reservloop, \%getreserv );
+ }
+
+ # return result to the template
+ $template->param( reservloop => address@hidden );
+
+}
# current alert subscriptions
my $alerts = getalert($borrowernumber);
foreach (@$alerts) {
@@ -241,7 +314,7 @@
totaldue => sprintf("%.2f",$total),
issueloop => address@hidden,
unvalidlibrarian => $unvalidlibrarian,
- reserveloop => address@hidden,
+# reserveloop => address@hidden,
intranetcolorstylesheet =>
C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet =>
C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/members/mo... [rel_3_0],
Bruno Toumi <=