Attachment #78526 for bug #19469

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

Lines 1-3 Link Here

(-)a/installer/data/mysql/atomicupdate/split_holds_queue.sql (-3 lines)
1	INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
2	('HoldsSplitQueue','nothing','nothing\|branch\|itemtype\|branch_itemtype','In the staff client, split the holds view by the given criteria','Choice'),
3	('HoldsSplitQueueNumbering', 'actual', 'actual\|virtual', 'If the holds queue is split, decide if the acual priorities should be displayed', 'Choice');




        <th>Pickup library</th>
        <th>Details</th>
        [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
            <th><img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Toggle set to lowest priority" /></th>
        [% END %]
        <th>&nbsp;</th>
        [% IF SuspendHoldsIntranet %]<th>&nbsp;</th><!-- Suspend Holds Column Header -->[% END %]

    [% FOREACH hold IN holds %]
        <tr>
            <td>
                <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
                <input type="hidden" name="borrowernumber" value="[% hold.borrowernumber | html %]" />
                <input type="hidden" name="biblionumber" value="[% hold.biblionumber | html %]" />
                <select name="rank-request">
                    [% IF ( hold.found ) %]
                        [% IF ( hold.intransit ) %]

                        [% IF Koha.Preference('HoldsSplitQueueNumbering') == 'actual' %]
                            [% FOREACH optionloo IN hold.optionloop %]
                                [% IF ( optionloo.selected ) %]
                                    <option value="[% optionloo.num | html %]" selected="selected">[% optionloo.num | html %]</option>
                                [% ELSE %]
                                    <option value="[% optionloo.num | html %]">[% optionloo.num | html %]</option>
                                [% END %]
                            [% END %]
                        [% ELSE %]
                            [% FOREACH h IN holds %]
                                [% IF ( h.priority == hold.priority ) %]
                                    <option value="[% h.priority | html %]" selected="selected">[% loop.index + 1 | html %]</option>
                                [% ELSE %]
                                    <option value="[% h.priority | html %]">[% loop.index + 1 | html %]</option>
                                [% END %]
                            [% END %]
                        [% END %]
                    [% ELSIF !hold.found %]
                        <option value="[% hold.priority | html %]" selected="selected">[% hold.priority | html %]</option>
                    [% END %]

                    <option value="del">del</option>

                [% SET last_priority  = holds.last.priority %]
                [% SET prev_priority  = loop.prev.priority %]
                [% SET next_priority  = loop.next.priority %]
                [% holds.index | html %]

                <td style="white-space:nowrap;">
                    <a title="Move hold up" href="request.pl?action=move&amp;where=up&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
                        <img src="[% interface | html %]/[% theme | html %]/img/go-up.png" alt="Go up" />
                    </a>

                    <a title="Move hold to top" href="request.pl?action=move&amp;where=top&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
                        <img src="[% interface | html %]/[% theme | html %]/img/go-top.png" alt="Go top" />
                    </a>

                    <a title="Move hold to bottom" href="request.pl?action=move&amp;where=bottom&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
                        <img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Go bottom" />
                    </a>

                    <a title="Move hold down" href="request.pl?action=move&amp;where=down&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
                        <img src="[% interface | html %]/[% theme | html %]/img/go-down.png" alt="Go down" />
                    </a>
                </td>
            [% END %]

                [% INCLUDE 'patron-title.inc' patron=hold.patron hide_patron_infos_if_needed=1 %]
            </td>

            <td>[% hold.notes | html %]</td>
            <td>[% hold.date | html %]</td>
            <td>[% hold.expirationdate | html %]</td>

            <td>
                [% IF ( hold.found ) %]
                    [% IF ( hold.atdestination ) %]
                        [% IF ( hold.found ) %]
                            Item waiting at <b> [% hold.wbrname | html %]</b> <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" /> since [% hold.waiting_date | $KohaDates %]
                        [% ELSE %]
                            Waiting to be pulled <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" />
                        [% END %]
                    [% ELSE %]
                        Item being transferred to <b> [% hold.wbrname | html %]</b> <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" />
                    [% END %]
                [% ELSE %]
                    [% IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 %]
                        [% Branches.GetName(hold.branchcode) | html %] <input type="hidden" name="pickup" value="[% hold.branchcode | html %]" />
                    [% ELSE %]
                        <select name="pickup">
                            [% PROCESS options_for_libraries libraries => Branches.all( selected => hold.branchcode ) %]


            <td>
                [% IF ( hold.found ) %]
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | html %]">
                        [% IF ( hold.barcodenumber ) %]
                            [% hold.barcodenumber | html %]
                            <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
                        [% ELSE %]
                            No barcode
                        [% END %]

                    [% IF ( hold.item_level_hold ) %]
                        <i>
                            Only item
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | html %]">
                                [% IF ( hold.barcodenumber ) %]
                                    [% hold.barcodenumber | html %]
                                    <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
                                [% ELSE %]
                                    No barcode
                                [% END %]

                        </i>
                    [% ELSE %]
                        [% IF hold.itemtype %]
                            <i>Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item</i>
                        [% ELSE %]
                            <i>Next available</i>
                        [% END %]


            [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
                <td>
                    <a title="Toggle lowest priority" href="request.pl?action=setLowestPriority&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
                        [% IF ( hold.lowestPriority ) %]
                            <img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Unset lowest priority" />
                        [% ELSE %]
                            <img src="[% interface | html %]/[% theme | html %]/img/go-down.png" alt="Set to lowest priority" />
                        [% END %]
                    </a>
                </td>
            [% END %]

            <td>
                <a class="cancel-hold" title="Cancel hold" href="request.pl?action=cancel&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
                    <img src="[% interface | html %]/[% theme | html %]/img/x.png" alt="Cancel" />
                </a>
            </td>

            [% IF SuspendHoldsIntranet %]
                <td>
                    [% UNLESS ( hold.found ) %]
                        <input type="button" value="[% IF ( hold.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&amp;reserve_id=[% hold.reserve_id | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;date=[% hold.date | html %]&amp;suspend_until=' + $('#suspend_until_[% hold.reserve_id | html %]').val()" />

                        [% IF AutoResumeSuspendedHolds %]
                            <label for="suspend_until_[% hold.reserve_id | html %]">[% IF ( hold.suspend ) %] on [% ELSE %] until [% END %]</label>
                            <input name="suspend_until" id="suspend_until_[% hold.reserve_id | html %]" size="10" value="[% hold.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" />
                            <a href='#' onclick="document.getElementById('suspend_until_[% hold.reserve_id | html %]').value='';">Clear date</a>
                        [% ELSE %]
                            <input type="hidden" name="suspend_until" id="suspend_until_[% hold.reserve_id | html %]" value=""/>
                        [% END %]

                    [% ELSE %]





[% UNLESS ( patron ) %]
    [% IF ( reserveloop ) %]
        <form name="T[% time | html %]" action="modrequest.pl" method="post">
            [% IF ( multi_hold ) %]
                <input type = "hidden" name="multi_hold" value="1"/>
                <input type = "hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
            [% END %]

            <fieldset class="rows left">

                    [% IF ( biblioloo.reserveloop ) %]
                        [% IF ( multi_hold ) %]
                            <h3>
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]">
                                    [% biblioloo.title | html %]
                                </a>
                            </h3>

                            [% SET branchcodes = [] %]

                            [% FOREACH h IN biblioloo.reserveloop %]
                                [% branchcodes.push( h.branchcode ) | $raw %]
                            [% END %]
                            [% branchcodes = branchcodes.unique %]


                                [% SET holds_by_branch = [] %]
                                [% FOREACH h IN biblioloo.reserveloop %]
                                    [% IF h.branchcode == b %]
                                        [% holds_by_branch.push( h ) | $raw %]
                                    [% END %]
                                [% END %]
                                <fieldset>
                                    <legend>[% Branches.GetName( b ) | html %]</legend>
                                    [% INCLUDE holds_table.inc holds=holds_by_branch %]
                                </fieldset>
                            [% END %]


                            [% FOREACH h IN biblioloo.reserveloop %]
                                [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
                                [% itemtypes.push( hold_itemtype ) | $raw %]
                            [% END %]
                            [% itemtypes = itemtypes.unique %]


                                [% FOREACH h IN biblioloo.reserveloop %]
                                    [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
                                    [% IF hold_itemtype == i %]
                                        [% holds_by_itemtype.push( h ) | $raw %]
                                    [% END %]
                                [% END %]

                                <fieldset>
                                    [% IF i %]
                                        <legend>[% ItemTypes.GetDescription( i ) | html %]</legend>
                                    [% ELSE %]
                                        <legend>Any item type</legend>
                                    [% END %]

                            [% SET branchcodes = [] %]

                            [% FOREACH h IN biblioloo.reserveloop %]
                                [% branchcodes.push( h.branchcode ) | $raw %]
                            [% END %]
                            [% branchcodes = branchcodes.unique %]

                            [% FOREACH b IN branchcodes.sort %]
                                <fieldset class="contrast">
                                    <legend>[% Branches.GetName( b ) | html %]</legend>
                                    [% SET holds_by_branch = [] %]
                                    [% FOREACH h IN biblioloo.reserveloop %]
                                        [% IF h.branchcode == b %]
                                            [% holds_by_branch.push( h ) | $raw %]
                                        [% END %]
                                    [% END %]

                                    [% SET itemtypes = [] %]
                                    [% FOREACH h IN holds_by_branch %]
                                        [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
                                        [% itemtypes.push( hold_itemtype ) | $raw %]
                                    [% END %]
                                    [% itemtypes = itemtypes.unique %]

                                    [% FOREACH i IN itemtypes.sort %]
                                        <fieldset class="standard">
                                            [% IF i %]
                                                <legend>[% ItemTypes.GetDescription( i ) | html %]</legend>
                                            [% ELSE %]
                                                <legend>Any item type</legend>
                                            [% END %]

                                            [% FOREACH h IN holds_by_branch %]
                                                [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
                                                [% IF hold_itemtype == i %]
                                                    [% holds_by_itemtype.push( h ) | $raw %]
                                                [% END %]
                                            [% END %]
                                            [% INCLUDE holds_table.inc holds=holds_by_itemtype %]
- 

Return to bug 19469

Lines 13-19 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-42 / +42 lines)
13	<th>Pickup library</th>	13	<th>Pickup library</th>
14	<th>Details</th>	14	<th>Details</th>
15	[% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]	15	[% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
16	<th><img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Toggle set to lowest priority" /></th>	16	<th><img src="[% interface \| html %]/[% theme \| html %]/img/go-bottom.png" alt="Toggle set to lowest priority" /></th>
17	[% END %]	17	[% END %]
18	<th> </th>	18	<th> </th>
19	[% IF SuspendHoldsIntranet %]<th> </th><!-- Suspend Holds Column Header -->[% END %]	19	[% IF SuspendHoldsIntranet %]<th> </th><!-- Suspend Holds Column Header -->[% END %]
Lines 22-30 Link Here
22	[% FOREACH hold IN holds %]	22	[% FOREACH hold IN holds %]
23	<tr>	23	<tr>
24	<td>	24	<td>
25	<input type="hidden" name="reserve_id" value="[% hold.reserve_id %]" />	25	<input type="hidden" name="reserve_id" value="[% hold.reserve_id \| html %]" />
26	<input type="hidden" name="borrowernumber" value="[% hold.borrowernumber %]" />	26	<input type="hidden" name="borrowernumber" value="[% hold.borrowernumber \| html %]" />
27	<input type="hidden" name="biblionumber" value="[% hold.biblionumber %]" />	27	<input type="hidden" name="biblionumber" value="[% hold.biblionumber \| html %]" />
28	<select name="rank-request">	28	<select name="rank-request">
29	[% IF ( hold.found ) %]	29	[% IF ( hold.found ) %]
30	[% IF ( hold.intransit ) %]	30	[% IF ( hold.intransit ) %]
Lines 38-59 Link Here
38	[% IF Koha.Preference('HoldsSplitQueueNumbering') == 'actual' %]	38	[% IF Koha.Preference('HoldsSplitQueueNumbering') == 'actual' %]
39	[% FOREACH optionloo IN hold.optionloop %]	39	[% FOREACH optionloo IN hold.optionloop %]
40	[% IF ( optionloo.selected ) %]	40	[% IF ( optionloo.selected ) %]
41	<option value="[% optionloo.num %]" selected="selected">[% optionloo.num %]</option>	41	<option value="[% optionloo.num \| html %]" selected="selected">[% optionloo.num \| html %]</option>
42	[% ELSE %]	42	[% ELSE %]
43	<option value="[% optionloo.num %]">[% optionloo.num %]</option>	43	<option value="[% optionloo.num \| html %]">[% optionloo.num \| html %]</option>
44	[% END %]	44	[% END %]
45	[% END %]	45	[% END %]
46	[% ELSE %]	46	[% ELSE %]
47	[% FOREACH h IN holds %]	47	[% FOREACH h IN holds %]
48	[% IF ( h.priority == hold.priority ) %]	48	[% IF ( h.priority == hold.priority ) %]
49	<option value="[% h.priority %]" selected="selected">[% loop.index + 1 %]</option>	49	<option value="[% h.priority \| html %]" selected="selected">[% loop.index + 1 \| html %]</option>
50	[% ELSE %]	50	[% ELSE %]
51	<option value="[% h.priority %]">[% loop.index + 1 %]</option>	51	<option value="[% h.priority \| html %]">[% loop.index + 1 \| html %]</option>
52	[% END %]	52	[% END %]
53	[% END %]	53	[% END %]
54	[% END %]	54	[% END %]
55	[% ELSIF !hold.found %]	55	[% ELSIF !hold.found %]
56	<option value="[% hold.priority %]" selected="selected">[% hold.priority %]</option>	56	<option value="[% hold.priority \| html %]" selected="selected">[% hold.priority \| html %]</option>
57	[% END %]	57	[% END %]
58		58
59	<option value="del">del</option>	59	<option value="del">del</option>
Lines 65-87 Link Here
65	[% SET last_priority = holds.last.priority %]	65	[% SET last_priority = holds.last.priority %]
66	[% SET prev_priority = loop.prev.priority %]	66	[% SET prev_priority = loop.prev.priority %]
67	[% SET next_priority = loop.next.priority %]	67	[% SET next_priority = loop.next.priority %]
68	[% holds.index %]	68	[% holds.index \| html %]
69		69
70	<td style="white-space:nowrap;">	70	<td style="white-space:nowrap;">
71	<a title="Move hold up" href="request.pl?action=move&where=up&first_priority=[% first_priority %]&last_priority=[% last_priority %]&prev_priority=[% prev_priority %]&next_priority=[% next_priority %]&borrowernumber=[% hold.borrowernumber %]&biblionumber=[% hold.biblionumber %]&reserve_id=[% hold.reserve_id %]&date=[% hold.date %]">	71	<a title="Move hold up" href="request.pl?action=move&where=up&first_priority=[% first_priority \| html %]&last_priority=[% last_priority \| html %]&prev_priority=[% prev_priority \| html %]&next_priority=[% next_priority \| html %]&borrowernumber=[% hold.borrowernumber \| html %]&biblionumber=[% hold.biblionumber \| html %]&reserve_id=[% hold.reserve_id \| html %]&date=[% hold.date \| html %]">
72	<img src="[% interface %]/[% theme %]/img/go-up.png" alt="Go up" />	72	<img src="[% interface \| html %]/[% theme \| html %]/img/go-up.png" alt="Go up" />
73	</a>	73	</a>
74		74
75	<a title="Move hold to top" href="request.pl?action=move&where=top&first_priority=[% first_priority %]&last_priority=[% last_priority %]&prev_priority=[% prev_priority %]&next_priority=[% next_priority %]&borrowernumber=[% hold.borrowernumber %]&biblionumber=[% hold.biblionumber %]&reserve_id=[% hold.reserve_id %]&date=[% hold.date %]">	75	<a title="Move hold to top" href="request.pl?action=move&where=top&first_priority=[% first_priority \| html %]&last_priority=[% last_priority \| html %]&prev_priority=[% prev_priority \| html %]&next_priority=[% next_priority \| html %]&borrowernumber=[% hold.borrowernumber \| html %]&biblionumber=[% hold.biblionumber \| html %]&reserve_id=[% hold.reserve_id \| html %]&date=[% hold.date \| html %]">
76	<img src="[% interface %]/[% theme %]/img/go-top.png" alt="Go top" />	76	<img src="[% interface \| html %]/[% theme \| html %]/img/go-top.png" alt="Go top" />
77	</a>	77	</a>
78		78
79	<a title="Move hold to bottom" href="request.pl?action=move&where=bottom&first_priority=[% first_priority %]&last_priority=[% last_priority %]&prev_priority=[% prev_priority %]&next_priority=[% next_priority %]&borrowernumber=[% hold.borrowernumber %]&biblionumber=[% hold.biblionumber %]&reserve_id=[% hold.reserve_id %]&date=[% hold.date %]">	79	<a title="Move hold to bottom" href="request.pl?action=move&where=bottom&first_priority=[% first_priority \| html %]&last_priority=[% last_priority \| html %]&prev_priority=[% prev_priority \| html %]&next_priority=[% next_priority \| html %]&borrowernumber=[% hold.borrowernumber \| html %]&biblionumber=[% hold.biblionumber \| html %]&reserve_id=[% hold.reserve_id \| html %]&date=[% hold.date \| html %]">
80	<img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Go bottom" />	80	<img src="[% interface \| html %]/[% theme \| html %]/img/go-bottom.png" alt="Go bottom" />
81	</a>	81	</a>
82		82
83	<a title="Move hold down" href="request.pl?action=move&where=down&first_priority=[% first_priority %]&last_priority=[% last_priority %]&prev_priority=[% prev_priority %]&next_priority=[% next_priority %]&borrowernumber=[% hold.borrowernumber %]&biblionumber=[% hold.biblionumber %]&reserve_id=[% hold.reserve_id %]&date=[% hold.date %]">	83	<a title="Move hold down" href="request.pl?action=move&where=down&first_priority=[% first_priority \| html %]&last_priority=[% last_priority \| html %]&prev_priority=[% prev_priority \| html %]&next_priority=[% next_priority \| html %]&borrowernumber=[% hold.borrowernumber \| html %]&biblionumber=[% hold.biblionumber \| html %]&reserve_id=[% hold.reserve_id \| html %]&date=[% hold.date \| html %]">
84	<img src="[% interface %]/[% theme %]/img/go-down.png" alt="Go down" />	84	<img src="[% interface \| html %]/[% theme \| html %]/img/go-down.png" alt="Go down" />
85	</a>	85	</a>
86	</td>	86	</td>
87	[% END %]	87	[% END %]
Lines 90-113 Link Here
90	[% INCLUDE 'patron-title.inc' patron=hold.patron hide_patron_infos_if_needed=1 %]	90	[% INCLUDE 'patron-title.inc' patron=hold.patron hide_patron_infos_if_needed=1 %]
91	</td>	91	</td>
92		92
93	<td>[% hold.notes %]</td>	93	<td>[% hold.notes \| html %]</td>
94	<td>[% hold.date %]</td>	94	<td>[% hold.date \| html %]</td>
95	<td>[% hold.expirationdate %]</td>	95	<td>[% hold.expirationdate \| html %]</td>
96		96
97	<td>	97	<td>
98	[% IF ( hold.found ) %]	98	[% IF ( hold.found ) %]
99	[% IF ( hold.atdestination ) %]	99	[% IF ( hold.atdestination ) %]
100	[% IF ( hold.found ) %]	100	[% IF ( hold.found ) %]
101	Item waiting at <b> [% hold.wbrname %]</b> <input type="hidden" name="pickup" value="[% hold.wbrcode %]" /> since [% hold.waiting_date \| $KohaDates %]	101	Item waiting at <b> [% hold.wbrname \| html %]</b> <input type="hidden" name="pickup" value="[% hold.wbrcode \| html %]" /> since [% hold.waiting_date \| $KohaDates %]
102	[% ELSE %]	102	[% ELSE %]
103	Waiting to be pulled <input type="hidden" name="pickup" value="[% hold.wbrcode %]" />	103	Waiting to be pulled <input type="hidden" name="pickup" value="[% hold.wbrcode \| html %]" />
104	[% END %]	104	[% END %]
105	[% ELSE %]	105	[% ELSE %]
106	Item being transferred to <b> [% hold.wbrname %]</b> <input type="hidden" name="pickup" value="[% hold.wbrcode %]" />	106	Item being transferred to <b> [% hold.wbrname \| html %]</b> <input type="hidden" name="pickup" value="[% hold.wbrcode \| html %]" />
107	[% END %]	107	[% END %]
108	[% ELSE %]	108	[% ELSE %]
109	[% IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 %]	109	[% IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 %]
110	[% Branches.GetName(hold.branchcode) %] <input type="hidden" name="pickup" value="[% hold.branchcode %]" />	110	[% Branches.GetName(hold.branchcode) \| html %] <input type="hidden" name="pickup" value="[% hold.branchcode \| html %]" />
111	[% ELSE %]	111	[% ELSE %]
112	<select name="pickup">	112	<select name="pickup">
113	[% PROCESS options_for_libraries libraries => Branches.all( selected => hold.branchcode ) %]	113	[% PROCESS options_for_libraries libraries => Branches.all( selected => hold.branchcode ) %]
Lines 118-127 Link Here
118		118
119	<td>	119	<td>
120	[% IF ( hold.found ) %]	120	[% IF ( hold.found ) %]
121	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber %]">	121	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber \| html %]">
122	[% IF ( hold.barcodenumber ) %]	122	[% IF ( hold.barcodenumber ) %]
123	[% hold.barcodenumber %]	123	[% hold.barcodenumber \| html %]
124	<input type="hidden" name="itemnumber" value="[% hold.itemnumber %]" />	124	<input type="hidden" name="itemnumber" value="[% hold.itemnumber \| html %]" />
125	[% ELSE %]	125	[% ELSE %]
126	No barcode	126	No barcode
127	[% END %]	127	[% END %]
Lines 130-139 Link Here
130	[% IF ( hold.item_level_hold ) %]	130	[% IF ( hold.item_level_hold ) %]
131	<i>	131	<i>
132	Only item	132	Only item
133	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber %]">	133	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber \| html %]">
134	[% IF ( hold.barcodenumber ) %]	134	[% IF ( hold.barcodenumber ) %]
135	[% hold.barcodenumber %]	135	[% hold.barcodenumber \| html %]
136	<input type="hidden" name="itemnumber" value="[% hold.itemnumber %]" />	136	<input type="hidden" name="itemnumber" value="[% hold.itemnumber \| html %]" />
137	[% ELSE %]	137	[% ELSE %]
138	No barcode	138	No barcode
139	[% END %]	139	[% END %]
Lines 141-147 Link Here
141	</i>	141	</i>
142	[% ELSE %]	142	[% ELSE %]
143	[% IF hold.itemtype %]	143	[% IF hold.itemtype %]
144	<i>Next available [% ItemTypes.GetDescription( hold.itemtype ) %] item</i>	144	<i>Next available [% ItemTypes.GetDescription( hold.itemtype ) \| html %] item</i>
145	[% ELSE %]	145	[% ELSE %]
146	<i>Next available</i>	146	<i>Next available</i>
147	[% END %]	147	[% END %]
Lines 153-185 Link Here
153		153
154	[% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]	154	[% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
155	<td>	155	<td>
156	<a title="Toggle lowest priority" href="request.pl?action=setLowestPriority&borrowernumber=[% hold.borrowernumber %]&biblionumber=[% hold.biblionumber %]&reserve_id=[% hold.reserve_id %]&date=[% hold.date %]">	156	<a title="Toggle lowest priority" href="request.pl?action=setLowestPriority&borrowernumber=[% hold.borrowernumber \| html %]&biblionumber=[% hold.biblionumber \| html %]&reserve_id=[% hold.reserve_id \| html %]&date=[% hold.date \| html %]">
157	[% IF ( hold.lowestPriority ) %]	157	[% IF ( hold.lowestPriority ) %]
158	<img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Unset lowest priority" />	158	<img src="[% interface \| html %]/[% theme \| html %]/img/go-bottom.png" alt="Unset lowest priority" />
159	[% ELSE %]	159	[% ELSE %]
160	<img src="[% interface %]/[% theme %]/img/go-down.png" alt="Set to lowest priority" />	160	<img src="[% interface \| html %]/[% theme \| html %]/img/go-down.png" alt="Set to lowest priority" />
161	[% END %]	161	[% END %]
162	</a>	162	</a>
163	</td>	163	</td>
164	[% END %]	164	[% END %]
165		165
166	<td>	166	<td>
167	<a class="cancel-hold" title="Cancel hold" href="request.pl?action=cancel&borrowernumber=[% hold.borrowernumber %]&biblionumber=[% hold.biblionumber %]&reserve_id=[% hold.reserve_id %]&date=[% hold.date %]">	167	<a class="cancel-hold" title="Cancel hold" href="request.pl?action=cancel&borrowernumber=[% hold.borrowernumber \| html %]&biblionumber=[% hold.biblionumber \| html %]&reserve_id=[% hold.reserve_id \| html %]&date=[% hold.date \| html %]">
168	<img src="[% interface %]/[% theme %]/img/x.png" alt="Cancel" />	168	<img src="[% interface \| html %]/[% theme \| html %]/img/x.png" alt="Cancel" />
169	</a>	169	</a>
170	</td>	170	</td>
171		171
172	[% IF SuspendHoldsIntranet %]	172	[% IF SuspendHoldsIntranet %]
173	<td>	173	<td>
174	[% UNLESS ( hold.found ) %]	174	[% UNLESS ( hold.found ) %]
175	<input type="button" value="[% IF ( hold.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&reserve_id=[% hold.reserve_id %]&borrowernumber=[% hold.borrowernumber %]&biblionumber=[% hold.biblionumber %]&date=[% hold.date %]&suspend_until=' + $('#suspend_until_[% hold.reserve_id %]').val()" />	175	<input type="button" value="[% IF ( hold.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&reserve_id=[% hold.reserve_id \| html %]&borrowernumber=[% hold.borrowernumber \| html %]&biblionumber=[% hold.biblionumber \| html %]&date=[% hold.date \| html %]&suspend_until=' + $('#suspend_until_[% hold.reserve_id \| html %]').val()" />
176		176
177	[% IF AutoResumeSuspendedHolds %]	177	[% IF AutoResumeSuspendedHolds %]
178	<label for="suspend_until_[% hold.reserve_id %]">[% IF ( hold.suspend ) %] on [% ELSE %] until [% END %]</label>	178	<label for="suspend_until_[% hold.reserve_id \| html %]">[% IF ( hold.suspend ) %] on [% ELSE %] until [% END %]</label>
179	<input name="suspend_until" id="suspend_until_[% hold.reserve_id %]" size="10" value="[% hold.suspend_until \| $KohaDates %]" class="datepicker suspend_until_datepicker" />	179	<input name="suspend_until" id="suspend_until_[% hold.reserve_id \| html %]" size="10" value="[% hold.suspend_until \| $KohaDates %]" class="datepicker suspend_until_datepicker" />
180	<a href='#' onclick="document.getElementById('suspend_until_[% hold.reserve_id %]').value='';">Clear date</a>	180	<a href='#' onclick="document.getElementById('suspend_until_[% hold.reserve_id \| html %]').value='';">Clear date</a>
181	[% ELSE %]	181	[% ELSE %]
182	<input type="hidden" name="suspend_until" id="suspend_until_[% hold.reserve_id %]" value=""/>	182	<input type="hidden" name="suspend_until" id="suspend_until_[% hold.reserve_id \| html %]" value=""/>
183	[% END %]	183	[% END %]
184		184
185	[% ELSE %]	185	[% ELSE %]

Lines 508-517 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-16 / +15 lines)
508		508
509	[% UNLESS ( patron ) %]	509	[% UNLESS ( patron ) %]
510	[% IF ( reserveloop ) %]	510	[% IF ( reserveloop ) %]
511	<form name="T[% time %]" action="modrequest.pl" method="post">	511	<form name="T[% time \| html %]" action="modrequest.pl" method="post">
512	[% IF ( multi_hold ) %]	512	[% IF ( multi_hold ) %]
513	<input type = "hidden" name="multi_hold" value="1"/>	513	<input type = "hidden" name="multi_hold" value="1"/>
514	<input type = "hidden" name="biblionumbers" value="[% biblionumbers %]"/>	514	<input type = "hidden" name="biblionumbers" value="[% biblionumbers \| html %]"/>
515	[% END %]	515	[% END %]
516		516
517	<fieldset class="rows left">	517	<fieldset class="rows left">
Lines 521-527 Link Here
521	[% IF ( biblioloo.reserveloop ) %]	521	[% IF ( biblioloo.reserveloop ) %]
522	[% IF ( multi_hold ) %]	522	[% IF ( multi_hold ) %]
523	<h3>	523	<h3>
524	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]">	524	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber \| html %]">
525	[% biblioloo.title \| html %]	525	[% biblioloo.title \| html %]
526	</a>	526	</a>
527	</h3>	527	</h3>
Lines 531-537 Link Here
531	[% SET branchcodes = [] %]	531	[% SET branchcodes = [] %]
532		532
533	[% FOREACH h IN biblioloo.reserveloop %]	533	[% FOREACH h IN biblioloo.reserveloop %]
534	[% branchcodes.push( h.branchcode ) %]	534	[% branchcodes.push( h.branchcode ) \| $raw %]
535	[% END %]	535	[% END %]
536	[% branchcodes = branchcodes.unique %]	536	[% branchcodes = branchcodes.unique %]
537		537
Lines 539-549 Link Here
539	[% SET holds_by_branch = [] %]	539	[% SET holds_by_branch = [] %]
540	[% FOREACH h IN biblioloo.reserveloop %]	540	[% FOREACH h IN biblioloo.reserveloop %]
541	[% IF h.branchcode == b %]	541	[% IF h.branchcode == b %]
542	[% holds_by_branch.push( h ) %]	542	[% holds_by_branch.push( h ) \| $raw %]
543	[% END %]	543	[% END %]
544	[% END %]	544	[% END %]
545	<fieldset>	545	<fieldset>
546	<legend>[% Branches.GetName( b ) %]</legend>	546	<legend>[% Branches.GetName( b ) \| html %]</legend>
547	[% INCLUDE holds_table.inc holds=holds_by_branch %]	547	[% INCLUDE holds_table.inc holds=holds_by_branch %]
548	</fieldset>	548	</fieldset>
549	[% END %]	549	[% END %]
Lines 552-558 Link Here
552		552
553	[% FOREACH h IN biblioloo.reserveloop %]	553	[% FOREACH h IN biblioloo.reserveloop %]
554	[% SET hold_itemtype = h.object.item.effective_itemtype \|\| h.itemtype %]	554	[% SET hold_itemtype = h.object.item.effective_itemtype \|\| h.itemtype %]
555	[% itemtypes_all.push( hold_itemtype ) %]	555	[% itemtypes.push( hold_itemtype ) \| $raw %]
556	[% END %]	556	[% END %]
557	[% itemtypes = itemtypes.unique %]	557	[% itemtypes = itemtypes.unique %]
558		558
Lines 561-573 Link Here
561	[% FOREACH h IN biblioloo.reserveloop %]	561	[% FOREACH h IN biblioloo.reserveloop %]
562	[% SET hold_itemtype = h.object.item.effective_itemtype \|\| h.itemtype %]	562	[% SET hold_itemtype = h.object.item.effective_itemtype \|\| h.itemtype %]
563	[% IF hold_itemtype == i %]	563	[% IF hold_itemtype == i %]
564	[% holds_by_itemtype.push( h ) %]	564	[% holds_by_itemtype.push( h ) \| $raw %]
565	[% END %]	565	[% END %]
566	[% END %]	566	[% END %]
567		567
568	<fieldset>	568	<fieldset>
569	[% IF i %]	569	[% IF i %]
570	<legend>[% ItemTypes.GetDescription( i ) %]</legend>	570	<legend>[% ItemTypes.GetDescription( i ) \| html %]</legend>
571	[% ELSE %]	571	[% ELSE %]
572	<legend>Any item type</legend>	572	<legend>Any item type</legend>
573	[% END %]	573	[% END %]
Lines 578-608 Link Here
578	[% SET branchcodes = [] %]	578	[% SET branchcodes = [] %]
579		579
580	[% FOREACH h IN biblioloo.reserveloop %]	580	[% FOREACH h IN biblioloo.reserveloop %]
581	[% branchcodes.push( h.branchcode ) %]	581	[% branchcodes.push( h.branchcode ) \| $raw %]
582	[% END %]	582	[% END %]
583	[% branchcodes = branchcodes.unique %]	583	[% branchcodes = branchcodes.unique %]
584		584
585	[% FOREACH b IN branchcodes.sort %]	585	[% FOREACH b IN branchcodes.sort %]
586	<fieldset class="contrast">	586	<fieldset class="contrast">
587	<legend>[% Branches.GetName( b ) %]</legend>	587	<legend>[% Branches.GetName( b ) \| html %]</legend>
588	[% SET holds_by_branch = [] %]	588	[% SET holds_by_branch = [] %]
589	[% FOREACH h IN biblioloo.reserveloop %]	589	[% FOREACH h IN biblioloo.reserveloop %]
590	[% IF h.branchcode == b %]	590	[% IF h.branchcode == b %]
591	[% holds_by_branch.push( h ) %]	591	[% holds_by_branch.push( h ) \| $raw %]
592	[% END %]	592	[% END %]
593	[% END %]	593	[% END %]
594		594
595	[% SET itemtypes = [] %]	595	[% SET itemtypes = [] %]
596	[% FOREACH h IN holds_by_branch %]	596	[% FOREACH h IN holds_by_branch %]
597	[% SET hold_itemtype = h.object.item.effective_itemtype \|\| h.itemtype %]	597	[% SET hold_itemtype = h.object.item.effective_itemtype \|\| h.itemtype %]
598	[% itemtypes.push( hold_itemtype ) %]	598	[% itemtypes.push( hold_itemtype ) \| $raw %]
599	[% END %]	599	[% END %]
600	[% itemtypes = itemtypes.unique %]	600	[% itemtypes = itemtypes.unique %]
601		601
602	[% FOREACH i IN itemtypes.sort %]	602	[% FOREACH i IN itemtypes.sort %]
603	<fieldset class="standard">	603	<fieldset class="standard">
604	[% IF i %]	604	[% IF i %]
605	<legend>[% ItemTypes.GetDescription( i ) %]</legend>	605	<legend>[% ItemTypes.GetDescription( i ) \| html %]</legend>
606	[% ELSE %]	606	[% ELSE %]
607	<legend>Any item type</legend>	607	<legend>Any item type</legend>
608	[% END %]	608	[% END %]
Lines 611-617 Link Here
611	[% FOREACH h IN holds_by_branch %]	611	[% FOREACH h IN holds_by_branch %]
612	[% SET hold_itemtype = h.object.item.effective_itemtype \|\| h.itemtype %]	612	[% SET hold_itemtype = h.object.item.effective_itemtype \|\| h.itemtype %]
613	[% IF hold_itemtype == i %]	613	[% IF hold_itemtype == i %]
614	[% holds_by_itemtype.push( h ) %]	614	[% holds_by_itemtype.push( h ) \| $raw %]
615	[% END %]	615	[% END %]
616	[% END %]	616	[% END %]
617	[% INCLUDE holds_table.inc holds=holds_by_itemtype %]	617	[% INCLUDE holds_table.inc holds=holds_by_itemtype %]
618	-