Lucas Gass
28771ad8b7
To test: 1. Have some holds awaiting pickup, also have some holds that have been waiting longer than the ReservesMaxPickUpDelay is set to. 2. Go to /cgi-bin/koha/circ/waitingreserves.pl 3. There is no expiration date 4. Apply patch and restart_all 5. Now there should be a Expiration date column, make sure you can see it in both Holds waiting and Holds waiting over X days 6. Make sure all the columns Waiting Since, Date hold placed, and expiration date still sort correctly 6. Go to Table settings, and make sure all the columns hide correctly for both of the holds_awaiting_pickup tables ( holdst & holdso ) Note: This patch also corrects 2 other small problems 1. Corrects a problem where the table settings did not account for the checkbox column at the beginnning of each table 2. Removes the title-string class and uses data-order to sort Waiting Since, Date hold placed, and expiration date ( see Bug 27934 ) Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
70 lines
4.5 KiB
HTML
70 lines
4.5 KiB
HTML
[% USE ItemTypes %]
|
|
[% USE AuthorisedValues %]
|
|
<table class="holds_table" id="[% table_name | html %]">
|
|
<thead>
|
|
<tr>
|
|
[% IF select_column %]
|
|
<th class="NoSort"><input type="checkbox" class="select_hold_all"/></th>
|
|
[% END %]
|
|
<th>Waiting since</th>
|
|
<th>Date hold placed</th>
|
|
<th>Expiration date</th>
|
|
<th class="anti-the">Title</th>
|
|
<th>Patron</th>
|
|
<th>Home library</th>
|
|
<th>Current library</th>
|
|
<th>Shelving location</th>
|
|
<th>Call number</th>
|
|
<th>Copy number</th>
|
|
<th>Enumeration</th>
|
|
<th class="NoSort noExport">Actions</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH reserveloo IN reserveloop %]
|
|
<tr>
|
|
[% IF select_column %]
|
|
<th><input type="checkbox" class="select_hold" data-id="[% reserveloo.reserve_id | html %]"/></th>
|
|
[% END %]
|
|
<td><span data-order="[% reserveloo.waitingdate | html %]">[% reserveloo.waitingdate | $KohaDates %]</span></td>
|
|
<td><span data-order="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %]</span></td>
|
|
<td><span data-order="[% reserveloo.expirationdate | html %]">[% reserveloo.expirationdate | $KohaDates %]</span></td>
|
|
<td>
|
|
[% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio link = 1 %]
|
|
[% UNLESS ( item_level_itypes ) %]
|
|
[% IF ( ItemTypes.GetDescription(reserveloo.item.effective_itemtype) ) %] (<strong>[% ItemTypes.GetDescription(reserveloo.item.effective_itemtype) | html %]</strong>)
|
|
[% END %]
|
|
[% END %]
|
|
<br />Barcode: [% reserveloo.item.barcode | html %]
|
|
</td>
|
|
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrower.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 no_title=1 %]</a>
|
|
[% IF ( reserveloo.borrower.phone ) %]<br /><span class="patron_phone">[% reserveloo.borrower.phone | html %]</span>[% END %]
|
|
[% IF ( reserveloo.borrower.first_valid_email_address ) %]
|
|
<span class="patron_email"><br /><a href="mailto:[% reserveloo.borrower.first_valid_email_address | uri %]?subject=[% "Hold waiting: " | uri %][% reserveloo.biblio.title | uri %]">
|
|
[% reserveloo.borrower.first_valid_email_address | html %]</a></span>
|
|
[% END %]
|
|
</td>
|
|
<td>[% Branches.GetName( reserveloo.item.homebranch ) | html %]</td>
|
|
<td>[% Branches.GetName( reserveloo.item.holdingbranch ) | html %][% IF (reserveloo.desk_id ) %], [% reserveloo.desk.desk_name | html %][% END %]</td>
|
|
<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => reserveloo.item.location) | html %]</td>
|
|
<td>[% reserveloo.item.itemcallnumber | html %]</td>
|
|
<td>[% reserveloo.item.copynumber | html %]</td>
|
|
<td>[% reserveloo.item.enumchron | html %]</td>
|
|
<td>
|
|
<form name="cancelReserve" action="waitingreserves.pl" method="post">
|
|
<input type="hidden" name="borrowernumber" value="[% reserveloo.borrower.borrowernumber | html %]" />
|
|
<input type="hidden" name="itemnumber" value="[% reserveloo.item.itemnumber | html %]" />
|
|
<input type="hidden" name="fbr" value="[% reserveloo.item.holdingbranch | html %]" />
|
|
<input type="hidden" name="tbr" value="[% reserveloo.item.homebranch | html %]" />
|
|
<input type="hidden" name="tab" value="[% tab | html %]">
|
|
[% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %]
|
|
<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold and return to: [% Branches.GetName( reserveloo.item.homebranch ) | html %]</button>
|
|
[% ELSE %]
|
|
<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold</button>
|
|
[% END %]
|
|
</form>
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|