From a2d34166d6f1244b05d51935f602ba8224ba74cc Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Thu, 29 Oct 2009 11:56:08 +0100 Subject: [PATCH] Improving patron search in serials routing Adding category and library search Unifying with central member search --- .../prog/en/modules/members/search.tmpl | 2 +- .../en/modules/serials/member-search.tmpl | 52 +++++-- members/member.pl | 2 + serials/member-search.pl | 147 +++++++++++++++--- 4 files changed, 162 insertions(+), 41 deletions(-) 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 9ac96758cc..2baecf3974 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl @@ -1,4 +1,4 @@ -

+ " method="get">

Filter :

" /> " />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl index 7f8d0ecc2d..cf6b4b3e67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl @@ -16,40 +16,58 @@ function add_member(subscriptionid,borrowernumber){ - -

+ +

Results to of found for ''''

Member Search

- - - - -" /> - - - - -

- +

+ + + - - + + + + + + + +

Card	Name	Library	Add

			,); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=&borrowernumber=&op=add">Add

- +

No results found

+ +

diff --git a/members/member.pl b/members/member.pl index bdb5aad837..f6bc2f2aa2 100755 --- a/members/member.pl +++ b/members/member.pl @@ -29,6 +29,7 @@ use CGI; use C4::Members; use C4::Branch; use C4::Category; +use File::Basename; my $input = new CGI; my $quicksearch = $input->param('quicksearch'); @@ -166,6 +167,7 @@ $template->param( $template->param( searching => "1", + actionname =>basename($0), %$patron, numresults => $count, resultsloop => \@resultsdata, diff --git a/serials/member-search.pl b/serials/member-search.pl index a2063f8823..6f517da8d3 100755 --- a/serials/member-search.pl +++ b/serials/member-search.pl @@ -27,32 +27,133 @@ use CGI; use C4::Auth; # get_template_and_user use C4::Output; use C4::Members; # BornameSearch +use C4::Branch; +use C4::Category; +use File::Basename; -my $query = new CGI; -my $subscriptionid = $query->param('subscriptionid'); -my $searchstring = $query->param('member'); - -my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "serials/member-search.tmpl", - query => $query, - type => "intranet", - authnotrequired => 0, - flagsrequired => { serials => 1 }, - debug => 1, - } -); +my $cgi = new CGI; +my $theme = $cgi->param('theme') || "default"; +my $resultsperpage = $cgi->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20; +my $startfrom = $cgi->param('startfrom')||1; + +my $patron = $cgi->Vars; +foreach (keys %$patron){ + delete $$patron{$_} unless($$patron{$_}); +} -if ($searchstring) { - my ( $count, $members ) = &SearchMember( $searchstring, "surname" ); +my @categories=C4::Category->all; +my $branches=(defined $$patron{branchcode}?GetBranchesLoop($$patron{branchcode}):GetBranchesLoop()); + +my %categories_dislay; +my ($template, $loggedinuser, $cookie); + ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "serials/member-search.tmpl", + query => $cgi, + type => "intranet", + authnotrequired => 0, + flagsrequired => {borrowers => 1}, + }); + +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/){ + $categories[0]->{'first'}=1; +} - $template->param( - subscriptionid => $subscriptionid, - memberloop => $members, - member => $searchstring, +my $member=$cgi->param('member'); +my $orderby=$cgi->param('orderby'); +$orderby = "surname,firstname" unless $orderby; +$member =~ s/,//g; #remove any commas from search string +$member =~ s/\*/%/g; + +my ($count,$results); + +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}); +$$patron{surname}.="\%" if ($$patron{surname}); + +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","cardnumber"],"start_with" ) if (@searchpatron); +if ($results){ + $count =scalar(@$results); +} +my @resultsdata; +my $to=($count>$to?$to:$count); +my $index=$from; +foreach my $borrower(@$results[$from..$to-1]){ + #find out stats + + $$borrower{'dateexpiry'}= C4::Dates->new($$borrower{'dateexpiry'},'iso')->output('syspref'); + + my %row = ( + count => $index++, + %$borrower, + %{$categories_dislay{$$borrower{categorycode}}}, ); + push(@resultsdata, \%row); } -else { - $template->param( subscriptionid => $subscriptionid, ); + +if ($$patron{branchcode}){ + foreach my $branch (grep{$_->{value} eq $$patron{branchcode}}@$branches){ + $$branch{selected}=1; + } } -output_html_with_http_headers $query, $cookie, $template->output; +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 { "$_=$parameters{$_}" } (keys %parameters) + ); + +$template->param( + paginationbar => pagination_bar( + $base_url, int( $count / $resultsperpage ) + 1, + $startfrom, 'startfrom' + ), + startfrom => $startfrom, + from => ($startfrom-1)*$resultsperpage+1, + to => $to, + multipage => ($count != $to+1 || $startfrom!=1), +); +$template->param( + branchloop=>$branches, + categoryloop=>\@categories, +); + + +$template->param( + searching => "1", + actionname => basename($0), + %$patron, + numresults => $count, + resultsloop => \@resultsdata, + ); + +output_html_with_http_headers $cgi, $cookie, $template->output; -- 2.20.1