Attachment #96516 for bug #22569

View | Details | Raw Unified | Return to bug 22569
Collapse All | Expand All





=cut

=head3 item

  my $item = Koha::Library->item;

Returns the associated item for this transfer.

=cut

sub item {
    my ( $self ) = @_;
    my $rs = $self->_result->itemnumber;
    return Koha::Item->_new_from_dbic( $rs );
}

=head3 type

=cut




    return Koha::StockRotationStages->_new_from_dbic( $rs );
}

=head3 outgoing_transfers

  my $outgoing_transfers = Koha::Library->outgoing_transfers;

Returns the outgoing item transfers associated with this Library.

=cut

sub outgoing_transfers {
    my ( $self ) = @_;
    my $rs = $self->_result->branchtransfers_frombranches;
    return Koha::Item::Transfers->_new_from_dbic( $rs );
}

=head3 inbound_transfers

  my $inbound_transfers = Koha::Library->inbound_transfers;

Returns the inbound item transfers associated with this Library.

=cut

sub inbound_transfers {
    my ( $self ) = @_;
    my $rs = $self->_result->branchtransfers_tobranches;
    return Koha::Item::Transfers->_new_from_dbic( $rs );
}

=head3 get_effective_marcorgcode

    my $marcorgcode = Koha::Libraries->find( $library_id )->get_effective_marcorgcode();




    return $transfer->store;
}

=head3 toggle_indemand

  $sritem->toggle_indemand;

Toggle this items in_demand status.

If the item is in the process of being advanced to the next stage then we cancel
the transfer, revert the advancement and reset the 'StockrotationAdvance' counter,
as though 'in_demand' had been set prior to the call to advance, by updating the
in progress transfer.

=cut

sub toggle_indemand {
    my ( $self ) = @_;

    # Toggle the item's indemand flag
    my $new_indemand = ($self->indemand == 1) ? 0 : 1;

    # Cancel 'StockrotationAdvance' transfer if one is in progress
    if ($new_indemand) {
        my $item = $self->itemnumber;
        my $transfer = $item->get_transfer;
        if ($transfer && $transfer->comments eq 'StockrotationAdvance') {
            my $stage = $self->stage;
            my $new_stage;
            if ( $stage->rota->cyclical && !$stage->first_sibling ) { # First stage
                $new_stage = $stage->last_sibling;
            } else {
                $new_stage = $stage->previous_sibling;
            }
            $self->stage_id($new_stage->stage_id)->store;        # Revert stage change
            $item->homebranch($new_stage->branchcode_id)->store; # Revert update homebranch
            $new_indemand = 0;                                   # Reset indemand
            $transfer->tobranch($new_stage->branchcode_id);      # Reset StockrotationAdvance
            $transfer->datearrived(DateTime->now);               # Reset StockrotationAdvance
            $transfer->store;
        }
    }

    $self->indemand($new_indemand)->store;
}

=head3 investigate

  my $report = $item->investigate;





sub toggle_indemand {

    my ($item_id) = @_;

    # Get the item object
    my $sr_item = Koha::StockRotationItems->find(
        {
            itemnumber_id => $item_id,
            stage_id      => $stage_id
        }
    );

    $sr_item->toggle_indemand;
    my $new_indemand = ($item->indemand == 1) ? 0 : 1;

    $item->indemand($new_indemand)->store;

}

=head2 move_to_next_stage




#!/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      = new CGI;
my $itemnumber = $input->param('itemnumber');

my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
    {
        template_name   => "circ/transferstosend.tt",
        query           => $input,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { circulate => "circulate_remaining_permissions" },
        debug           => 1,
    }
);

# set the userenv branch
my $branchcode = C4::Context->userenv->{'branch'};

