X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=members%2Fmember.pl;h=9b793f4ab8602a1c90a24f0abc21b5dd6cdf96b4;hb=4913d3a1d7a024b846bbeafe98bbd133d2798533;hp=1d33191a746573fef0a16d00c6afd85e28cb24f7;hpb=d08d9e3fb7d0dcb083f79f111d63f8c320b17e27;p=koha.git diff --git a/members/member.pl b/members/member.pl index 1d33191a74..9b793f4ab8 100755 --- a/members/member.pl +++ b/members/member.pl @@ -6,6 +6,7 @@ # Copyright 2000-2002 Katipo Communications +# Copyright 2010 BibLibre # # This file is part of Koha. # @@ -18,138 +19,167 @@ # 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; FIXME - Bug 2505 use C4::Auth; use C4::Output; use CGI; use C4::Members; - +use C4::Branch; +use C4::Category; +use File::Basename; my $input = new CGI; my $quicksearch = $input->param('quicksearch'); my $startfrom = $input->param('startfrom')||1; my $resultsperpage = $input->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20; -my ($template, $loggedinuser, $cookie); -if($quicksearch){ - ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {borrowers => 1}, - debug => 1, - }); -} else { - ($template, $loggedinuser, $cookie) +my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "members/member.tmpl", query => $input, type => "intranet", authnotrequired => 0, flagsrequired => {borrowers => 1}, - debug => 1, }); -} + my $theme = $input->param('theme') || "default"; +my $patron = $input->Vars; +foreach (keys %$patron){ + delete $$patron{$_} unless($$patron{$_}); +} +my @categories=C4::Category->all; + +my $branches = GetBranches; +my @branchloop; + +foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) { + my $selected = 1 if $branches->{$_}->{branchcode} eq $$patron{branchcode}; + my %row = ( value => $_, + selected => $selected, + branchname => $branches->{$_}->{branchname}, + ); + push @branchloop, \%row; +} + +my %categories_dislay; +foreach my $category (@categories){ + my $hash={ + category_description=>$$category{description}, + category_type=>$$category{category_type} + }; + $categories_dislay{$$category{categorycode}} = $hash; +} +my $AddPatronLists = C4::Context->preference("AddPatronLists") || ''; $template->param( - "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1", + "AddPatronLists_$AddPatronLists" => "1", ); -if (C4::Context->preference("AddPatronLists")=~/code/){ - my $categories=GetBorrowercategory(); - $categories->[0]->{'first'}=1; - $template->param(categories=>$categories); +if ($AddPatronLists=~/code/){ + $categories[0]->{'first'}=1; } - # only used if allowthemeoverride is set -#my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' ); - # FIXME - Error-checking -#my $template = HTML::Template->new( filename => $tmpldata{'path'}, -# die_on_bad_params => 0, -# loop_context_vars => 1 ); my $member=$input->param('member'); -my $orderby=$input->param('orderby'); -$orderby = "surname,firstname" unless $orderby; +my $orderbyparams=$input->param('orderby'); +my @orderby; +if ($orderbyparams){ + my @orderbyelt=split(/,/,$orderbyparams); + push @orderby, {$orderbyelt[0]=>$orderbyelt[1]||0}; +} +else { + @orderby = ({surname=>0},{firstname=>0}); +} + +my $searchfields = $input->param('searchfields'); +my @searchfields = $searchfields ? split( ',', $searchfields ) : ( "firstname", "surname", "othernames", "cardnumber", "userid", "email" ); + $member =~ s/,//g; #remove any commas from search string $member =~ s/\*/%/g; -my ($count,$results); +my $from = ( $startfrom - 1 ) * $resultsperpage; +my $to = $from + $resultsperpage; -if(length($member) == 1) -{ - ($count,$results)=SearchMember($member,$orderby,"simple"); +my ($count,$results); +if ($member || keys %$patron) { + #($results)=Search($member || $patron,{surname=>1,firstname=>1},[$from,$to],undef,["firstname","surname","email","othernames"] ); + my $search_scope = ( $quicksearch ? "field_start_with" : "start_with" ); + ($results) = Search( $member || $patron, \@orderby, undef, undef, \@searchfields, $search_scope ); } -else -{ - ($count,$results)=SearchMember($member,$orderby,"advanced"); + +if ($results) { + for my $field ('categorycode','branchcode'){ + next unless ($patron->{$field}); + @$results = grep { $_->{$field} eq $patron->{$field} } @$results; + } + $count = scalar(@$results); } +if($count == 1){ + print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=" . @$results[0]->{borrowernumber}); + exit; +} my @resultsdata; -my $toggle = 0; -my $to=($count>($startfrom*$resultsperpage)?$startfrom*$resultsperpage:$count); -for (my $i=($startfrom-1)*$resultsperpage; $i < $to; $i++){ +$to=($count>$to?$to:$count); +my $index=$from; +foreach my $borrower(@$results[$from..$to-1]){ #find out stats - my ($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowernumber'}); + my ($od,$issue,$fines)=GetMemberIssuesAndFines($$borrower{'borrowernumber'}); + + $$borrower{'dateexpiry'}= C4::Dates->new($$borrower{'dateexpiry'},'iso')->output('syspref'); my %row = ( - toggle => $toggle, - count => $i+1, - borrowernumber => $results->[$i]{'borrowernumber'}, - cardnumber => $results->[$i]{'cardnumber'}, - surname => $results->[$i]{'surname'}, - firstname => $results->[$i]{'firstname'}, - categorycode => $results->[$i]{'categorycode'}, - category_type => $results->[$i]{'category_type'}, - category_description => $results->[$i]{'description'}, - address => $results->[$i]{'address'}, - address2 => $results->[$i]{'address2'}, - city => $results->[$i]{'city'}, - zipcode => $results->[$i]{'zipcode'}, - branchcode => $results->[$i]{'branchcode'}, + count => $index++, + %$borrower, + %{$categories_dislay{$$borrower{categorycode}}}, overdues => $od, issues => $issue, odissue => "$od/$issue", fines => sprintf("%.2f",$fines), - borrowernotes => $results->[$i]{'borrowernotes'}, - sort1 => $results->[$i]{'sort1'}, - sort2 => $results->[$i]{'sort2'}, - dateexpiry => C4::Dates->new($results->[$i]{'dateexpiry'},'iso')->output('syspref'), ); - if ( $toggle ) { $toggle = 0; } else {$toggle = 1; } push(@resultsdata, \%row); } + +if ($$patron{categorycode}){ + foreach my $category (grep{$_->{categorycode} eq $$patron{categorycode}}@categories){ + $$category{selected}=1; + } +} +my %parameters= + ( %$patron + , 'orderby' => $orderbyparams + , 'resultsperpage' => $resultsperpage + , 'type'=> 'intranet'); my $base_url = 'member.pl?&' . join( '&', - map { $_->{term} . '=' . $_->{val} } ( - { term => 'member', val => $member}, - { term => 'orderby', val => $orderby }, - { term => 'resultsperpage', val => $resultsperpage }, - { term => 'type', val => 'intranet' }, - ) + map { "$_=$parameters{$_}" } (keys %parameters) ); +my @letters = map { {letter => $_} } ( 'A' .. 'Z'); + $template->param( + letters => \@letters, paginationbar => pagination_bar( - $base_url, int( $count / $resultsperpage ) + 1, + $base_url, + int( $count / $resultsperpage ) + ($count % $resultsperpage ? 1 : 0), $startfrom, 'startfrom' ), startfrom => $startfrom, from => ($startfrom-1)*$resultsperpage+1, to => $to, multipage => ($count != $to || $startfrom!=1), -); - -$template->param( - searching => "1", - member => $member, + advsearch => ($$patron{categorycode} || $$patron{branchcode}), + branchloop=>\@branchloop, + categories=>\@categories, + searching => "1", + actionname =>basename($0), + %$patron, numresults => $count, resultsloop => \@resultsdata, );