Browse Source
This patch is the main patch. The "common" template is improved to allow different type of picking: "add" or "select". The first one appends a patron to a list, the second one selects the patron and close the result search window. The members/guarantor_search.pl has completly changed but is quite the same file as acqui/add_user_search.pl. Both should exist: they don't belong to the same module (acqui vs members), the picking type is different (add vs select) and the columns are not the same. The changes in the common template are very powerful, it's now possible to list the column we want! This will be very useful for further reusability. Before this patch, all patrons mathing the pattern were return. Now only the first 20 are (depends on the DataTables selected value). For QA: This patch introduces a new template plugin "To", for now it permits to convert a perl structure to json. In the idea, it could permit to convert foo to bar too. Test plan: 1/ Verify there is no regression in the guarantor search. When the selection has been done, all data from the guarantor should fill the form in the "main address" section. Note that the request is done when the search input in not empty and the user stop to write for 1 sec. 2/ Verify there is no regression on the 2 other pages where this patron search is used: link a patron to an order and to a basket (in the acquisition module). Signed-off-by: Morag Hills <the.invinnysible.one@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>3.20.x
Jonathan Druart
10 changed files with 167 additions and 105 deletions
@ -0,0 +1,33 @@ |
|||
package Koha::Template::Plugin::To; |
|||
|
|||
# This file is part of Koha. |
|||
# |
|||
# Copyright BibLibre 2014 |
|||
# |
|||
# Koha is free software; you can redistribute it and/or modify it under the |
|||
# terms of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 3 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY |
|||
# 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., |
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
|||
|
|||
use Modern::Perl; |
|||
|
|||
use base qw( Template::Plugin ); |
|||
|
|||
use JSON qw( to_json ); |
|||
|
|||
sub json { |
|||
my ( $self, $value ) = @_; |
|||
|
|||
my $json = JSON->new->allow_nonref(1); |
|||
return $json->encode( $value ); |
|||
} |
|||
|
|||
1; |
|||
@ -0,0 +1,21 @@ |
|||
[% USE To %] |
|||
[% USE KohaDates %] |
|||
{ |
|||
"sEcho": [% sEcho %], |
|||
"iTotalRecords": [% iTotalRecords %], |
|||
"iTotalDisplayRecords": [% iTotalDisplayRecords %], |
|||
"aaData": [ |
|||
[% FOREACH data IN aaData %] |
|||
{ |
|||
"dt_cardnumber": |
|||
"[% data.cardnumber %]", |
|||
"dt_dateofbirth": |
|||
"[% data.dateofbirth | $KohaDates %]", |
|||
"dt_address": |
|||
"[% data.streetnumber %] [% data.address | html %] [% data.address2 | html %] [% data.city | html %] [% data.state | html %] [% data.zipcode | html %] [% data.country | html %] [% data.branchcode %]", |
|||
"dt_action": |
|||
"<a style='cursor:pointer' onclick='select_user(\"[% data.borrowernumber %]\", [% To.json(data) | html %] );'>Select</a>" |
|||
}[% UNLESS loop.last %],[% END %] |
|||
[% END %] |
|||
] |
|||
} |
|||
@ -1,100 +1,51 @@ |
|||
#!/usr/bin/perl |
|||
|
|||
# script to find a guarantor |
|||
|
|||
# Copyright 2006 OUEST PROVENCE |
|||
# |
|||
# This file is part of Koha. |
|||
# |
|||
# Koha is free software; you can redistribute it and/or modify it under the |
|||
# terms of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# Copyright 2014 BibLibre |
|||
# |
|||
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY |
|||
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR |
|||
# A PARTICULAR PURPOSE. See the GNU General Public License for more details. |
|||
# Koha is free software; you can redistribute it and/or modify it |
|||
# under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 3 of the License, or |
|||
# (at your option) any later version. |
|||
# |
|||
# 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. |
|||
# Koha is distributed in the hope that it will be useful, but |
|||
# WITHOUT ANY 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, see <http://www.gnu.org/licenses>. |
|||
|
|||
use Modern::Perl; |
|||
|
|||
use CGI qw ( -utf8 ); |
|||
|
|||
use C4::Auth; |
|||
use C4::Output; |
|||
use C4::Dates qw/format_date/; |
|||
use C4::Members; |
|||
|
|||
my $input = new CGI; |
|||
my ( $template, $loggedinuser, $cookie ); |
|||
|
|||
( $template, $loggedinuser, $cookie ) = get_template_and_user( |
|||
{ |
|||
template_name => "members/guarantor_search.tt", |
|||
my $dbh = C4::Context->dbh; |
|||
|
|||
my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user( |
|||
{ template_name => "common/patron_search.tt", |
|||
query => $input, |
|||
type => "intranet", |
|||
authnotrequired => 0, |
|||
flagsrequired => { borrowers => 1 }, |
|||
debug => 1, |
|||
} |
|||
); |
|||
|
|||
my $member = $input->param('member') // ''; |
|||
my $orderby = $input->param('orderby'); |
|||
my $category_type = $input->param('category_type'); |
|||
|
|||
$orderby = "surname,firstname" unless $orderby; |
|||
$member =~ s/,//g; #remove any commas from search string |
|||
$member =~ s/\*/%/g; |
|||
|
|||
$template->param( results => $member ); |
|||
my $q = $input->param('q') || ''; |
|||
my $op = $input->param('op') || ''; |
|||
|
|||
my $search_category = 'A'; |
|||
if ( $category_type eq 'P' ) { |
|||
$search_category = 'I'; |
|||
} |
|||
|
|||
my ( $count, $results ); |
|||
my @resultsdata; |
|||
|
|||
if ( $member ne '' ) { |
|||
$results = |
|||
Search( { '' => $member, category_type => $search_category }, $orderby ); |
|||
|
|||
$count = $results ? @$results : 0; |
|||
|
|||
for ( my $i = 0 ; $i < $count ; $i++ ) { |
|||
my %row = ( |
|||
count => $i + 1, |
|||
borrowernumber => $results->[$i]{'borrowernumber'}, |
|||
cardnumber => $results->[$i]{'cardnumber'}, |
|||
surname => $results->[$i]{'surname'}, |
|||
firstname => $results->[$i]{'firstname'}, |
|||
categorycode => $results->[$i]{'categorycode'}, |
|||
streetnumber => $results->[$i]{'streetnumber'}, |
|||
address => $results->[$i]{'address'}, |
|||
address2 => $results->[$i]{'address2'}, |
|||
city => $results->[$i]{'city'}, |
|||
state => $results->[$i]{'state'}, |
|||
zipcode => $results->[$i]{'zipcode'}, |
|||
country => $results->[$i]{'country'}, |
|||
branchcode => $results->[$i]{'branchcode'}, |
|||
dateofbirth => format_date( $results->[$i]{'dateofbirth'} ), |
|||
borrowernotes => $results->[$i]{'borrowernotes'} |
|||
); |
|||
|
|||
push( @resultsdata, \%row ); |
|||
} |
|||
} |
|||
my $referer = $input->referer(); |
|||
|
|||
$template->param( |
|||
member => $member, |
|||
numresults => $count, |
|||
category_type => $category_type, |
|||
resultsloop => \@resultsdata |
|||
view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results", |
|||
columns => ['cardnumber', 'dateofbirth', 'address', 'action' ], |
|||
json_template => 'members/tables/guarantor_search.tt', |
|||
selection_type => 'select', |
|||
); |
|||
|
|||
output_html_with_http_headers $input, $cookie, $template->output; |
|||
output_html_with_http_headers( $input, $cookie, $template->output ); |
|||
|
|||
Loading…
Reference in new issue