Attachment #152359 for bug #34010

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




                    [% END %]

                    <td class="recall-title">
                        [% INCLUDE 'biblio-title.inc' biblio=recall.biblio link=1 %]
                        [% IF recall.biblio.author %] by [% recall.biblio.author | html %][% END %]
                        [% recall.item.enumchron | html %]
                        [% IF ( recall.item ) %]<br><em>Barcode: [% recall.item.barcode | html %]</em>[% END %]
                            [% END %]
                        </a></b>
                        [% IF recall.item %][% recall.item.barcode | html %][% END %]
                        [% recall.biblio.author | html %]
                    </td>

                    [% UNLESS specific_patron %]

                            &nbsp;
                        [% ELSE %]
                            <div class="btn-group">
                                <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                    Actions <span class="caret"></span>
                                </button>
                                <ul class="dropdown-menu pull-right">
                                    [% IF ( recall.requested or recall.overdue ) %]
                                        <li><a class="cancel_recall" data-id="[% recall.id | html %]" data-action="cancel"><i class="fa fa-times"></i> Cancel</a></li>

Lines 12-22 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt (-6 / +13 lines)
12	[% INCLUDE 'cat-search.inc' %]	12	[% INCLUDE 'cat-search.inc' %]
13	[% END %]	13	[% END %]
14		14
15	<div id="breadcrumbs">	15	[% WRAPPER 'sub-header.inc' %]
16	<a href="/cgi-bin/koha/mainpage.pl">Home</a>	16	[% WRAPPER breadcrumbs %]
17	&rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>	17	[% WRAPPER breadcrumb_item %]
18	&rsaquo; <a href="/cgi-bin/koha/recalls/recalls_old_queue.pl">Old recalls</a>	18	<a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
19	</div>	19	[% END %]
		20	[% WRAPPER breadcrumb_item bc_active= 1 %]
		21	<span>Old recalls</span>
		22	[% END %]
		23	[% END #/ WRAPPER breadcrumbs %]
		24	[% END #/ WRAPPER sub-header.inc %]
20		25
21	<div class="main container-fluid">	26	<div class="main container-fluid">
22	<div class="row">	27	<div class="row">
Lines 29-35 Link Here
29		34
30	<h1>Old recalls</h1>	35	<h1>Old recalls</h1>
31	[% IF Koha.Preference('UseRecalls') %]	36	[% IF Koha.Preference('UseRecalls') %]
32	[% INCLUDE 'recalls.inc' %]	37	<div class="page-section">
		38	[% INCLUDE 'recalls.inc' %]
		39	</div> <!-- /.page-section -->
33	[% ELSE %]	40	[% ELSE %]
34	<div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>	41	<div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
35	[% END %]	42	[% END %]




    [% INCLUDE 'cat-search.inc' %]
[% END %]

[% WRAPPER 'sub-header.inc' %]
    [% WRAPPER breadcrumbs %]
        [% WRAPPER breadcrumb_item %]
            <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
        [% END %]
        [% WRAPPER breadcrumb_item bc_active= 1 %]
            <span>Overdue recalls</span>
        [% END %]
    [% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]

<div class="main container-fluid">
    <div class="row">

        <h1>Overdue recalls</h1>
        [% IF Koha.Preference('UseRecalls') %]
            [% IF recalls.count %]
                <div class="page-section">
                    <form method="post" action="/cgi-bin/koha/recalls/recalls_overdue.pl">
                        <input type="hidden" name="op" value="cancel_multiple_recalls">
                        <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
                        [% INCLUDE 'recalls.inc' %]
                        <fieldset class="action">
                            <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
                        </fieldset>
                    </form>
                </div> <!-- /.page-section -->
            [% ELSE %]
                <div class="dialog message">There are no recalls to show.</div>
            [% END %]




    [% INCLUDE 'cat-search.inc' %]
[% END %]

[% WRAPPER 'sub-header.inc' %]
    [% WRAPPER breadcrumbs %]
        [% WRAPPER breadcrumb_item %]
            <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
        [% END %]
        [% WRAPPER breadcrumb_item bc_active= 1 %]
            <span>Recalls queue</span>
        [% END %]
    [% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]

<div class="main container-fluid">
    <div class="row">

        <h1>Recalls queue</h1>
        [% IF Koha.Preference('UseRecalls') %]
            [% IF recalls.count %]
                <div class="page-section">
                    <form method="post" action="/cgi-bin/koha/recalls/recalls_queue.pl">
                        <input type="hidden" name="op" value="cancel_multiple_recalls">
                        <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
                        [% INCLUDE 'recalls.inc' %]
                        <fieldset class="action">
                            <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
                        </fieldset>
                    </form>
                </div> <!-- /.page-section -->
            [% ELSE %]
                <div class="dialog message">There are no recalls to show.</div>
            [% END %]




    [% INCLUDE 'cat-search.inc' %]
[% END %]

[% WRAPPER 'sub-header.inc' %]
    [% WRAPPER breadcrumbs %]
        [% WRAPPER breadcrumb_item %]
            <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
        [% END %]
        [% WRAPPER breadcrumb_item bc_active= 1 %]
            <span>Recalls to pull</span>
        [% END %]
    [% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]

<div class="main container-fluid">
    <div class="row">

        The following recalls could be fulfilled by available items.

        [% IF Koha.Preference('UseRecalls') %]
            [% IF recalls %]
                <div id="recalls" class="page-section">
                    <table id="recalls-table">
                        <thead>
                            <tr>
                                <th class="recall-topull">Pull this many items</th>
                                <th class="recall-items">Items available</th>
                                <th class="recall-patrons">Patrons with recalls</th>
                                <th class="recall-firstpatron">First patron</th>
                                <th class="recall-title anti-the">Title</th>
                                <th class="recall-libraries">Libraries</th>
                                <th class="recall-callnumbers">Available call numbers</th>
                                <th class="recall-copynumbers">Available copy numbers</th>
                                <th class="recall-enumeration">Available enumeration</th>
                                <th class="recall-itemtypes">Available item types</th>
                                <th class="recall-locations">Available locations</th>
                                <th class="recall-date title-string">Earliest recall date</th>
                                <th class="recall-action nosort">&nbsp;</th>
                            </tr>
                        </thead>
                        <tbody>
                            [% FOREACH recall IN recalls %]
                            <tr>
                                <td class="recall-topull"><b>[% recall.pull_count | html %]</b></td>
                                <td class="recall-items">[% recall.items_count | html %]</td>
                                <td class="recall-patrons">[% recall.patrons_count | html %]</td>
                                <td class="recall-firstpatron"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.first_recall.patron_id | uri %]">[% recall.first_recall.patron.firstname | html %] [% recall.first_recall.patron.surname | html %]</a></td>
                                <td class="recall-title">
                                    [% INCLUDE 'biblio-title.inc' biblio=recall.first_recall.biblio link=1 %]
                                    [% IF recall.biblio.author %] by [% recall.biblio.author | html %][% END %]
                                    [% recall.item.enumchron | html %]
                                    [% IF ( recall.item ) %]<br><em>Barcode: [% recall.item.barcode | html %]</em>[% END %]
                                </td>
                                <td class="recall-libraries">
                                    <ul>
                                        [% FOREACH library IN recall.libraries %]
                                            <li>[% Branches.GetName( library ) | html %]</li>
                                        [% END %]
                                    </ul>
                                </td>
                                <td class="recall-callnumbers">
                                    <ul>
                                        [% FOREACH callnumber IN recall.callnumbers %]
                                            <li>[% callnumber | html %]</li>
                                        [% END %]
                                    </ul>
                                </td>
                                <td class="recall-copynumbers">
                                    <ul>
                                        [% FOREACH copyno IN recall.copynumbers %]
                                            <li>[% copyno | html %]</li>
                                        [% END %]
                                    </ul>
                                </td>
                                <td class="recall-enumeration">
                                    <ul>
                                        [% FOREACH enumchron IN recall.enumchrons %]
                                            <li>[% enumchron | html %]</li>
                                        [% END %]
                                    </ul>
                                </td>
                                <td class="recall-itemtypes">
                                    <ul>
                                        [% FOREACH itemtype IN recall.itemtypes %]
                                            <li>[% ItemTypes.GetDescription( itemtype ) | html %]</li>
                                        [% END %]
                                    </ul>
                                </td>
                                <td class="recall-locations">
                                    <ul>
                                        [% FOREACH loc IN recall.locations %]
                                            <li>[% AuthorisedValues.GetByCode('LOC', loc) | html %]</li>
                                        [% END %]
                                    </ul>
                                </td>
                                <td class="recall-date">
                                    <span title="[% recall.first_recall.created_date | html %]">[% recall.first_recall.created_date | $KohaDates %] in [% recall.first_recall.library.branchname | html %]</span>
                                </td>
                                <td class="recall-action">
                                    <form action="/cgi-bin/koha/recalls/recalls_to_pull.pl" method="post">
                                        <input type="hidden" name="recall_id" value="[% recall.first_recall.id | html %]">
                                        <input type="hidden" name="op" value="cancel">
                                        [% IF recall.first_recall.in_transit %]
                                            <button type="submit" class="btn btn-default btn-sm cancelreturn"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.first_recall.item.homebranch) | html %]</button>
                                        [% ELSE %]
                                            <button type="submit" class="btn btn-default btn-sm cancel"><i class="fa fa-times"></i> Cancel recall</button>
                                        [% END %]
                                    </form>
                                </td>
                            </tr>
                            [% END %]
                        </tbody>
                    </table>
                </div> <!-- /#recalls.page-section -->
            [% ELSE %]
                <div class="dialog message">There are no recalls to pull.</div>
            [% END %]
        [% ELSE %]
            <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
        [% END %]

