Преглед изворни кода
This patch adds a 'Transfers to send' report to the circulation page which displays items which have been triggered for transfer but not marked as sent. Test plan 1) Setup a rotation plan and add some items to it as per the manual 2) Run the stockrotation cronjob with the --execute flag 3) Check that the expected items appear in the new 'Transfers to send' page. 4) Confirm that items marked with 'StockRotationAdvance' provide the option to mark the item as 'In demand' (Which will cancel the transfer and mark the item as in demand such that it will wait at the current branch for an additional stage period before being automatically picke for transfer again) 5) Setup a rotating collection 6) Trigger a collection transfer for the above collection 7) Check that the expected items appear in the new 'Transfers to send' page'. Signed-off-by: Kathleen Milne <kathleen.milne@cne-siar.gov.uk> Bug 22569: (QA follow-up) Rename script to snake_case As requested, we simply rename the script, and references to it, to use snake_case to make it clearer. Bug 22569: (QA follow-up) Rename branchesloop to libraries Bug 22569: (QA follow-up) Fix indentation in template Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>21.05.x
6 измењених фајлова са 256 додато и 8 уклоњено
@ -0,0 +1,64 @@ |
|||
#!/usr/bin/perl |
|||
|
|||
# Copyright 2019 PTFS-Europe Ltd. |
|||
# |
|||
# 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>. |
|||
|
|||
use Modern::Perl; |
|||
use CGI qw ( -utf8 ); |
|||
use C4::Context; |
|||
use C4::Auth; |
|||
use C4::Output; |
|||
|
|||
use Koha::DateUtils; |
|||
|
|||
my $input = CGI->new; |
|||
my $itemnumber = $input->param('itemnumber'); |
|||
|
|||
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( |
|||
{ |
|||
template_name => "circ/transfers_to_send.tt", |
|||
query => $input, |
|||
type => "intranet", |
|||
flagsrequired => { circulate => "circulate_remaining_permissions" }, |
|||
debug => 1, |
|||
} |
|||
); |
|||
|
|||
# set the userenv branch |
|||
my $branchcode = C4::Context->userenv->{'branch'}; |
|||
|
|||
# transfers requested but not yet sent |
|||
my @transfers = Koha::Libraries->search( |
|||
{ |
|||
'branchtransfers_tobranches.frombranch' => $branchcode, |
|||
'branchtransfers_tobranches.daterequested' => { '!=' => undef }, |
|||
'branchtransfers_tobranches.datesent' => undef, |
|||
'branchtransfers_tobranches.datearrived' => undef, |
|||
'branchtransfers_tobranches.datecancelled' => undef, |
|||
}, |
|||
{ |
|||
prefetch => 'branchtransfers_tobranches', |
|||
order_by => 'branchtransfers_tobranches.tobranch' |
|||
} |
|||
); |
|||
|
|||
$template->param( |
|||
libraries => \@transfers, |
|||
show_date => dt_from_string |
|||
); |
|||
|
|||
output_html_with_http_headers $input, $cookie, $template->output; |
|||
@ -0,0 +1,115 @@ |
|||
[% USE raw %] |
|||
[% USE Asset %] |
|||
[% USE Koha %] |
|||
[% USE KohaDates %] |
|||
[% USE Branches %] |
|||
[% SET footerjs = 1 %] |
|||
[% INCLUDE 'doc-head-open.inc' %] |
|||
<title>Koha › Circulation › Transfers to send</title> |
|||
[% INCLUDE 'doc-head-close.inc' %] |
|||
</head> |
|||
|
|||
<body id="circ_transferstosend" class="circ"> |
|||
[% INCLUDE 'header.inc' %] |
|||
[% INCLUDE 'circ-search.inc' %] |
|||
|
|||
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Transfers to send</div> |
|||
|
|||
<div class="main container-fluid"> |
|||
<div class="row"> |
|||
<div class="col-sm-12"> |
|||
<main> |
|||
<div class="row"> |
|||
|
|||
[% IF Koha.Preference('CircSidebar') %] |
|||
<div class="col-sm-10 col-sm-push-2"> |
|||
[% ELSE %] |
|||
<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> |
|||
[% END %] |
|||
|
|||
<h1>Transfers requested of your library as of [% show_date | $KohaDates %]</h1> |
|||
|
|||
[% IF ( libraries ) %] |
|||
<p>Your library is the origin for the following transfer(s)</p> |
|||
<div id="resultlist"> |
|||
[% FOREACH library IN libraries %] |
|||
[% IF ( library.branchcode ) %] |
|||
<table style="width: 100%" id="transferst[% library.branchcode | html %]"> |
|||
<caption>Sending to [% library.branchname | html %]</caption> |
|||
<thead> |
|||
<tr> |
|||
<th class="title-string">Date of request</th> |
|||
<th class="anti-the">Title</th> |
|||
<th>Reason</th> |
|||
<th>On loan</th> |
|||
<th>Home library</th> |
|||
<th>Call no.</th> |
|||
<th>Actions</th> |
|||
</tr> |
|||
</thead> |
|||
<tbody> |
|||
[% FOREACH transfer IN library.inbound_transfers %] |
|||
[% UNLESS transfer.datesent %] |
|||
<tr> |
|||
<td><p><span title="[% transfer.daterequested | html %]">[% transfer.daterequested | $KohaDates %]</span></p></td> |
|||
<td> |
|||
[% INCLUDE 'biblio-title.inc' biblio = transfer.item.biblio link = 1 %][% IF ( transfer.item.biblio.author ) %] by [% transfer.item.biblio.author | html %][% END %] |
|||
[% IF ( transfer.item.effective_itemtype ) %] (<b>[% transfer.item.effective_itemtype | html %]</b>)[% END %] |
|||
<br />Barcode: [% transfer.item.barcode | html %] |
|||
</td> |
|||
<td><p>[% transfer.reason | html %]</p></td> |
|||
<td>[% IF transfer.item.onloan %]Due [% transfer.item.onloan | $KohaDates %][% ELSE %]On shelf[% END %]</td> |
|||
<td>[% Branches.GetName( transfer.item.homebranch ) | html %]</td> |
|||
<td>[% transfer.item.itemcallnumber | html %]</td> |
|||
<td class="actions"> |
|||
[% IF transfer.reason == 'StockrotationAdvance' %] |
|||
<a href="/cgi-bin/koha/catalogue/stockrotation.pl?op=toggle_in_demand&stage_id=4&item_id=[% transfer.itemnumber | uri %]&biblionumber=[% transfer.item.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-fire"></i> Mark "In demand"</a> |
|||
[% END %] |
|||
</td> |
|||
</tr> |
|||
[% END %] |
|||
[% END %] |
|||
</tbody> |
|||
</table> |
|||
[% END %] |
|||
[% END %] |
|||
</div> |
|||
[% ELSE %] |
|||
<p>No transfers to send</p> |
|||
[% END %] |
|||
|
|||
</div> <!-- /.col-sm-10.col-sm-push-2 OR /.col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2--> |
|||
|
|||
[% IF Koha.Preference('CircSidebar') %] |
|||
<div class="col-sm-2 col-sm-pull-10"> |
|||
<aside> |
|||
[% INCLUDE 'circ-nav.inc' %] |
|||
</aside> |
|||
</div> <!-- /.col-sm-2.col-sm-pull-10 --> |
|||
[% END %] |
|||
|
|||
</div> <!-- /.row --> |
|||
</main> |
|||
</div> <!-- /.col-sm-12 --> |
|||
</div> <!-- /.row --> |
|||
|
|||
[% MACRO jsinclude BLOCK %] |
|||
[% INCLUDE 'datatables.inc' %] |
|||
<script> |
|||
$(document).ready(function() { |
|||
[% FOREACH library IN libraries %] |
|||
$("#transferst[% library.branchcode | html %]").dataTable($.extend(true, {}, dataTablesDefaults, { |
|||
"aoColumnDefs": [ |
|||
{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, |
|||
{ "sType": "anti-the", "aTargets" : [ "anti-the" ] }, |
|||
{ "sType": "title-string", "aTargets" : [ "title-string" ] } |
|||
], |
|||
"sDom": 't', |
|||
"bPaginate": false |
|||
})); |
|||
[% END %] |
|||
}); |
|||
</script> |
|||
[% END %] |
|||
|
|||
[% INCLUDE 'intranet-bottom.inc' %] |
|||
Loading…
Reference in new issue