Alex Buckley
5c2daf28a5
As per test feedback I've changed wording from debarrment to restriction Added insertion into the borrower_debarments table and removal from borrower_debarments table (and borrowers.debarred and borrowers.debarredcomment) when either 'Restriction expiration' or 'Restriction comment' are ticket to be disabled/deleted. Test plan (please follow this instead of following test plan in the first patch): 1. Go to Tools > Batch patron modification 2. Input the cardnumbers of several (undebarred/unrestricted) patrons and submit 3. Notice there is no input for setting Restriction expiration date or Restriction comment Also notice in the list of matching borrowers at the top of the page there is no display of the 'Restriction expiration' or 'Restriction comment' values for the patron 4. Apply patch 5. Restart memcached and plack 6. Refresh the page notice 'Restriction expiration' (a date picker input) and 'Restriction comment'are now input options Also notice in the table at the top of the page 'Restriction expiration' and 'Restriction comment' are shown on the far right of the table (you may need to scroll to see this) 7. Pick a date in the 'Restriction expired' datepicker and write in text into the 'Restriction comment' field and submit 8. Notice in the next loaded page the selected patrons have the 'Restriction expiration' and 'Restriction comment' values you entered 9. Query the borrower_debarments database table and check that the new debarments are added to this table 10. Go back to the Batch patron modification page and re-input the same cardnumbers 11. Write text into the 'Restriction comment' field and don't pick a 'Restriction expiration' value and submit 12. Notice in the next loaded page the selected patrons have the 'Restriction expiration' value of 9999-12-31 and 'Restriction comment' value you just entered 13. Query the borrowers table and notice the borrowers.debarred value for the modified patrons is '9999-12-31' and the borrower.debarredcomment is what you inputted in step 11 14. Query the borrower_debarments table and notice the expiration value is NULL and the comment value is set to what you entered in step 11 Also note the addition of the new debarment has not removed the existing debarment on the patrons 15. Click on the cardnumber link of one of the patrons and notice the red text on their patron account page informing you they are restricted until the date you set 16. In the Koha home directory enter Koha shell: sudo koha-shell <instancename> 17. Run: prove xt 18. All tests should pass 19. Repeat step 10 and tick the checkbox beside the 'Restriction expiration' field and submit 20. In the next loaded screen notice the 'Restricted expiration'and 'Restricted comment' are empty Check the borrower_debarments table and notice all restrictions for the patron are removed. Check the borrowers table and notice the debarred and debarredcomment fields are empty for the patrons 21. Repeat steps 10 and 11 to make a new restriction 22. Repeat step 19 and this time check the 'Restriction comment' field and submit and observe that also clears the restriction in the next loaded page, in the borrower_debarments and borrowers table 23. Sign off Sponsored-By: Brimbank Library, Australia Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
406 lines
15 KiB
Perl
Executable file
406 lines
15 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2012 BibLibre
|
|
#
|
|
# 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 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, see <http://www.gnu.org/licenses>.
|
|
|
|
# modborrowers.pl
|
|
#
|
|
# Batch Edit Patrons
|
|
# Modification for patron's fields:
|
|
# surname firstname branchcode categorycode city state zipcode country sort1
|
|
# sort2 dateenrolled dateexpiry borrowernotes
|
|
# And for patron attributes.
|
|
|
|
use Modern::Perl;
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth;
|
|
use C4::Koha;
|
|
use C4::Members;
|
|
use C4::Members::Attributes;
|
|
use C4::Members::AttributeTypes qw/GetAttributeTypes_hashref/;
|
|
use C4::Output;
|
|
use List::MoreUtils qw /any uniq/;
|
|
use Koha::DateUtils qw( dt_from_string );
|
|
use Koha::List::Patron;
|
|
use Koha::Libraries;
|
|
use Koha::Patron::Categories;
|
|
use Koha::Patron::Debarments;
|
|
use Koha::Patrons;
|
|
|
|
my $input = new CGI;
|
|
my $op = $input->param('op') || 'show_form';
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{ template_name => "tools/modborrowers.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { tools => "edit_patrons" },
|
|
}
|
|
);
|
|
|
|
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
|
|
|
my %cookies = parse CGI::Cookie($cookie);
|
|
my $sessionID = $cookies{'CGISESSID'}->value;
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
# Show borrower informations
|
|
if ( $op eq 'show' ) {
|
|
my $filefh = $input->upload('uploadfile');
|
|
my $filecontent = $input->param('filecontent');
|
|
my $patron_list_id = $input->param('patron_list_id');
|
|
my @borrowers;
|
|
my @cardnumbers;
|
|
my ( @notfoundcardnumbers, @from_another_group_of_libraries );
|
|
|
|
# Get cardnumbers from a file or the input area
|
|
my @contentlist;
|
|
if ($filefh) {
|
|
while ( my $content = <$filefh> ) {
|
|
$content =~ s/[\r\n]*$//g;
|
|
push @cardnumbers, $content if $content;
|
|
}
|
|
} elsif ( $patron_list_id ) {
|
|
my ($list) = GetPatronLists( { patron_list_id => $patron_list_id } );
|
|
|
|
@cardnumbers =
|
|
$list->patron_list_patrons()->search_related('borrowernumber')
|
|
->get_column('cardnumber')->all();
|
|
|
|
} else {
|
|
if ( my $list = $input->param('cardnumberlist') ) {
|
|
push @cardnumbers, split( /\s\n/, $list );
|
|
}
|
|
}
|
|
|
|
my $max_nb_attr = 0;
|
|
for my $cardnumber ( @cardnumbers ) {
|
|
my $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
|
|
if ( $patron ) {
|
|
if ( $logged_in_user->can_see_patron_infos( $patron ) ) {
|
|
$patron = $patron->unblessed;
|
|
$patron->{patron_attributes} = C4::Members::Attributes::GetBorrowerAttributes( $patron->{borrowernumber} );
|
|
$max_nb_attr = scalar( @{ $patron->{patron_attributes} } )
|
|
if scalar( @{ $patron->{patron_attributes} } ) > $max_nb_attr;
|
|
push @borrowers, $patron;
|
|
} else {
|
|
push @notfoundcardnumbers, $cardnumber;
|
|
}
|
|
} else {
|
|
push @notfoundcardnumbers, $cardnumber;
|
|
}
|
|
}
|
|
|
|
# Just for a correct display
|
|
for my $borrower ( @borrowers ) {
|
|
my $length = scalar( @{ $borrower->{patron_attributes} } );
|
|
push @{ $borrower->{patron_attributes} }, {} for ( $length .. $max_nb_attr - 1);
|
|
}
|
|
|
|
# Construct the patron attributes list
|
|
my @patron_attributes_values;
|
|
my @patron_attributes_codes;
|
|
my $patron_attribute_types = C4::Members::AttributeTypes::GetAttributeTypes_hashref('all');
|
|
my @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
|
|
for ( values %$patron_attribute_types ) {
|
|
my $attr_type = C4::Members::AttributeTypes->fetch( $_->{code} );
|
|
# TODO Repeatable attributes are not correctly managed and can cause data lost.
|
|
# This should be implemented.
|
|
next if $attr_type->{repeatable};
|
|
next if $attr_type->{unique_id}; # Don't display patron attributes that must be unqiue
|
|
my $options = $attr_type->authorised_value_category
|
|
? GetAuthorisedValues( $attr_type->authorised_value_category )
|
|
: undef;
|
|
push @patron_attributes_values,
|
|
{
|
|
attribute_code => $_->{code},
|
|
options => $options,
|
|
};
|
|
|
|
my $category_code = $_->{category_code};
|
|
my ( $category_lib ) = map {
|
|
( defined $category_code and $_->categorycode eq $category_code ) ? $_->description : ()
|
|
} @patron_categories;
|
|
push @patron_attributes_codes,
|
|
{
|
|
attribute_code => $_->{code},
|
|
attribute_lib => $_->{description},
|
|
category_lib => $category_lib,
|
|
type => $attr_type->authorised_value_category ? 'select' : 'text',
|
|
};
|
|
}
|
|
|
|
my @attributes_header = ();
|
|
for ( 1 .. scalar( $max_nb_attr ) ) {
|
|
push @attributes_header, { attribute => "Attributes $_" };
|
|
}
|
|
$template->param( borrowers => \@borrowers );
|
|
$template->param( attributes_header => \@attributes_header );
|
|
@notfoundcardnumbers = map { { cardnumber => $_ } } @notfoundcardnumbers;
|
|
$template->param( notfoundcardnumbers => \@notfoundcardnumbers )
|
|
if @notfoundcardnumbers;
|
|
|
|
# Construct drop-down list values
|
|
my $branches = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;
|
|
my @branches_option;
|
|
push @branches_option, { value => $_->{branchcode}, lib => $_->{branchname} } for @$branches;
|
|
unshift @branches_option, { value => "", lib => "" };
|
|
my @categories_option;
|
|
push @categories_option, { value => $_->categorycode, lib => $_->description } for @patron_categories;
|
|
unshift @categories_option, { value => "", lib => "" };
|
|
my $bsort1 = GetAuthorisedValues("Bsort1");
|
|
my @sort1_option;
|
|
push @sort1_option, { value => $_->{authorised_value}, lib => $_->{lib} } for @$bsort1;
|
|
unshift @sort1_option, { value => "", lib => "" }
|
|
if @sort1_option;
|
|
my $bsort2 = GetAuthorisedValues("Bsort2");
|
|
my @sort2_option;
|
|
push @sort2_option, { value => $_->{authorised_value}, lib => $_->{lib} } for @$bsort2;
|
|
unshift @sort2_option, { value => "", lib => "" }
|
|
if @sort2_option;
|
|
|
|
my @mandatoryFields = split( /\|/, C4::Context->preference("BorrowerMandatoryField") );
|
|
|
|
my @fields = (
|
|
{
|
|
name => "surname",
|
|
type => "text",
|
|
mandatory => ( grep /surname/, @mandatoryFields ) ? 1 : 0
|
|
}
|
|
,
|
|
{
|
|
name => "firstname",
|
|
type => "text",
|
|
mandatory => ( grep /firstname/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "branchcode",
|
|
type => "select",
|
|
option => \@branches_option,
|
|
mandatory => ( grep /branchcode/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "categorycode",
|
|
type => "select",
|
|
option => \@categories_option,
|
|
mandatory => ( grep /categorycode/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "city",
|
|
type => "text",
|
|
mandatory => ( grep /city/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "state",
|
|
type => "text",
|
|
mandatory => ( grep /state/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "zipcode",
|
|
type => "text",
|
|
mandatory => ( grep /zipcode/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "country",
|
|
type => "text",
|
|
mandatory => ( grep /country/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "sort1",
|
|
type => @sort1_option ? "select" : "text",
|
|
option => \@sort1_option,
|
|
mandatory => ( grep /sort1/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "sort2",
|
|
type => @sort2_option ? "select" : "text",
|
|
option => \@sort2_option,
|
|
mandatory => ( grep /sort2/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "dateenrolled",
|
|
type => "date",
|
|
mandatory => ( grep /dateenrolled/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "dateexpiry",
|
|
type => "date",
|
|
mandatory => ( grep /dateexpiry/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "borrowernotes",
|
|
type => "text",
|
|
mandatory => ( grep /borrowernotes/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "opacnote",
|
|
type => "text",
|
|
mandatory => ( grep /opacnote/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "debarred",
|
|
type => "date",
|
|
mandatory => ( grep /debarred/, @mandatoryFields ) ? 1 : 0,
|
|
}
|
|
,
|
|
{
|
|
name => "debarredcomment",
|
|
type => "text",
|
|
mandatory => ( grep /debarredcomment/, @mandatoryFields ) ? 1 : 0,
|
|
},
|
|
);
|
|
|
|
$template->param('patron_attributes_codes', \@patron_attributes_codes);
|
|
$template->param('patron_attributes_values', \@patron_attributes_values);
|
|
|
|
$template->param( fields => \@fields );
|
|
}
|
|
|
|
# Process modifications
|
|
if ( $op eq 'do' ) {
|
|
|
|
my @disabled = $input->multi_param('disable_input');
|
|
my $infos;
|
|
for my $field ( qw/surname firstname branchcode categorycode city state zipcode country sort1 sort2 dateenrolled dateexpiry borrowernotes opacnote debarred debarredcomment/ ) {
|
|
my $value = $input->param($field);
|
|
$infos->{$field} = $value if $value;
|
|
$infos->{$field} = "" if grep { /^$field$/ } @disabled;
|
|
}
|
|
|
|
for my $field ( qw( dateenrolled dateexpiry debarred ) ) {
|
|
$infos->{$field} = dt_from_string($infos->{$field}) if $infos->{$field};
|
|
}
|
|
|
|
my @attributes = $input->multi_param('patron_attributes');
|
|
my @attr_values = $input->multi_param('patron_attributes_value');
|
|
|
|
my @errors;
|
|
my @borrowernumbers = $input->multi_param('borrowernumber');
|
|
# For each borrower selected
|
|
for my $borrowernumber ( @borrowernumbers ) {
|
|
# If at least one field are filled, we want to modify the borrower
|
|
if ( defined $infos ) {
|
|
# If a debarred date or debarred comment has been submitted make a new debarment
|
|
if ( $infos->{debarred} || $infos->{debarredcomment} ) {
|
|
AddDebarment(
|
|
{
|
|
borrowernumber => $borrowernumber,
|
|
type => 'MANUAL',
|
|
comment => $infos->{debarredcomment},
|
|
expiration => $infos->{debarred},
|
|
});
|
|
}
|
|
|
|
# If debarment date or debarment comment are disabled then remove all debarrments
|
|
if ( grep { /debarred/ } @disabled ) {
|
|
eval {
|
|
my $debarrments = GetDebarments( { borrowernumber => $borrowernumber } );
|
|
foreach my $debarment (@$debarrments) {
|
|
DelDebarment( $debarment->{'borrower_debarment_id'} );
|
|
}
|
|
};
|
|
}
|
|
|
|
$infos->{borrowernumber} = $borrowernumber;
|
|
eval { Koha::Patrons->find( $borrowernumber )->set($infos)->store; };
|
|
if ( $@ ) { # FIXME We could provide better error handling here
|
|
my $patron = Koha::Patrons->find( $borrowernumber );
|
|
$infos->{cardnumber} = $patron ? $patron->cardnumber || '' : '';
|
|
push @errors, { error => "can_not_update", borrowernumber => $infos->{borrowernumber}, cardnumber => $infos->{cardnumber} };
|
|
}
|
|
}
|
|
|
|
my $borrower_categorycode = Koha::Patrons->find( $borrowernumber )->categorycode;
|
|
my $i=0;
|
|
for ( @attributes ) {
|
|
next unless $_;
|
|
my $attribute;
|
|
$attribute->{code} = $_;
|
|
$attribute->{attribute} = $attr_values[$i];
|
|
my $attr_type = C4::Members::AttributeTypes->fetch( $_ );
|
|
# If this borrower is not in the category of this attribute, we don't want to modify this attribute
|
|
++$i and next if $attr_type->{category_code} and $attr_type->{category_code} ne $borrower_categorycode;
|
|
my $valuename = "attr" . $i . "_value";
|
|
if ( grep { /^$valuename$/ } @disabled ) {
|
|
# The attribute is disabled, we remove it for this borrower !
|
|
eval {
|
|
C4::Members::Attributes::DeleteBorrowerAttribute( $borrowernumber, $attribute );
|
|
};
|
|
push @errors, { error => $@ } if $@;
|
|
} else {
|
|
eval {
|
|
C4::Members::Attributes::UpdateBorrowerAttribute( $borrowernumber, $attribute );
|
|
};
|
|
push @errors, { error => $@ } if $@;
|
|
}
|
|
$i++;
|
|
}
|
|
}
|
|
$op = "show_results"; # We have process modifications, the user want to view its
|
|
|
|
# Construct the results list
|
|
my @borrowers;
|
|
my $max_nb_attr = 0;
|
|
for my $borrowernumber ( @borrowernumbers ) {
|
|
my $patron = Koha::Patrons->find( $borrowernumber );
|
|
if ( $patron ) {
|
|
$patron = $patron->unblessed;
|
|
$patron->{patron_attributes} = C4::Members::Attributes::GetBorrowerAttributes( $patron->{borrowernumber} );
|
|
$max_nb_attr = scalar( @{ $patron->{patron_attributes} } )
|
|
if scalar( @{ $patron->{patron_attributes} } ) > $max_nb_attr;
|
|
push @borrowers, $patron;
|
|
}
|
|
}
|
|
my @patron_attributes_option;
|
|
for my $borrower ( @borrowers ) {
|
|
push @patron_attributes_option, { value => "$_->{code}", lib => $_->{code} } for @{ $borrower->{patron_attributes} };
|
|
my $length = scalar( @{ $borrower->{patron_attributes} } );
|
|
push @{ $borrower->{patron_attributes} }, {} for ( $length .. $max_nb_attr - 1);
|
|
}
|
|
|
|
my @attributes_header = ();
|
|
for ( 1 .. scalar( $max_nb_attr ) ) {
|
|
push @attributes_header, { attribute => "Attributes $_" };
|
|
}
|
|
|
|
$template->param( borrowers => \@borrowers );
|
|
$template->param( attributes_header => \@attributes_header );
|
|
|
|
$template->param( errors => \@errors );
|
|
} else {
|
|
|
|
$template->param( patron_lists => [ GetPatronLists() ] );
|
|
}
|
|
|
|
$template->param(
|
|
op => $op,
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
exit;
|