From f7285df3d516ee4eab38cfbdf424ea9f2fc4a481 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 18 Nov 2015 18:53:03 +0000 Subject: [PATCH] Bug 11360 - Disable barcode field and submit button when a hold is found At the moment when scanning in returns, it can be easy to miss a hold trap due to the fact that the barcode and submit are still active and the barcode field is focused on. A librarian who is focused on scanning can easily scan another item and pass over the form, which is equivalent to clicking the "ignore" button. Test Plan: 1) Apply this patch 2) Trap a hold, note the new modal 3) Check the hold in a second time 4) Note the new modal 5) For each modal, test each button --- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 276 +++++++++++++------- 1 file changed, 181 insertions(+), 95 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index ca23a94..28a2c37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -19,6 +19,7 @@ function Dopop(link) { $("#barcode").focus(); } $(document).ready(function () { + $(".modal").modal(); [% IF print_slip %] Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% biblionumber %]'); @@ -195,55 +196,90 @@ $(document).ready(function () { [% END %] [% IF ( found ) %] - - [% IF ( waiting ) %] - - -
-

Hold found (item is already waiting): [% title |html %]

- [% IF ( reservenotes ) %]

Notes: [% reservenotes %]

[% END %] -

Hold for:

- - [% IF ( transfertodo ) %] -

Transfer to: [% destbranchname %]

- [% ELSE %] -

Hold at [% destbranchname %]

- [% END %] -
- - +
+ + + +
[% END %] [% IF ( diffbranch ) %] @@ -352,55 +388,105 @@ $(document).ready(function () { [% IF ( reserved ) %] - - -
-

Hold found: [% title |html %]

- [% IF ( reservenotes ) %]

Notes: [% reservenotes %]

[% END %] -
Hold for:
- - [% IF ( transfertodo ) %] -

Transfer to: [% destbranchname %]

- [% ELSE %] -

Hold at [% destbranchname %]

- [% END %] -
- - [% IF ( transfertodo ) %] - - - [% ELSE %] - - - [% END %] - - [% FOREACH inputloo IN inputloop %] - - - [% END %] - - - - - - - - - - -
-
+ [% END %] [% END %] -- 1.7.10.4