</style>
</head>
<body>
-
-<div id="custom-doc" class="yui-t7">
+<div id="doc3" class="yui-t7">
+
<div id="bd">
+ <div id="yui-main">
+ <div class="yui-b">
+ <div role="search" class="yui-g">
+ <!-- TMPL_INCLUDE NAME="../members/search.tmpl" -->
+ </div>
+ <div role="main" class="yui-g">
+ <!-- TMPL_IF NAME="resultsloop" -->
+ <div id="searchheader"> <h3>Results <!-- TMPL_VAR Name ="from" --> to <!-- TMPL_VAR Name ="to" --> of <!-- TMPL_VAR Name ="numresults" --> found for <!--TMPL_IF Name="member"-->'<span class="ex"><!-- TMPL_VAR NAME="member" --></span>'<!--/TMPL_IF--><!--TMPL_IF Name="surname"-->'<span class="ex"><!-- TMPL_VAR NAME="surname" --></span>'<!--/TMPL_IF--></h3></div>
+ <div class="searchresults">
-<h1>Member Search</h1>
-
-
-<form name="search" action="/cgi-bin/koha/serials/member-search.pl" method="post">
-<input type="text" name="member" size="30" />
-<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" />
-<input type="submit" class="button" value="Search" />
-</form>
-
-<!-- TMPL_IF NAME="memberloop" -->
-<div class="searchresults">
-<table>
+ <table id="memberresultst">
+ <thead>
<tr>
+ <th>Card</th>
<th>Name</th>
+ <th>Library</th>
<th>Add</th>
</tr>
-<!-- TMPL_LOOP NAME="memberloop" -->
-<tr><td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
+</thead>
+<tbody>
+<!-- TMPL_LOOP NAME="resultsloop" -->
+<!--TMPL_IF Name="__odd__"--><tr class="highlight"><!--TMPL_ELSE--><tr><!-- /TMPL_IF -->
+<td><!-- TMPL_VAR NAME="cardnumber" --> </td>
+<td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
+<td><!-- TMPL_VAR NAME="branchcode" --> </td>
<td><a onclick="add_member(<!-- TMPL_VAR
NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&op=add">Add</a></td></tr>
<!-- /TMPL_LOOP -->
+ </tbody>
</table>
+ <div class="pages"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" --><!--/TMPL_IF--></div>
+ </div>
</div>
<!-- TMPL_ELSE -->
- <!-- TMPL_IF NAME="member" -->
+ <!-- TMPL_IF NAME="searching" -->
<p>No results found</p>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<!-- TMPL_IF NAME="memberloop" -->
+<div class="searchresults">
+<table>
<p><a href="#" class="button close">Close</a></p>
</div>
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;
projects / koha.git / commitdiff