Owen Leonard
da2d583591
This patch modifies OPAC templates to replace the use of the
"title-string" DataTables sorting method with the newer "data-order"
attribute.
To test, apply the patch and view the following pages to confirm that
columns containing dates sort correctly when using any setting of the
"dateformat" system preference:
- As a logged-in user, (proper testing will depend on having the
relevant data associated with your user, e.g. holds, searches, ill
requests, etc.):
- Your summary
- Checkouts
- Overdues
- Holds
- Your charges
- Your search history
- Your checkout history
- Your holds history
- Your interlibrary loan requests
- Your tags
- Bibliographic detail page
- With a non-serial record: Holdings
- With a serial record: Latest issues
- More details -> Full history: Test multiple years if possible
- Course reserves -> Course details
- Self checkout -> Check out to a patron with checkouts
Signed-off-by: Amit Gupta <amitddng135@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
223 lines
15 KiB
HTML
223 lines
15 KiB
HTML
[% USE Branches %]
|
|
[% USE ItemTypes %]
|
|
[% USE KohaDates %]
|
|
[% PROCESS 'i18n.inc' %]
|
|
|
|
[% IF ( HOLDS.count ) %]
|
|
<div id="opac-user-holds">
|
|
<table id="holdst" class="table table-bordered table-striped">
|
|
<caption>Holds <span class="count">([% HOLDS.count | html %] total)</span></caption>
|
|
<!-- HOLDS TABLE ROWS -->
|
|
<thead>
|
|
<tr>
|
|
<th class="anti-the">Title</th>
|
|
[% IF ( showpriority ) %]
|
|
<th>Placed on</th>
|
|
[% ELSE %]
|
|
<th class="psort">Placed on</th>
|
|
[% END %]
|
|
<th>Expires on</th>
|
|
[% UNLESS( singleBranchMode) %]
|
|
<th>Pick up location</th>
|
|
[% END %]
|
|
[% IF ( showpriority ) %]
|
|
<th class="psort">Priority</th>
|
|
[% END %]
|
|
<th>Status</th>
|
|
[% IF SuspendHoldsOpac and ! onlyinfo %]
|
|
<th class="nosort" >Suspend</th>
|
|
[% END %]
|
|
[% IF ! onlyinfo %]
|
|
<th class="nosort">Modify</th>
|
|
[% END %]
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% SET all_holds_waiting = 1 %]
|
|
[% FOREACH HOLD IN HOLDS %]
|
|
[% UNLESS ( HOLD.is_waiting || HOLD.is_in_transit || HOLD.is_in_processing) %]
|
|
[% SET all_holds_waiting = 0 %]
|
|
[% END %]
|
|
[% IF ( HOLD.is_at_destination ) %]
|
|
<tr class="reserved">
|
|
[% ELSIF HOLD.is_in_transit %]
|
|
<tr class="transfered">
|
|
[% ELSE %]
|
|
<tr>
|
|
[% END %]
|
|
<td class="title">
|
|
[% IF ! onlyinfo %]
|
|
<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% HOLD.biblionumber | html %]">
|
|
[% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]
|
|
[% HOLD.item.enumchron | html %]
|
|
</a>
|
|
[% ELSE %]
|
|
<strong>
|
|
[% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]
|
|
[% HOLD.item.enumchron | html %]
|
|
</strong>
|
|
[% END %]
|
|
[% HOLD.biblio.author | html %]
|
|
[% IF HOLD.item_level_hold %]
|
|
<p class="hint">Item on hold: [% HOLD.item.barcode | html %]</p>
|
|
[% END %]
|
|
</td>
|
|
<td class="reservedate" data-order="[% HOLD.reservedate | html %]">
|
|
<span class="tdlabel">Hold date:</span>
|
|
[% HOLD.reservedate | $KohaDates %]
|
|
</span>
|
|
</td>
|
|
[% IF ! HOLD.found %]
|
|
<td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
|
|
[% IF ( HOLD.expirationdate ) %]
|
|
<span class="tdlabel">Expiration:</span>
|
|
[% HOLD.expirationdate | $KohaDates %]
|
|
[% ELSE %]
|
|
<span class="tdlabel">Expiration:</span>
|
|
Never expires
|
|
[% END %]
|
|
[% ELSE %]
|
|
<td class="expirationdate" data-order="0000-00-00">
|
|
-
|
|
[% END %]
|
|
</td>
|
|
[% UNLESS( singleBranchMode) %]
|
|
<td class="branch">
|
|
<span class="tdlabel">Pick up location:</span>
|
|
[% HOLD.branch.branchname | html %]
|
|
</td>
|
|
[% END %]
|
|
[% IF ( showpriority ) %]
|
|
<td data-order="[% HOLD.priority | html %]" class="priority">
|
|
<span class="tdlabel">Priority:</span>
|
|
[% HOLD.priority | html %]
|
|
</td>
|
|
[% END %]
|
|
<td class="status">
|
|
<span class="tdlabel">Status:</span>
|
|
[% IF ( HOLD.is_waiting ) %]
|
|
<i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
|
|
[% IF ( HOLD.is_at_destination ) %]
|
|
Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
|
|
[% IF ( HOLD.desk_id ) %], [% HOLD.desk.desk_name | html %],[% END %]
|
|
[% IF ( HOLD.waitingdate ) %]
|
|
since [% HOLD.waitingdate | $KohaDates %]
|
|
[% IF HOLD.expirationdate %]
|
|
until [% HOLD.expirationdate | $KohaDates %]
|
|
[% END %]
|
|
[% END %]
|
|
<input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
|
|
[% ELSE %]
|
|
Item in transit to <strong> [% Branches.GetName( HOLD.branchcode ) | html %]</strong> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% IF ( HOLD.is_in_transit ) %]
|
|
[% SET transfer = HOLD.item.get_transfer %]
|
|
Item in transit from <strong> [% Branches.GetName( transfer.frombranch ) | html %]</strong> since
|
|
[% transfer.datesent | $KohaDates %]
|
|
[% ELSIF ( HOLD.is_in_processing ) %]
|
|
Item in processing
|
|
[% ELSIF ( HOLD.suspend ) %]
|
|
Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | $KohaDates %] [% END %]
|
|
[% ELSE %]
|
|
[% IF HOLD.itemtype %]
|
|
Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'
|
|
[% ELSE %]
|
|
Pending
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
[% IF SuspendHoldsOpac and ! onlyinfo %]
|
|
<td>
|
|
[% IF ( HOLD.is_cancelable_from_opac ) %]
|
|
[% IF HOLD.suspend %]
|
|
<form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
|
|
<input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
|
|
<button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play" aria-hidden="true"></i> Resume</button>
|
|
</form>
|
|
[% ELSE %]
|
|
[% IF AutoResumeSuspendedHolds %]
|
|
<a class="btn btn-link js-show" href="#suspendModal[% HOLD.reserve_id | html %]" role="button" data-toggle="modal"><i class="fa fa-pause" aria-hidden="true"></i> Suspend</a>
|
|
[% # hold suspend modal form %]
|
|
<div id="suspendModal[% HOLD.reserve_id | html %]" class="modal-nojs" tabindex="-1" role="dialog" aria-labelledby="suspendModal[% HOLD.reserve_id | html %]Label" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
|
|
<div class="modal-header">
|
|
[% IF HOLD.suspend %]
|
|
<h3 class="modal-title" id="suspendModal[% HOLD.reserve_id | html %]Label">Resume your hold on <em>[% HOLD.biblio.title | html %]</em></h3>
|
|
[% ELSE %]
|
|
<h3 class="modal-title" id="suspendModal[% HOLD.reserve_id | html %]Label">Suspend your hold on <em>[% HOLD.biblio.title | html %]</em></h3>
|
|
[% END %]
|
|
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
|
|
<span aria-hidden="true">x</span>
|
|
</button>
|
|
</div>
|
|
<div class="modal-body">
|
|
<input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
|
|
<label for="suspend_until_[% HOLD.reserve_id | html %]">Suspend until:</label>
|
|
<input type="text" name="suspend_until" id="suspend_until_[% HOLD.reserve_id | html %]" class="suspend-until" size="10" />
|
|
[% INCLUDE 'date-format.inc' %]
|
|
<p class="js-show"><a href="#" onclick="document.getElementById('suspend_until_[% HOLD.reserve_id | html %]').value='';return false;">Clear date to suspend indefinitely</a></p>
|
|
<button class="btn btn-primary btn-sm js-hide" type="submit" name="submit">Suspend</button>
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Suspend</button>
|
|
<button data-dismiss="modal" class="btn btn-secondary"><i class="fa fa-remove" aria-hidden="true"></i> Do not suspend</button>
|
|
</div>
|
|
</form>
|
|
</div> <!-- /.modal-content -->
|
|
</div> <!-- /.modal-dialog -->
|
|
</div> <!-- /#suspendModal[% HOLD.reserve_id | html %] -->
|
|
[% ELSE %]
|
|
<form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
|
|
<input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
|
|
<button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause" aria-hidden="true"></i> Suspend</button>
|
|
</form>
|
|
[% END # / IF AutoResumeSuspendedHolds %]
|
|
[% END # / IF HOLD.suspend %]
|
|
[% END # / IF ( HOLD.is_cancelable_from_opac )%]
|
|
</td>
|
|
[% END # / IF SuspendHoldsOpac %]
|
|
[% IF ! onlyinfo %]
|
|
<td class="modify">
|
|
[% IF ( HOLD.is_cancelable_from_opac ) %]
|
|
<form id="delete_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
|
|
<input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
|
|
<input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
|
|
<button data-title="[% INCLUDE 'biblio-title-head.inc' biblio=HOLD.biblio %]" data-reserve_id="[% HOLD.reserve_id | html %]" type="submit" class="btn btn-sm btn-danger btn-delete-hold"><i class="fa fa-remove" aria-hidden="true"></i> [% tp('Cancel hold button', 'Cancel') | html %]</button>
|
|
</form>
|
|
[% END %]
|
|
</td>
|
|
[% END # / IF onlyinfo %]
|
|
</tr>
|
|
[% END # /FOREACH HOLDS %]
|
|
</tbody>
|
|
</table>
|
|
|
|
[% IF SuspendHoldsOpac and ! onlyinfo %]
|
|
[% UNLESS ( all_holds_waiting ) %]
|
|
<div>
|
|
<form class="form-inline" id="suspend_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
|
|
<button type="submit" id="suspend_all_submit" class="btn btn-primary"><i class="fa fa-pause" aria-hidden="true"></i> Suspend all holds</button>
|
|
<input type="hidden" name="suspend" value="1" />
|
|
|
|
[% IF AutoResumeSuspendedHolds %]
|
|
<label for="suspend_until"> until </label>
|
|
<input type="text" name="suspend_until" id="suspend_until" class="suspend-until" readonly="readonly" size="10" />
|
|
<a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('suspend_until').value='';return false;">Clear date to suspend indefinitely</a>
|
|
[% END %]
|
|
</form>
|
|
</div>
|
|
<br/>
|
|
<div>
|
|
<form id="resume_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
|
|
<button type="submit" id="resume_all_submit" class="btn btn-primary"><i class="fa fa-play" aria-hidden="true"></i> Resume all suspended holds</button>
|
|
<input type="hidden" name="suspend" value="0" />
|
|
</form>
|
|
</div>
|
|
[% END %]
|
|
[% END %]
|
|
</div> <!-- / #opac-user-holds -->
|
|
[% END # / #HOLDS.count %]
|