Koha › Patrons › Search Results<!-- /TMPL

From 9d9d933d3e423eec537f34e66f11e8dde8182790 Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Fri, 18 Sep 2009 16:33:03 +0200 Subject: [PATCH] Improving and Bug Fixing Membersearch Now search can take borrowertype and branchcode search is correctly positioned in page --- C4/Members.pm | 29 +-- .../prog/en/modules/members/member.tmpl | 201 +++++++++--------- .../prog/en/modules/members/search.tmpl | 23 +- members/member.pl | 100 +++++---- members/members-home.pl | 7 + 5 files changed, 193 insertions(+), 167 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index e813d9077e..bd82c71bf4 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -29,6 +29,7 @@ use C4::Reserves; use C4::Accounts; use C4::Biblio; use C4::SQLHelper qw(InsertInTable UpdateInTable SearchInTable); +use C4::Members::Attributes qw(SearchIdMatchingAttribute); our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,$debug); @@ -165,7 +166,6 @@ C<$count> is the number of elements in C<$borrowers>. #' #used by member enquiries from the intranet -#called by member.pl and circ/circulation.pl sub SearchMember { my ($searchstring, $orderby, $type,$category_type,$filter,$showallbranches ) = @_; my $dbh = C4::Context->dbh; @@ -229,16 +229,6 @@ sub SearchMember { } $query = $query . ") OR cardnumber LIKE ? "; push( @bind, $searchstring ); - if (C4::Context->preference('ExtendedPatronAttributes')) { - $query .= "OR borrowernumber IN ( -SELECT borrowernumber -FROM borrower_attributes -JOIN borrower_attribute_types USING (code) -WHERE staff_searchable = 1 -AND attribute like ? -)"; - push (@bind, $searchstring); - } $query .= "order by $orderby"; # FIXME - .= <preference('ExtendedPatronAttributes')) { + my $matching_records = C4::Members::Attributes::SearchIdMatchingAttribute($filter); + push @filters,@$matching_records; + } + $searchtype||="wide"; + my $data=SearchInTable("borrowers",\@filters,$orderby,$limit,$columns_out,$search_on_fields,$searchtype); return ( $data ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl index de5f1605e2..c4b9df645e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl @@ -1,6 +1,15 @@ Koha › Patrons › Search Results + + @@ -8,109 +17,111 @@

Home › Patrons › Search ResultsPatrons

- -

- - + -

- Browse by last name: - A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z -

+ Browse by last name: + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z +

- -

Results to of found for ''

+ +

Results to of found for ''

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

&orderby=cardnumber">Card	&orderby=surname">Name	&orderby=borrowers.categorycode">Cat	&orderby=branchcode">Library	Expires on	OD/Issues	Fines	Circ note
	">, ,	()			/			- &category_type=">Edit - - - &categorycode=">Edit - - &category_type=A">Edit - -

- - -No results found - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Card	Name	Cat	Library	Expires on	OD/Issues	Fines	Circ note
	">, ,	()			/			+ &category_type=">Edit + + + &categorycode=">Edit + + &category_type=A">Edit + +

+ + + No results found + + -

- -

+ +

