From 511e4486cd55117901cb4c403da9cf4ac643320c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 16 Jun 2023 12:34:59 +0200 Subject: [PATCH] Bug 34030: Add a "print slips" action links to print in batch Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: BULAC - http://www.bulac.fr/ Signed-off-by: Heather Hernandez Signed-off-by: Laurence Rault Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/css/print.css | 4 + .../prog/en/modules/circ/printslip.tt | 12 ++- .../components/Preservation/TrainsShow.vue | 95 ++++++++++++++++++- preservation/print_slip.pl | 46 ++++----- 4 files changed, 123 insertions(+), 34 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/print.css b/koha-tmpl/intranet-tmpl/prog/css/print.css index 05ce9875319..e2c9d152ac9 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/print.css +++ b/koha-tmpl/intranet-tmpl/prog/css/print.css @@ -1,3 +1,7 @@ +@media print { + .pagebreak { break-after: page; } +} + a:link { color: #000000; text-decoration: none; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt index 04d56d6fd9c..f4d35cf1b1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt @@ -35,12 +35,18 @@
-[% IF plain %] +[% UNLESS slips && slips.size %] + [% SET slips = [{content => slip, is_html => !plain}] %] +[% END %] +[% FOR slip IN slips %] +[% UNLESS slip.is_html %]
-[% IF ( slip ) %][% slip | html %][% ELSE %]No slip template found[% END %]
+[% IF ( slip.content ) %][% slip.content | html %][% ELSE %]No slip template found[% END %]
 
[% ELSE %] -[% IF ( slip ) %][% slip | $raw %][% ELSE %]No slip template found[% END %] +[% IF ( slip.content ) %][% slip.content | $raw %][% ELSE %]No slip template found[% END %] +[% END %] +[% IF slips.size > 1 && !loop.last%]
[% END %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsShow.vue index 82e60debc87..0524262539e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsShow.vue @@ -153,6 +153,27 @@
{{ $__("Items") }} + + {{ $__("Select all") }} + {{ $__("Clear all") }} + {{ $__("Actions: ") }} + {{ $__("Print slips") }} + {{ $__("Print slips") }} +
  1. { + return "" + }, + }, + { + name: "", + title: this.$__("ID"), + data: "item.user_train_item_id", + } + ) train.default_processing.attributes.forEach(a => this.item_table.columns.push({ name: a.name, @@ -478,6 +510,38 @@ export default { } ) }, + clearAll() { + this.selected_items = [] + $("#" + this.table_id) + .find("input[name='user_train_item_id'][type='checkbox']") + .prop("checked", false) + }, + selectAll() { + $("#" + this.table_id) + .find("input[name='user_train_item_id'][type='checkbox']") + .each((i, input) => { + this.selected_items.push($(input).val()) + $(input).prop("checked", true) + }) + }, + printSelected() { + window.open( + "/cgi-bin/koha/preservation/print_slip.pl?%s_blank".format( + this.selected_items + .map(id => "train_item_id=" + id) + .join("&") + ) + ) + }, + updateSelectedItems(checked, train_item_id) { + if (checked) { + this.selected_items.push(train_item_id) + } else { + this.selected_items = this.selected_items.filter( + id => id != train_item_id + ) + } + }, build_datatable: function () { let table_id = this.table_id let item_table = this.item_table @@ -486,6 +550,7 @@ export default { let printSlip = this.printSlip let selectTrainForCopy = this.selectTrainForCopy let train = this.train + let updateSelectedItems = this.updateSelectedItems let table = KohaTable(table_id, { data: item_table.data, @@ -494,6 +559,25 @@ export default { columns: item_table.columns, drawCallback: function (settings) { var api = new $.fn.dataTable.Api(settings) + $.each($(this).find("td.checkboxes"), function (index, e) { + let tr = $(this).parent() + let train_item = api.row(tr).data().item + let train_item_id = train_item.train_item_id + + let checkbox = createVNode("input", { + type: "checkbox", + name: "user_train_item_id", + value: train_item_id, + onChange: e => { + updateSelectedItems( + e.target.checked, + train_item_id + ) + }, + }) + + render(checkbox, e) + }) $.each($(this).find("td.actions"), function (index, e) { let tr = $(this).parent() let train_item = api.row(tr).data().item @@ -599,6 +683,7 @@ export default { .action_links a { padding-left: 0.2em; font-size: 11px; + cursor: pointer; } .attributes_values { float: left; diff --git a/preservation/print_slip.pl b/preservation/print_slip.pl index f54d3568255..285319e036d 100755 --- a/preservation/print_slip.pl +++ b/preservation/print_slip.pl @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . - use Modern::Perl; use CGI qw ( -utf8 ); use C4::Context; @@ -25,8 +24,8 @@ use C4::Letters; use Koha::Patrons; use Koha::Preservation::Train::Items; -my $input = CGI->new; -my $train_item_id = $input->param('train_item_id'); +my $input = CGI->new; +my @train_item_ids = $input->multi_param('train_item_id'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -40,32 +39,27 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( my $logged_in_user = Koha::Patrons->find($loggedinuser); my $branch = C4::Context->userenv->{'branch'}; -my $train_item = Koha::Preservation::Train::Items->find($train_item_id); - -unless ($train_item) { - print $input->redirect("/cgi-bin/koha/errors/404.pl"); - exit; +my @slips; +for my $train_item_id (@train_item_ids) { + my $train_item = Koha::Preservation::Train::Items->find($train_item_id); + my $letter = C4::Letters::GetPreparedLetter( + module => 'preservation', + letter_code => $train_item->processing->letter_code, + branchcode => $branch, + lang => $logged_in_user->lang, + tables => { + preservation_train_items => $train_item_id, + }, + message_transport_type => 'print' + ); + push @slips, { + content => $letter->{content}, + is_html => $letter->{is_html}, + }; } -my $train = $train_item->train; - -my $letter = C4::Letters::GetPreparedLetter( - module => 'preservation', - letter_code => $train_item->processing->letter_code, - branchcode => $branch, - lang => $logged_in_user->lang, - tables => { - preservation_train_items => $train_item_id, - }, - message_transport_type => 'print' -); - -my $slip = $letter->{content}; -my $is_html = $letter->{is_html}; - $template->param( - slip => $slip, - plain => !$is_html, + slips => \@slips, caller => 'preservation', stylesheet => C4::Context->preference("SlipCSS"), ); -- 2.34.1