Martin Renvoize
d76a6cb104
It looks like the data-order attributes were at the wrong level to me, i.e. not part of the 'td' but instead part of the cell content. This patch moves those data-order attributes where possible and drops the data-type definitions on the headers. However, for the cancellation case, this isn't as clear cut as we may well display more than one cancellation request date in the same cell. For this case I've left Katrins data-type="@data-order" trick. Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
77 lines
4.9 KiB
HTML
77 lines
4.9 KiB
HTML
[% USE KohaDates %]
|
|
[% USE ItemTypes %]
|
|
[% USE AuthorisedValues %]
|
|
<table class="holds_table" id="[% table_name | html %]">
|
|
<thead>
|
|
<tr>
|
|
<th class="NoSort"><input type="checkbox" class="select_hold_all"/></th>
|
|
<th>Waiting since</th>
|
|
<th>Date hold placed</th>
|
|
[% IF table_name == 'holdscr' %]
|
|
<th data-type="@data-sort">Date cancellation requested</th>
|
|
[% END %]
|
|
<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>
|
|
<th><input type="checkbox" class="select_hold" data-id="[% reserveloo.reserve_id | html %]"/></th>
|
|
<td data-order="[% reserveloo.waitingdate | html %]"><span>[% reserveloo.waitingdate | $KohaDates %]</span></td>
|
|
<td data-order="[% reserveloo.reservedate | html %]"><span>[% reserveloo.reservedate | $KohaDates %]</span></td>
|
|
[% IF table_name == 'holdscr' %]
|
|
<td>
|
|
[% FOREACH cancellation_request IN reserveloo.cancellation_requests %]
|
|
<span data-order="[% cancellation_request.creation_date | html %]">[% cancellation_request.creation_date | $KohaDates %]</span>
|
|
[% END %]
|
|
</td>
|
|
[% END %]
|
|
<td data-order="[% reserveloo.expirationdate | html %]"><span>[% 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>
|