[Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0]

[Bruno Toumi]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Bruno Toumi <btoumi>    06/11/02 14:11:05

Modified files:
        C4             : Members.pm 
        koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl 
        members        : moremember.pl 

Log message:
        modify borrowers template  to show the description of sort1 and sort2 
value 
        and create sub GetSortDetails to show details (with category and 
authorised_value value)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.10&r2=1.32.2.11
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.7&r2=1.12.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.4&r2=1.28.2.5

Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.10
retrieving revision 1.32.2.11
diff -u -b -r1.32.2.10 -r1.32.2.11
--- C4/Members.pm       20 Oct 2006 12:57:51 -0000      1.32.2.10
+++ C4/Members.pm       2 Nov 2006 14:11:04 -0000       1.32.2.11
@@ -19,7 +19,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Members.pm,v 1.32.2.10 2006/10/20 12:57:51 btoumi Exp $
+# $Id: Members.pm,v 1.32.2.11 2006/11/02 14:11:04 btoumi Exp $
 
 use strict;
 require Exporter;
@@ -31,7 +31,7 @@
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision: 1.32.2.10 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.11 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -67,6 +67,7 @@
   &GetFlagsAndBranchFromBorrower
  &GetCities &GetRoadTypes &GetBorNotifyAcctRecord
  &GetMembeReregistration
+ &GetSortDetails       
                
 );
 
@@ -1475,6 +1476,32 @@
        }
 }
 
+
+=head2 GetSortDetails (OUEST-PROVENCE)
+
+  ($lib) = &GetSortDetails($category,$sortvalue);
+
+Returns the authorized value  details
+C<&$lib>return value of authorized value details
+C<&$sortvalue>this is the value of authorized value 
+C<&$category>this is the value of authorized value category
+
+=cut
+sub GetSortDetails {
+    my ($category,$sortvalue)address@hidden;
+    my $dbh = C4::Context->dbh;
+    my $query=qq|SELECT lib 
+               FROM authorised_values 
+               WHERE category=?
+               AND authorised_value=? |;
+    my $sth=$dbh->prepare($query);
+    $sth->execute($category,$sortvalue);    
+    my $lib=$sth->fetchrow;
+    return ($lib);             
+}
+
+
+
 =head2 member_reregistration (OUEST-PROVENCE)
 
 automatic reregistration in borrowers table 
@@ -1506,6 +1533,8 @@
        return $dateexpiry;
 }
 
+
+
 =head2 roadtypecaracteristic (OUEST-PROVENCE)
 
   ($idroadtypearrayref, $roadttype_hashref) = &roadtypecaracteristic();

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.7
retrieving revision 1.12.2.8
diff -u -b -r1.12.2.7 -r1.12.2.8
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl     31 Oct 2006 
15:38:49 -0000      1.12.2.7
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl     2 Nov 2006 
14:11:05 -0000       1.12.2.8
@@ -119,8 +119,8 @@
     <p><label>Ethnicity Notes: </label><!-- TMPL_VAR NAME="ethnotes" --> 
&nbsp;</p>
     <!-- /TMPL_IF -->
 
-    <p><label>Sort field 1: </label><!-- TMPL_VAR NAME="sort1" --> &nbsp;</p>
-    <p><label>Sort field 2:</label><!-- TMPL_VAR NAME="sort2" --> &nbsp;</p>
+    <p><label>Sort field 1: </label><!-- TMPL_VAR NAME="lib1" --> &nbsp;</p>
+    <p><label>Sort field 2:</label><!-- TMPL_VAR NAME="lib2" --> &nbsp;</p>
     <p><label>OPAC login: </label><!-- TMPL_VAR name="userid" --> &nbsp;</p>
     <p><label>OPAC Password: </label><!-- TMPL_VAR NAME="password" --> 
&nbsp;</p> 
     <p><label>Circulation Notes:</label><!-- TMPL_VAR name="borrowernotes" --> 
&nbsp;</p>

Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.28.2.4
retrieving revision 1.28.2.5
diff -u -b -r1.28.2.4 -r1.28.2.5
--- members/moremember.pl       31 Oct 2006 15:38:49 -0000      1.28.2.4
+++ members/moremember.pl       2 Nov 2006 14:11:05 -0000       1.28.2.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: moremember.pl,v 1.28.2.4 2006/10/31 15:38:49 btoumi Exp $
+# $Id: moremember.pl,v 1.28.2.5 2006/11/02 14:11:05 btoumi Exp $
 
 # script to do a borrower enquiry/bring up borrower details etc
 # Displays all the details about a borrower
@@ -149,9 +149,11 @@
 # Converts the categorycode to the description
 ($data->{'categorycode'},undef,undef) = 
&getborrowercategory($data->{'categorycode'});
 
-my ($numaccts,$accts,$total)=getboracctrecord('',\%bor);
-
-#
+my ($numaccts,$accts,$total)= getboracctrecord('',\%bor);
+my $lib1 = &GetSortDetails("Bsort1",$data->{'sort1'});
+my $lib2 = &GetSortDetails("Bsort2",$data->{'sort2'});
+($template->param(lib1 => $lib1))if($lib1);
+($template->param(lib2 => $lib2))if($lib2);
 # current issues
 #
 my ($count,$issue)=borrissues($bornum);