# transfers prompted by stockrotation
my @transfers = Koha::Libraries->search(
    {
        'branchtransfers_tobranches.frombranch'  => $branchcode,
        'branchtransfers_tobranches.datesent'    => { '!=' => undef },
        'branchtransfers_tobranches.datearrived' => undef,
        'branchtransfers_tobranches.comments' =>
          [ "StockrotationAdvance", "StockrotationRepatriation" ]
    },
    {
        prefetch => 'branchtransfers_tobranches',
        order_by => 'branchtransfers_tobranches.tobranch'
    }
);

$template->param(
    branchesloop => \@transfers,
    show_date    => output_pref(
        { dt => dt_from_string, dateformat => 'iso', dateonly => 1 }
    )
);

output_html_with_http_headers $input, $cookie, $template->output;

Lines 93-98 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (+3 lines)
93	<a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange"></i> Transfer</a>	93	<a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange"></i> Transfer</a>
94	</li>	94	</li>
95	[% END %]	95	[% END %]
		96	<li>
		97	<a class="circ-button" href="/cgi-bin/koha/circ/transferstosend.pl"><i class="fa fa-sign-out"></i> Transfers to send</a>
		98	</li>
96	<li>	99	<li>
97	<a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in"></i> Transfers to receive</a>	100	<a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in"></i> Transfers to receive</a>
98	</li>	101	</li>




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; 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> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; 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 ( branchesloop ) %]
        <p>Your library is the origin for the following transfer(s)</p>
        <div id="resultlist">
        [% FOREACH branchesloo IN branchesloop %]
            [% IF ( branchesloo.branchcode ) %]
            <table style="width: 100%" id="transferst[% branchesloo.branchcode | html %]">
            <caption>Sending to [% branchesloo.branchname | html %]</caption>
            <thead><tr>
                <th class="title-string">Date of request</th>
                <th class="anti-the">Title</th>
                <th>On hold for</th>
                <th>Home library</th>
                <th>Call no.</th>
                <th>&nbsp;</th>
            </tr></thead>
            <tbody>[% FOREACH transfer IN branchesloo.inbound_transfers %]
                <tr>
                    <td><p><span title="[% transfer.datesent | html %]">[% transfer.datesent | $KohaDates %]</span></p></td>
                    <td>
                        [% INCLUDE 'biblio-default-view.inc' biblionumber = transfer.item.biblionumber %][% transfer.item.biblio.title | html %] [% IF ( transfer.item.biblio.subtitles ) %] [% FOREACH subtitle IN transfer.item.biblio.subtitles %][% subtitle.subfield | html %][% END %][% END %]</a> [% 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>None</p></td>
                    <td>[% Branches.GetName( transfer.item.homebranch ) | html %]</td>
                    <td>[% transfer.item.itemcallnumber | html %]</td>
                    <td class="actions">
                        [% IF transfer.comments == 'StockrotationAdvance' %]
                        <a href="/cgi-bin/koha/catalogue/stockrotation.pl?op=toggle_in_demand&stage_id=4&item_id=[% transfer.itemnumber %]&biblionumber=[% transfer.item.biblionumber %]" class="btn btn-default btn-xs"><i class="fa fa-fire"></i> Mark "In demand"</a>
                        [% END %]
                    </td>
                </tr>
            [% END %]</tbody>
            </table>
            [% END %]
        [% END %]
        </div>
    [% ELSE %]
        <p>No transfers to send</p>
    [% END %]

                    [% IF Koha.Preference('CircSidebar') %]
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
                            <div class="col-sm-2 col-sm-pull-10">
                                <aside>
                                    [% INCLUDE 'circ-nav.inc' %]
                                </aside>
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
                        </div> <!-- /.row -->
                    [% END %]

            </main>
        </div> <!-- /.col-sm-12 -->
    </div> <!-- /.row -->

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]
    <script>
        $(document).ready(function() {
            [% FOREACH branchesloo IN branchesloop %]
            $("#transferst[% branchesloo.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' %]

Return to bug 22569

Lines 33-38 Koha::Item::Transfer - Koha Item Transfer Object class Link Here

(-)a/Koha/Item/Transfer.pm (+14 lines)
33		33
34	=cut	34	=cut
35		35
		36	=head3 item
		37
		38	my $item = Koha::Library->item;
		39
		40	Returns the associated item for this transfer.
		41
		42	=cut
		43
		44	sub item {
		45	my ( $self ) = @_;
		46	my $rs = $self->_result->itemnumber;
		47	return Koha::Item->_new_from_dbic( $rs );
		48	}
		49
36	=head3 type	50	=head3 type
37		51
38	=cut	52	=cut

Lines 50-55 sub stockrotationstages { Link Here

(-)a/Koha/Library.pm (+28 lines)
50	return Koha::StockRotationStages->_new_from_dbic( $rs );	50	return Koha::StockRotationStages->_new_from_dbic( $rs );
51	}	51	}
52		52
		53	=head3 outgoing_transfers
		54
		55	my $outgoing_transfers = Koha::Library->outgoing_transfers;
		56
		57	Returns the outgoing item transfers associated with this Library.
		58
		59	=cut
		60
		61	sub outgoing_transfers {
		62	my ( $self ) = @_;
		63	my $rs = $self->_result->branchtransfers_frombranches;
		64	return Koha::Item::Transfers->_new_from_dbic( $rs );
		65	}
		66
		67	=head3 inbound_transfers
		68
		69	my $inbound_transfers = Koha::Library->inbound_transfers;
		70
		71	Returns the inbound item transfers associated with this Library.
		72
		73	=cut
		74
		75	sub inbound_transfers {
		76	my ( $self ) = @_;
		77	my $rs = $self->_result->branchtransfers_tobranches;
		78	return Koha::Item::Transfers->_new_from_dbic( $rs );
		79	}
		80
53	=head3 get_effective_marcorgcode	81	=head3 get_effective_marcorgcode
54		82
55	my $marcorgcode = Koha::Libraries->find( $library_id )->get_effective_marcorgcode();	83	my $marcorgcode = Koha::Libraries->find( $library_id )->get_effective_marcorgcode();

Lines 224-229 sub advance { Link Here

(-)a/Koha/StockRotationItem.pm (+43 lines)
224	return $transfer->store;	224	return $transfer->store;
225	}	225	}
226		226
		227	=head3 toggle_indemand
		228
		229	$sritem->toggle_indemand;
		230
		231	Toggle this items in_demand status.
		232
		233	If the item is in the process of being advanced to the next stage then we cancel
		234	the transfer, revert the advancement and reset the 'StockrotationAdvance' counter,
		235	as though 'in_demand' had been set prior to the call to advance, by updating the
		236	in progress transfer.
		237
		238	=cut
		239
		240	sub toggle_indemand {
		241	my ( $self ) = @_;
		242
		243	# Toggle the item's indemand flag
		244	my $new_indemand = ($self->indemand == 1) ? 0 : 1;
		245
		246	# Cancel 'StockrotationAdvance' transfer if one is in progress
		247	if ($new_indemand) {
		248	my $item = $self->itemnumber;
		249	my $transfer = $item->get_transfer;
		250	if ($transfer && $transfer->comments eq 'StockrotationAdvance') {
		251	my $stage = $self->stage;
		252	my $new_stage;
		253	if ( $stage->rota->cyclical && !$stage->first_sibling ) { # First stage
		254	$new_stage = $stage->last_sibling;
		255	} else {
		256	$new_stage = $stage->previous_sibling;
		257	}
		258	$self->stage_id($new_stage->stage_id)->store; # Revert stage change
		259	$item->homebranch($new_stage->branchcode_id)->store; # Revert update homebranch
		260	$new_indemand = 0; # Reset indemand
		261	$transfer->tobranch($new_stage->branchcode_id); # Reset StockrotationAdvance
		262	$transfer->datearrived(DateTime->now); # Reset StockrotationAdvance
		263	$transfer->store;
		264	}
		265	}
		266
		267	$self->indemand($new_indemand)->store;
		268	}
		269
227	=head3 investigate	270	=head3 investigate
228		271
229	my $report = $item->investigate;	272	my $report = $item->investigate;

Lines 97-117 sub get_stages { Link Here

(-)a/Koha/Util/StockRotation.pm (-8 / +3 lines)
97		97
98	sub toggle_indemand {	98	sub toggle_indemand {
99		99
100	my ($item_id, $stage_id) = @_;	100	my ($item_id) = @_;
101		101
102	# Get the item object	102	# Get the item object
103	my $item = Koha::StockRotationItems->find(	103	my $sr_item = Koha::StockRotationItems->find(
104	{	104	{
105	itemnumber_id => $item_id,	105	itemnumber_id => $item_id,
106	stage_id => $stage_id
107	}	106	}
108	);	107	);
109		108
110	# Toggle the item's indemand flag	109	$sr_item->toggle_indemand;
111	my $new_indemand = ($item->indemand == 1) ? 0 : 1;
112
113	$item->indemand($new_indemand)->store;
114
115	}	110	}
116		111
117	=head2 move_to_next_stage	112	=head2 move_to_next_stage

Line 0 Link Here

(-)a/circ/transferstosend.pl (+67 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2019 PTFS-Europe Ltd.
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it
		8	# under the terms of the GNU General Public License as published by
		9	# the Free Software Foundation; either version 3 of the License, or
		10	# (at your option) any later version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but
		13	# WITHOUT ANY WARRANTY; without even the implied warranty of
		14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	# GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License
		18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		19
		20	use Modern::Perl;
		21	use CGI qw ( -utf8 );
		22	use C4::Context;
		23	use C4::Auth;
		24	use C4::Output;
		25
		26	use Koha::DateUtils;
		27
		28	my $input = new CGI;
		29	my $itemnumber = $input->param('itemnumber');
		30
		31	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
		32	{
		33	template_name => "circ/transferstosend.tt",
		34	query => $input,
		35	type => "intranet",
		36	authnotrequired => 0,
		37	flagsrequired => { circulate => "circulate_remaining_permissions" },
		38	debug => 1,
		39	}
		40	);
		41
		42	# set the userenv branch
		43	my $branchcode = C4::Context->userenv->{'branch'};
		44
		45	# transfers prompted by stockrotation
		46	my @transfers = Koha::Libraries->search(
		47	{
		48	'branchtransfers_tobranches.frombranch' => $branchcode,
		49	'branchtransfers_tobranches.datesent' => { '!=' => undef },
		50	'branchtransfers_tobranches.datearrived' => undef,
		51	'branchtransfers_tobranches.comments' =>
		52	[ "StockrotationAdvance", "StockrotationRepatriation" ]
		53	},
		54	{
		55	prefetch => 'branchtransfers_tobranches',
		56	order_by => 'branchtransfers_tobranches.tobranch'
		57	}
		58	);
		59
		60	$template->param(
		61	branchesloop => \@transfers,
		62	show_date => output_pref(
		63	{ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }
		64	)
65	);
66
67	output_html_with_http_headers $input, $cookie, $template->output;

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstosend.tt (-1 / +105 lines)
0	-	1	[% USE raw %]
		2	[% USE Asset %]
		3	[% USE Koha %]
		4	[% USE KohaDates %]
		5	[% USE Branches %]
		6	[% SET footerjs = 1 %]
		7	[% INCLUDE 'doc-head-open.inc' %]
		8	<title>Koha &rsaquo; Circulation &rsaquo; Transfers to send</title>
		9	[% INCLUDE 'doc-head-close.inc' %]
		10	</head>
		11
		12	<body id="circ_transferstosend" class="circ">
		13	[% INCLUDE 'header.inc' %]
		14	[% INCLUDE 'circ-search.inc' %]
		15
		16	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transfers to send</div>
		17
		18	<div class="main container-fluid">
		19	<div class="row">
		20	<div class="col-sm-12">
		21	<main>
		22	<div class="row">
		23
		24	[% IF Koha.Preference('CircSidebar') %]
		25	<div class="col-sm-10 col-sm-push-2">
		26	[% ELSE %]
		27	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
		28	[% END %]
		29
		30	<h1>Transfers requested of your library as of [% show_date \| $KohaDates %]</h1>
		31	[% IF ( branchesloop ) %]
		32	<p>Your library is the origin for the following transfer(s)</p>
		33	<div id="resultlist">
		34	[% FOREACH branchesloo IN branchesloop %]
		35	[% IF ( branchesloo.branchcode ) %]
		36	<table style="width: 100%" id="transferst[% branchesloo.branchcode \| html %]">
		37	<caption>Sending to [% branchesloo.branchname \| html %]</caption>
		38	<thead><tr>
		39	<th class="title-string">Date of request</th>
		40	<th class="anti-the">Title</th>
		41	<th>On hold for</th>
		42	<th>Home library</th>
		43	<th>Call no.</th>
		44	<th> </th>
		45	</tr></thead>
		46	<tbody>[% FOREACH transfer IN branchesloo.inbound_transfers %]
		47	<tr>
		48	<td><p><span title="[% transfer.datesent \| html %]">[% transfer.datesent \| $KohaDates %]</span></p></td>
		49	<td>
		50	[% INCLUDE 'biblio-default-view.inc' biblionumber = transfer.item.biblionumber %][% transfer.item.biblio.title \| html %] [% IF ( transfer.item.biblio.subtitles ) %] [% FOREACH subtitle IN transfer.item.biblio.subtitles %][% subtitle.subfield \| html %][% END %][% END %]</a> [% IF ( transfer.item.biblio.author ) %]by [% transfer.item.biblio.author \| html %][% END %]
		51	[% IF ( transfer.item.effective_itemtype ) %] (<b>[% transfer.item.effective_itemtype \| html %]</b>)[% END %]
		52	<br />Barcode: [% transfer.item.barcode \| html %]
		53	</td>
		54	<td><p>None</p></td>
		55	<td>[% Branches.GetName( transfer.item.homebranch ) \| html %]</td>
		56	<td>[% transfer.item.itemcallnumber \| html %]</td>
		57	<td class="actions">
		58	[% IF transfer.comments == 'StockrotationAdvance' %]
		59	<a href="/cgi-bin/koha/catalogue/stockrotation.pl?op=toggle_in_demand&stage_id=4&item_id=[% transfer.itemnumber %]&biblionumber=[% transfer.item.biblionumber %]" class="btn btn-default btn-xs"><i class="fa fa-fire"></i> Mark "In demand"</a>
		60	[% END %]
		61	</td>
		62	</tr>
		63	[% END %]</tbody>
		64	</table>
		65	[% END %]
66	[% END %]
67	</div>
68	[% ELSE %]
69	<p>No transfers to send</p>
70	[% END %]
71
72	[% IF Koha.Preference('CircSidebar') %]
73	</div> <!-- /.col-sm-10.col-sm-push-2 -->
74	<div class="col-sm-2 col-sm-pull-10">
75	<aside>
76	[% INCLUDE 'circ-nav.inc' %]
77	</aside>
78	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
79	</div> <!-- /.row -->
80	[% END %]
81
82	</main>
83	</div> <!-- /.col-sm-12 -->
84	</div> <!-- /.row -->
85
86	[% MACRO jsinclude BLOCK %]
87	[% INCLUDE 'datatables.inc' %]
88	<script>
89	$(document).ready(function() {
90	[% FOREACH branchesloo IN branchesloop %]
91	$("#transferst[% branchesloo.branchcode \| html %]").dataTable($.extend(true, {}, dataTablesDefaults, {
92	"aoColumnDefs": [
93	{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
94	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },
95	{ "sType": "title-string", "aTargets" : [ "title-string" ] }
96	],
97	"sDom": 't',
98	"bPaginate": false
99	}));
100	[% END %]
101	});
102	</script>
103	[% END %]
104
105	[% INCLUDE 'intranet-bottom.inc' %]