[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha circ/circulation.pl koha-tmpl/intranet-tmp... [dev_week]
|
From: |
Kyle Hall |
|
Subject: |
[Koha-cvs] koha circ/circulation.pl koha-tmpl/intranet-tmp... [dev_week] |
|
Date: |
Mon, 14 May 2007 16:27:56 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Kyle Hall <kylemhall> 07/05/14 16:27:56
Modified files:
circ : circulation.pl
koha-tmpl/intranet-tmpl/ccfls/en/circ: circulation.tmpl
koha-tmpl/intranet-tmpl/ccfls/en/members: moremember.tmpl
koha-tmpl/intranet-tmpl/npl/en/circ: circulation.tmpl
koha-tmpl/intranet-tmpl/npl/en/members: moremember.tmpl
members : moremember.pl
Log message:
Added list of enrolled clubs and services to circ and moremember. Won't
effect those not using ClubsAndServices.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.81.2.14.2.18&r2=1.81.2.14.2.19
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.10&r2=1.1.2.1.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.15&r2=1.1.2.1.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.17.2.9&r2=1.6.2.17.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.10.2.8&r2=1.5.2.10.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.14.2.5&r2=1.5.2.14.2.6
Patches:
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.81.2.14.2.18
retrieving revision 1.81.2.14.2.19
diff -u -b -r1.81.2.14.2.18 -r1.81.2.14.2.19
--- circ/circulation.pl 27 Apr 2007 14:08:32 -0000 1.81.2.14.2.18
+++ circ/circulation.pl 14 May 2007 16:27:54 -0000 1.81.2.14.2.19
@@ -26,6 +26,7 @@
use strict;
use warnings; no warnings 'uninitialized';
use CGI;
+use C4::ClubsAndServices;
use C4::Circulation::Circ2;
use C4::Search;
use C4::Output;
@@ -129,6 +130,12 @@
# get the borrower information.....
my $borrower;
if ($borrowernumber) {
+ ## Get the borrowers current clubs & services
+ my $enrolledClubsAndServices = GetEnrolledClubsAndServices(
$borrowernumber );
+ if ( $enrolledClubsAndServices ) {
+ $template->param( enrolledClubsAndServicesLoop =>
$enrolledClubsAndServices );
+ }
+
$borrower = getpatroninformation(\%env,$borrowernumber,0);
my ($od,$issue,$fines)=borrdata2(\%env,$borrowernumber);
$fines = sprintf("%.2f", $fines);
Index: koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/circulation.tmpl,v
retrieving revision 1.1.2.1.2.10
retrieving revision 1.1.2.1.2.11
diff -u -b -r1.1.2.1.2.10 -r1.1.2.1.2.11
--- koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl 27 Apr 2007
14:08:32 -0000 1.1.2.1.2.10
+++ koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl 14 May 2007
16:27:55 -0000 1.1.2.1.2.11
@@ -202,6 +202,18 @@
<!-- /TMPL_IF -->
</ul>
+<!-- TMPL_IF NAME="enrolledClubsAndServicesLoop" -->
+ <ul>
+ <li><strong>Clubs And Services:</strong></li>
+ <ul>
+ <!-- TMPL_LOOP NAME="enrolledClubsAndServicesLoop" -->
+ <li><!-- TMPL_VAR NAME="title" --> </li>
+ <!-- /TMPL_LOOP -->
+ </ul>
+ </ul>
+<!-- /TMPL_IF -->
+
+
<dl>
<!-- TMPL_IF name="waiting" -->
Index: koha-tmpl/intranet-tmpl/ccfls/en/members/moremember.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/moremember.tmpl,v
retrieving revision 1.1.2.1.2.15
retrieving revision 1.1.2.1.2.16
diff -u -b -r1.1.2.1.2.15 -r1.1.2.1.2.16
--- koha-tmpl/intranet-tmpl/ccfls/en/members/moremember.tmpl 24 Apr 2007
18:00:09 -0000 1.1.2.1.2.15
+++ koha-tmpl/intranet-tmpl/ccfls/en/members/moremember.tmpl 14 May 2007
16:27:55 -0000 1.1.2.1.2.16
@@ -52,7 +52,14 @@
<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><form
action="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->"
><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum"
-->"><input type="submit" class="submit" value="Reading Record"></form><!--
/TMPL_UNLESS -->
-<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><form
action="/cgi-bin/koha/members/clubsAndServices.pl?bornum=<!-- TMPL_VAR
name="bornum" -->" ><input type="hidden" name="borrowernumber" value="<!--
TMPL_VAR name="bornum" -->"><input type="submit" class="submit" value="Clubs &
Services"></form><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><form
action="/cgi-bin/koha/members/memberOverdues.pl?bornum=<!-- TMPL_VAR
name="bornum" -->" ><input type="hidden" name="bornum" value="<!-- TMPL_VAR
name="bornum" -->"><input type="submit" class="submit"
value="Overdues"></form><!-- /TMPL_UNLESS -->
+
+<!-- TMPL_UNLESS NAME="unvalidlibrarian"-->
+ <form action="/cgi-bin/koha/members/clubsAndServices.pl?bornum=<!-- TMPL_VAR
name="bornum" -->" >
+ <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
name="bornum" -->">
+ <input type="submit" class="submit" value="Clubs & Services">
+ </form>
+<!-- /TMPL_UNLESS -->
</div>
<!-- TMPL_IF NAME="flagged" --> <div class="details">
<ul>
@@ -137,6 +144,24 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="textmessaging" --><tr><th>Patron
Message:<p>(appears in OPAC)</p></th><td><!-- TMPL_VAR name="textmessaging"
--></td></tr><!-- /TMPL_IF -->
</table></div>
+
+<!-- TMPL_IF NAME="enrolledClubsAndServicesLoop" -->
+<div class="compact">
+<table>
+ <tr>
+ <th>Clubs & Services</th>
+ <td>
+ <ul>
+ <!-- TMPL_LOOP NAME="enrolledClubsAndServicesLoop" -->
+ <li><!-- TMPL_VAR NAME="title" --> </li>
+ <!-- /TMPL_LOOP -->
+ </ul>
+ </td>
+ </tr>
+</table>
+</div>
+<!-- /TMPL_IF -->
+
<div class="compact">
<table>
<tr><th><!-- TMPL_UNLESS name="I" -->Alternate<!--
/TMPL_UNLESS --> Contact:</th>
Index: koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/Attic/circulation.tmpl,v
retrieving revision 1.6.2.17.2.9
retrieving revision 1.6.2.17.2.10
diff -u -b -r1.6.2.17.2.9 -r1.6.2.17.2.10
--- koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl 11 Oct 2006
13:35:54 -0000 1.6.2.17.2.9
+++ koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl 14 May 2007
16:27:55 -0000 1.6.2.17.2.10
@@ -172,6 +172,18 @@
<!-- /TMPL_IF -->
</ul>
+<!-- TMPL_IF NAME="enrolledClubsAndServicesLoop" -->
+ <ul>
+ <li><strong>Clubs And Services:</strong></li>
+ <ul>
+ <!-- TMPL_LOOP NAME="enrolledClubsAndServicesLoop" -->
+ <li><!-- TMPL_VAR NAME="title" --> </li>
+ <!-- /TMPL_LOOP -->
+ </ul>
+ </ul>
+<!-- /TMPL_IF -->
+
+
<dl>
<!-- TMPL_IF name="waiting" -->
Index: koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/Attic/moremember.tmpl,v
retrieving revision 1.5.2.10.2.8
retrieving revision 1.5.2.10.2.9
diff -u -b -r1.5.2.10.2.8 -r1.5.2.10.2.9
--- koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl 25 Apr 2007
14:15:10 -0000 1.5.2.10.2.8
+++ koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl 14 May 2007
16:27:55 -0000 1.5.2.10.2.9
@@ -38,6 +38,24 @@
<!-- TMPL_IF name="borrowernotes" --><dl><dt>Notes:</dt> <dd
class="error"><!-- TMPL_VAR name="borrowernotes" --></dd></dl><!-- /TMPL_IF
--></div>
<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="enrolledClubsAndServicesLoop" -->
+<div class="compact">
+<table>
+ <tr>
+ <th>Clubs & Services</th>
+ <td>
+ <ul>
+ <!-- TMPL_LOOP NAME="enrolledClubsAndServicesLoop" -->
+ <li><!-- TMPL_VAR NAME="title" --> </li>
+ <!-- /TMPL_LOOP -->
+ </ul>
+ </td>
+ </tr>
+</table>
+</div>
+<!-- /TMPL_IF -->
+
+
<div class="compact">
<table>
<tr><th>Name:</th><td><!-- TMPL_IF name="IS_ADULT" --><!-- TMPL_IF
NAME="title" -->[<!-- TMPL_VAR name="title" -->]. <!-- /TMPL_IF --><!--
TMPL_VAR name="firstname" --> <!-- TMPL_IF NAME="othernames" -->"<!-- TMPL_VAR
name="othernames" -->" <!-- /TMPL_IF --><!-- TMPL_VAR name="surname" --> <!--
TMPL_IF NAME="initials" -->(<!-- TMPL_VAR name="initials" -->)<!-- /TMPL_IF
--><!-- /TMPL_IF --></td><td rowspan="6"><!-- TMPL_IF NAME="patronimages"
--><img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR
NAME="patronimages" -->" alt="" border="0" /><!-- TMPL_ELSE --> <!--
/TMPL_IF --></td></tr>
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.5.2.14.2.5
retrieving revision 1.5.2.14.2.6
diff -u -b -r1.5.2.14.2.5 -r1.5.2.14.2.6
--- members/moremember.pl 19 Mar 2007 17:53:19 -0000 1.5.2.14.2.5
+++ members/moremember.pl 14 May 2007 16:27:55 -0000 1.5.2.14.2.6
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.5.2.14.2.5 2007/03/19 17:53:19 kylemhall Exp $
+# $Id: moremember.pl,v 1.5.2.14.2.6 2007/05/14 16:27:55 kylemhall Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -31,6 +31,7 @@
# Suite 330, Boston, MA 02111-1307 USA
use strict;
+use C4::ClubsAndServices;
use C4::Auth;
use C4::Context;
use C4::Output;
@@ -96,6 +97,11 @@
my $data=borrdata('',$bornum);
+## Get the borrowers current clubs & services
+my $enrolledClubsAndServices = GetEnrolledClubsAndServices( $bornum );
+$template->param( enrolledClubsAndServicesLoop => $enrolledClubsAndServices );
+
+
$template->param($data->{'categorycode'} => 1); # in template <TMPL_IF
name="I"> => instutitional (A for Adult & C for children)
$data->{'dateenrolled'} = format_date($data->{'dateenrolled'});
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha circ/circulation.pl koha-tmpl/intranet-tmp... [dev_week],
Kyle Hall <=