Lines 12-22 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt (-18 / +18 lines)
12	[% INCLUDE 'cat-search.inc' %]	12	[% INCLUDE 'cat-search.inc' %]
13	[% END %]	13	[% END %]
14		14
15	<div id="breadcrumbs">	15	[% WRAPPER 'sub-header.inc' %]
16	<a href="/cgi-bin/koha/mainpage.pl">Home</a>	16	[% WRAPPER breadcrumbs %]
17	&rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>	17	[% WRAPPER breadcrumb_item %]
18	&rsaquo; <a href="/cgi-bin/koha/recalls/recalls_waiting.pl">Recalls awaiting pickup</a>	18	<a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
19	</div>	19	[% END %]
		20	[% WRAPPER breadcrumb_item bc_active= 1 %]
		21	<span>Recalls awaiting pickup</span>
		22	[% END %]
		23	[% END #/ WRAPPER breadcrumbs %]
		24	[% END #/ WRAPPER sub-header.inc %]
20		25
21	<div class="main container-fluid">	26	<div class="main container-fluid">
22	<div class="row">	27	<div class="row">
Lines 76-83 Link Here
76	<input type="hidden" name="recall_id" value="[% recall.id \| html %]">	81	<input type="hidden" name="recall_id" value="[% recall.id \| html %]">
77	<input type="hidden" name="op" value="modify">	82	<input type="hidden" name="op" value="modify">
78	<fieldset class="action">	83	<fieldset class="action">
79	<input type="submit" name="revert" class="revert_recall" value="Revert waiting status">	84	<button type="submit" name="revert" value="revert" class="btn btn-default btn-sm revert_recall"><i class="fa fa-undo"></i> Revert waiting status</button>
80	<input type="submit" name="expire" class="expire_recall" value="Expire recall">	85	<button type="submit" name="expire" value="expire" class="btn btn-default btn-sm expire_recall"><i class="fa fa-undo"></i> Expire recall</button>
81	</fieldset>	86	</fieldset>
82	</form>	87	</form>
83	</td>	88	</td>
Lines 104-118 Link Here
104	[% FOREACH recall IN over %]<tr>	109	[% FOREACH recall IN over %]<tr>
105	<td class="recall-waitingdate">[% recall.waiting_date \| $KohaDates %]</td>	110	<td class="recall-waitingdate">[% recall.waiting_date \| $KohaDates %]</td>
106	<td class="recall-title">	111	<td class="recall-title">
107	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblio_id \| uri %]">	112	[% INCLUDE 'biblio-title.inc' biblio=recall.biblio link = 1 %]
108	[% recall.biblio.title \| html %]	113	[% IF recall.biblio.author %] by [% recall.biblio.author \| html %][% END %]
109	[% FOREACH s IN recall.biblio.subtitles %]	114	[% recall.item.enumchron \| html %]
110	[% s \| html %]	115	[% IF ( recall.item.barcode ) %]<br><em>Barcode: [% recall.item.barcode \| html %]</em>[% END %]
111	[% END %]
112	[% recall.item.enumchron \| html %]
113	</a>
114	[% recall.biblio.author \| html %]
115	<br><i>Barcode: [% recall.item.barcode \| html %]</i>
116	</td>	116	</td>
117	<td class="recall-patron">	117	<td class="recall-patron">
118	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.patron_id \| uri %]">[% recall.patron.firstname \| html %] [% recall.patron.surname \| html %]</a>	118	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.patron_id \| uri %]">[% recall.patron.firstname \| html %] [% recall.patron.surname \| html %]</a>
Lines 125-132 Link Here
125	<input type="hidden" name="recall_id" value="[% recall.id \| html %]">	125	<input type="hidden" name="recall_id" value="[% recall.id \| html %]">
126	<input type="hidden" name="op" value="modify">	126	<input type="hidden" name="op" value="modify">
127	<fieldset class="action">	127	<fieldset class="action">
128	<input type="submit" name="revert" class="revert_recall" value="Revert waiting status">	128	<button type="submit" name="revert" value="revert" class="btn btn-default btn-sm revert_recall"><i class="fa fa-undo"></i> Revert waiting status</button>
129	<input type="submit" name="expire" class="expire_recall" value="Expire recall">	129	<button type="submit" name="expire" value="expire" class="btn btn-default btn-sm expire_recall"><i class="fa fa-undo"></i> Expire recall</button>
130	</fieldset>	130	</fieldset>
131	</form>	131	</form>
132	</td>	132	</td>




