Owen
8389b5f332
This patch reworks the process of suspending an individual hold from the
patron's hold list. Instead of repeating the modal markup in each line
of the holds table, a single modal is re-used.
A "focus: false" is added to the modal via a data-attribute in order to
overcome problems with selecting months and using keyboard navigation in
the calendar popup.
To test, apply the patch and log into the OPAC as a user with holds.
- View the holds tab under "Your summary."
- Click the "Suspend" button next to one of the holds.
- You should see a modal which shows the title of the item in question.
- Test that the date picker works correctly:
- Test selecting a month and year
- Test selecting a date both with the mouse and by using arrow keys.
- Test that you can clear the selected date both by clicking the X and
by clicking the text link.
- Select a date and close the modal without submitting the suspension.
- Click the "Suspend" link on another title to confirm that the date
picker still works correctly.
- Submit a suspension and confirm that the it completes successfully.
-
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
191 lines
12 KiB
HTML
191 lines
12 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 suspend_hold js-show" href="#" role="button" data-title="[% HOLD.biblio.title | html %] [% FOREACH subtitle IN HOLD.biblio.subtitle.split(' \| ') %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %][% subtitle | html %][% END %]" data-reserve_id="[% HOLD.reserve_id | html %]"><i class="fa fa-pause" aria-hidden="true"></i> Suspend</a>
|
|
[% 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="flatpickr futuredate" size="10" />
|
|
[% 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 %]
|