X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=labels%2Flabel-edit-batch.pl;h=fbcfe0a2775252c213b99ca3f266a5bb7091f9d5;hb=096447f0867b5176589fafad51a4538183fb26ba;hp=52c1d25ffa2764c58e045b1111df8d7a337f4c1e;hpb=a192e57f00d6123a8d11fc52ef8f13e51f99e5a5;p=koha_gimpoz diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl index 52c1d25ffa..fbcfe0a277 100755 --- a/labels/label-edit-batch.pl +++ b/labels/label-edit-batch.pl @@ -4,7 +4,7 @@ # Parts Copyright 2009 Foundations Bible College. # # 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 @@ -14,27 +14,22 @@ # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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 strict; use warnings; use vars qw($debug); -use Sys::Syslog qw(syslog); -use Switch qw(Perl6); use CGI; -use HTML::Template::Pro; -use Data::Dumper; -use C4::Auth; -use C4::Output; -use C4::Context; +use C4::Auth qw(get_template_and_user); +use C4::Output qw(output_html_with_http_headers); use C4::Branch qw(get_branch_code_from_name); -use C4::Debug; -use C4::Labels::Lib 1.000000 qw(get_label_summary html_table); -use C4::Labels::Batch 1.000000; +use C4::Items qw(GetItemnumberFromBarcode); +use C4::Creators 1.000000; +use C4::Labels 1.000000; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -47,31 +42,78 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( debug => 1, } ); + my $err = 0; my $errstr = undef; +my $duplicate_count = undef; +my $duplicate_message = undef; my $db_rows = {}; my $batch = undef; -my $display_columns = [ {_label_number => 'Label Number'}, - {_summary => 'Summary'}, - {_item_type => 'Item Type'}, - {_barcode => 'Barcode'}, - {select => {label => 'Select', value => '_item_number'}}, +my $display_columns = [ {_label_number => {label => 'Label Number', link_field => 0}}, + {_summary => {label => 'Summary', link_field => 0}}, + {_item_type => {label => 'Item Type', link_field => 0}}, + {_barcode => {label => 'Barcode', link_field => 0}}, + {select => {label => 'Select', value => '_label_id'}}, ]; -my $op = $cgi->param('op') || undef; -my $label_id = $cgi->param('label_id') || undef; +my $op = $cgi->param('op') || 'edit'; +my @label_ids; +my @item_numbers; +my $barcode; my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef; -my $branch_code = get_branch_code_from_name($template->param('LoginBranchname')); +@label_ids = $cgi->param('label_id') if $cgi->param('label_id'); +@item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); +$barcode = $cgi->param('barcode') if $cgi->param('barcode'); + +my $branch_code = C4::Context->userenv->{'branch'}; if ($op eq 'remove') { $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id); + foreach my $label_id (@label_ids) { $err = $batch->remove_item($label_id); - $errstr = "item $label_id was not removed." if $err; + } + $errstr = "item(s) not removed from batch $batch_id." if $err; +# Something like this would be nice to avoid problems with the browser's 'refresh' button, but it needs an error handling mechanism... +# print $cgi->redirect("label-edit-batch.pl?op=edit&batch_id=$batch_id"); +# exit; } elsif ($op eq 'delete') { $err = C4::Labels::Batch::delete(batch_id => $batch_id, branch_code => $branch_code); $errstr = "batch $batch_id was not deleted." if $err; } -else{ +elsif ($op eq 'add') { + if ($barcode) { + my @barcodes = split /\n/, $barcode; # $barcode is effectively passed in as a separated list + foreach my $number (@barcodes) { + $number =~ s/\r$//; # strip any naughty return chars + if (my $item_number = GetItemnumberFromBarcode($number)) { # we must test in case an invalid barcode is passed in; we effectively disgard them atm + push @item_numbers, $item_number; + } + } + } + $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id); + $batch = C4::Labels::Batch->new(branch_code => $branch_code) if $batch == -2; + if ($branch_code){ + foreach my $item_number (@item_numbers) { + $err = $batch->add_item($item_number); + } + $errstr = "item(s) not added to batch $batch_id." if $err; + } + else { + $err = 1; + $errstr = "items(s) not added, the error was: Branch is not set, you please set your branch before adding items to a batch"; + } +} +elsif ($op eq 'new') { + $batch = C4::Labels::Batch->new(branch_code => $branch_code); + $batch_id = $batch->get_attr('batch_id'); +} +elsif ($op eq 'de_duplicate') { + $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id); + $duplicate_count = $batch->remove_duplicates(); + $duplicate_message = 1 if $duplicate_count != -1; + $errstr = "batch $batch_id not fully de-duplicated." if $duplicate_count == -1; +} +else { # edit $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id); } @@ -80,13 +122,17 @@ $db_rows = get_label_summary(items => $items, batch_id => $batch_id); my $table = html_table($display_columns, $db_rows); -$template->param( err => $err, - errstr => $errstr, +$template->param( + err => $err, + errstr => $errstr, ) if ($err ne 0); + $template->param( - op => $op, - batch_id => $batch_id, - table_loop => $table, -); + op => $op, + batch_id => $batch_id, + table_loop => $table, + duplicate_message => $duplicate_message, + duplicate_count => $duplicate_count, + ); output_html_with_http_headers $cgi, $cookie, $template->output;