+ + +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl index 15bc172877..9ac96758cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl @@ -1,30 +1,19 @@ diff --git a/members/member.pl b/members/member.pl index 9192be8ae6..73af8ae08e 100755 --- a/members/member.pl +++ b/members/member.pl @@ -43,7 +43,6 @@ if($quicksearch){ type => "intranet", authnotrequired => 0, flagsrequired => {borrowers => 1}, - debug => 1, }); } else { ($template, $loggedinuser, $cookie) @@ -52,26 +51,28 @@ if($quicksearch){ type => "intranet", authnotrequired => 0, flagsrequired => {borrowers => 1}, - debug => 1, }); } my $theme = $input->param('theme') || "default"; +my @categories=C4::Category->all; +my $branches=GetBranchesLoop(); + +my %categories_dislay; +foreach my $category (@categories){ + my $hash={ + category_description=>$$category{description}, + category_type=>$$category{category_type} + }; + $categories_dislay{$$category{categorycode}} = $hash; +} $template->param( "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1", ); if (C4::Context->preference("AddPatronLists")=~/code/){ - my $categories=GetBorrowercategoryList; - $categories->[0]->{'first'}=1; - $template->param(categories=>$categories); + $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'); @@ -85,32 +86,36 @@ my $patron = $input->Vars; foreach (keys %$patron){ delete $$patron{$_} unless($$patron{$_}); } -($results)=Search($patron,{surname=>1,firstname=>1}) if (keys %$patron); -$count =scalar(@$results); -use YAML; -warn Dump($results); -unless ($count){ - if(length($member) == 1) - { - ($count,$results)=SearchMember($member,$orderby,"simple"); - } - else - { - ($count,$results)=SearchMember($member,$orderby,"advanced"); - } +if (C4::Context->preference("IndependantBranches")){ + if (C4::Context->userenv && C4::Context->userenv->{flags} % 2 !=1 && C4::Context->userenv->{'branch'}){ + $$patron{branchcode}=C4::Context->userenv->{'branch'} unless (C4::Context->userenv->{'branch'} eq "insecure"); + } +} +$$patron{firstname}.="\%" if ($$patron{firstname}); + +my @searchpatron; +push @searchpatron, $member if ($member); +push @searchpatron, $patron if (keys %$patron); +my $from= ($startfrom-1)*$resultsperpage; +my $to=$from+$resultsperpage; + #($results)=Search(\@searchpatron,{surname=>1,firstname=>1},[$from,$to],undef,["firstname","surname","email","othernames"] ) if (@searchpatron); + ($results)=Search(\@searchpatron,{surname=>1,firstname=>1},undef,undef,["firstname","surname","email","othernames"] ) if (@searchpatron); +if ($results){ + $count =scalar(@$results); } - my @resultsdata; -my $to=($count>($startfrom*$resultsperpage)?$startfrom*$resultsperpage:$count); -for (my $i=($startfrom-1)*$resultsperpage; $i < $to; $i++){ +my $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'}); - $$results[$i]{'dateexpiry'}= C4::Dates->new($results->[$i]{'dateexpiry'},'iso')->output('syspref'); + $$borrower{'dateexpiry'}= C4::Dates->new($$borrower{'dateexpiry'},'iso')->output('syspref'); my %row = ( - count => $i+1, - %{$results->[$i]}, + count => $index++, + %$borrower, + %{$categories_dislay{$$borrower{categorycode}}}, overdues => $od, issues => $issue, odissue => "$od/$issue", @@ -118,19 +123,29 @@ for (my $i=($startfrom-1)*$resultsperpage; $i < $to; $i++){ ); push(@resultsdata, \%row); } + +if ($$patron{branchcode}){ + foreach my $branch (grep{$_->{value} eq $$patron{branchcode}}@$branches){ + $$branch{selected}=1; + } +} +if ($$patron{categorycode}){ + foreach my $category (grep{$_->{categorycode} eq $$patron{categorycode}}@categories){ + $$category{selected}=1; + } +} +my %parameters= + ( %$patron + , 'orderby' => $orderby + , '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 @categories=C4::Category->all; $template->param( paginationbar => pagination_bar( $base_url, int( $count / $resultsperpage ) + 1, @@ -139,14 +154,17 @@ $template->param( startfrom => $startfrom, from => ($startfrom-1)*$resultsperpage+1, to => $to, - multipage => ($count != $to || $startfrom!=1), - branchloop=>GetBranchesLoop(), + multipage => ($count != $to+1 || $startfrom!=1), +); +$template->param( + branchloop=>$branches, categoryloop=>\@categories, ); + $template->param( searching => "1", - member => $member, + %$patron, numresults => $count, resultsloop => \@resultsdata, ); diff --git a/members/members-home.pl b/members/members-home.pl index 2755452e97..7a9beb59a1 100755 --- a/members/members-home.pl +++ b/members/members-home.pl @@ -23,6 +23,8 @@ use C4::Auth; use C4::Output; use C4::Context; use C4::Members; +use C4::Branch; +use C4::Category; my $query = new CGI; my $quicksearch = $query->param('quicksearch'); @@ -48,6 +50,11 @@ if($quicksearch){ debug => 1, }); } +my @categories=C4::Category->all; +$template->param( + branchloop=>GetBranchesLoop(), + categoryloop=>\@categories, +); $template->param( "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1", ); -- 2.39.5