[% USE KohaDates %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Existing recalls &rsaquo; Recalls &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="recalls-request" class="catalog">

    [% INCLUDE 'circ-search.inc' %]
[% END %]

[% WRAPPER 'sub-header.inc' %]
    [% WRAPPER breadcrumbs %]
        [% WRAPPER breadcrumb_item %]
            <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
        [% END %]
        [% WRAPPER breadcrumb_item %]
            [% INCLUDE 'biblio-title.inc' link = 1 %]
        [% END %]
        [% WRAPPER breadcrumb_item bc_active= 1 %]
            <span>Existing recalls</span>
        [% END %]
    [% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]

<div class="main container-fluid">
<div class="row">


    [% IF Koha.Preference('UseRecalls') %]
        [% IF recalls.count %]
            <div class="page-section">
                <form method="post" action="/cgi-bin/koha/recalls/request.pl">
                    <input type="hidden" name="op" value="cancel_multiple_recalls">
                    <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]">
                    <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
                    [% INCLUDE 'recalls.inc' %]
                    <fieldset class="action">
                        <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
                    </fieldset>
                </form>
            </div> <!-- /.page-section -->
        [% ELSE %]
            <div class="dialog message">No recalls have been made.</div>
        [% END %]
- 

Return to bug 34010

Lines 31-44 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc (-9 / +7 lines)
31	[% END %]	31	[% END %]
32		32
33	<td class="recall-title">	33	<td class="recall-title">
34	<b><a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblio_id \| html %]">	34	[% INCLUDE 'biblio-title.inc' biblio=recall.biblio link=1 %]
35	[% recall.biblio.title \| html %]	35	[% IF recall.biblio.author %] by [% recall.biblio.author \| html %][% END %]
36	[% FOREACH s IN recall.biblio.subtitle %]	36	[% recall.item.enumchron \| html %]
37	[% s \| html %]	37	[% IF ( recall.item ) %]<br><em>Barcode: [% recall.item.barcode \| html %]</em>[% END %]
38	[% END %]
39	</a></b>
40	[% IF recall.item %][% recall.item.barcode \| html %][% END %]
41	[% recall.biblio.author \| html %]
42	</td>	38	</td>
43		39
44	[% UNLESS specific_patron %]	40	[% UNLESS specific_patron %]
Lines 101-107 Link Here
101		97
102	[% ELSE %]	98	[% ELSE %]
103	<div class="btn-group">	99	<div class="btn-group">
104	<a class="btn btn-sm dropdown-toggle" data-toggle="dropdown" href="#"> Actions <span class="caret"></span></a>	100	<button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
		101	Actions <span class="caret"></span>
		102	</button>
105	<ul class="dropdown-menu pull-right">	103	<ul class="dropdown-menu pull-right">
106	[% IF ( recall.requested or recall.overdue ) %]	104	[% IF ( recall.requested or recall.overdue ) %]
107	<li><a class="cancel_recall" data-id="[% recall.id \| html %]" data-action="cancel"><i class="fa fa-times"></i> Cancel</a></li>	105	<li><a class="cancel_recall" data-id="[% recall.id \| html %]" data-action="cancel"><i class="fa fa-times"></i> Cancel</a></li>

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt (-17 / +25 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
6	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Confirm recalls &rsaquo; Recalls &rsaquo; Koha</title>	7	<title>Existing recalls &rsaquo; Recalls &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
9	</head>	9	</head>
10	<body id="recalls-request" class="catalog">	10	<body id="recalls-request" class="catalog">
Lines 12-23 Link Here
12	[% INCLUDE 'circ-search.inc' %]	12	[% INCLUDE 'circ-search.inc' %]
13	[% END %]	13	[% END %]
14		14
15	<div id="breadcrumbs">	15	[% WRAPPER 'sub-header.inc' %]
16	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;	16	[% WRAPPER breadcrumbs %]
17	<a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo;	17	[% WRAPPER breadcrumb_item %]
18	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber \| uri %]">[% biblio.title \| html %]</a> &rsaquo;	18	<a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
19	Confirm recalls on [% biblio.title \| html %]	19	[% END %]
20	</div>	20	[% WRAPPER breadcrumb_item %]
		21	[% INCLUDE 'biblio-title.inc' link = 1 %]
		22	[% END %]
		23	[% WRAPPER breadcrumb_item bc_active= 1 %]
		24	<span>Existing recalls</span>
		25	[% END %]
		26	[% END #/ WRAPPER breadcrumbs %]
		27	[% END #/ WRAPPER sub-header.inc %]
21		28
22	<div class="main container-fluid">	29	<div class="main container-fluid">
23	<div class="row">	30	<div class="row">
Lines 28-42 Link Here
28		35
29	[% IF Koha.Preference('UseRecalls') %]	36	[% IF Koha.Preference('UseRecalls') %]
30	[% IF recalls.count %]	37	[% IF recalls.count %]
31	<form method="post" action="/cgi-bin/koha/recalls/request.pl">	38	<div class="page-section">
32	<input type="hidden" name="op" value="cancel_multiple_recalls">	39	<form method="post" action="/cgi-bin/koha/recalls/request.pl">
33	<input type="hidden" name="biblionumber" value="[% biblio.biblionumber \| html %]">	40	<input type="hidden" name="op" value="cancel_multiple_recalls">
34	<input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>	41	<input type="hidden" name="biblionumber" value="[% biblio.biblionumber \| html %]">
35	[% INCLUDE 'recalls.inc' %]	42	<input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
36	<fieldset class="action">	43	[% INCLUDE 'recalls.inc' %]
37	<button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>	44	<fieldset class="action">
38	</fieldset>	45	<button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
39	</form>	46	</fieldset>
		47	</form>
		48	</div> <!-- /.page-section -->
40	[% ELSE %]	49	[% ELSE %]
41	<div class="dialog message">No recalls have been made.</div>	50	<div class="dialog message">No recalls have been made.</div>
42	[% END %]	51	[% END %]
43	-