Attachment 50815 Details for Bug 11565 – Bug 11565 [Work in progress] decreaseLoanHighHolds needs Override

[patch] Bug 11565 [Work in progress] decreaseLoanHighHolds needs Override

Bug-11565-Work-in-progress-decreaseLoanHighHolds-n.patch (text/plain), 12.34 KB, created by Owen Leonard on 2016-04-27 14:57:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2016-04-27 14:57:37 UTC

Size: 12.34 KB

patch

obsolete

>From 6c9e1ed5fed9f69af29b8637e13392e53f35ed39 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 22 Mar 2016 09:04:25 -0400
>Subject: [PATCH] Bug 11565 [Work in progress] decreaseLoanHighHolds needs
> Override
>Content-Type: text/plain; charset="utf-8"
>
>This follow-up reformats the checkout screen so that checkout settings
>like specify due date, on-site checkout, and override high holds are
>grouped in a panel which is hidden by default. Clicking a link shows all
>the available settings.
>
>Also modified in this patch: The default color for div.hint has been
>made a little darker for readability.
>
>To test, apply the patch and clear your browser cache if necessary.
>
>- Check out to a patron who is not blocked from checking out.
>- Click the "Checkout settings" link and confirm that the settings panel
>  is displayed.
>- Test that the settings in the panel behave as expected.
>- Test with preferences on and off: decreaseLoanHighHolds,
>  OnSiteCheckouts, SpecifyDueDate.
>
>NOTE: This patch is a work in progress. It does not address the issue of
>checkout setting being hidden even if they are active.
>---
> .../intranet-tmpl/prog/en/css/staff-global.css     |  37 +++++---
> .../intranet-tmpl/prog/en/js/pages/circulation.js  |  15 +++
> .../prog/en/modules/circ/circulation.tt            | 105 +++++++++++----------
> 3 files changed, 94 insertions(+), 63 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>index a638129..47875d0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>@@ -509,12 +509,11 @@ fieldset.brief ol, fieldset.brief li {
> }
> 
> .hint {
>-	color : #999999;
>+    color : #666;
> 	font-size : 95%;
> }
> 
> fieldset.brief div.hint, fieldset.rows div.hint, div.yui-u div.hint {
>-	font-size : 95%;
> 	margin-bottom : .4em;
> }
> 
>@@ -998,32 +997,40 @@ tr.highlight th[scope=row] {
> 	border-color : #BCBCBC;
> }
> 
>-#circ_circulation_issue label {
>-	font-size: 105%;
>-	font-weight : bold;
>-}
>-
>-#circ_circulation_issue div.hint {
>-	color : #666666;
>-	margin: .2em 0;
>+label.circ_barcode {
>+    font-size: 105%;
>+    font-weight : bold;
> }
> 
>-.date-select,
>-.onsite_checkout-select {
>+.checkout-setting {
>     font-size : 85%;
>     padding-top : .3em;
> }
> 
>-#circ_circulation_issue .date-select label,
>-.date-select label {
>+.checkout-setting label {
>     font-size : inherit;
>     font-weight: normal;
> }
> 
>-.date-select input {
>+.checkout-setting input {
>     vertical-align: middle;
> }
> 
>+.checkout-settings {
>+    background-color: #f4f8f9;
>+    border-radius: 0;
>+    border-top: 2px solid #b9d8d9;
>+    display: none;
>+    margin-left: -1em;
>+    margin-right: -1em;
>+    margin-top: 1em;
>+    padding: 1em 1em 0;
>+}
>+
>+#show-checkout-settings {
>+    margin-top: .5em;
>+}
>+
> tr.expired td {
> 	color : #999999;
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js b/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js
>index cea3e88..92dba4b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js
>+++ b/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js
>@@ -45,6 +45,21 @@ $(document).ready(function() {
>         export_checkouts(output_format);
>         return false;
>     });
>+
>+    var checkout_settings = $(".checkout-settings");
>+    var checkout_settings_icon = $(".checkout-settings-icon");
>+
>+    $("#show-checkout-settings a").on("click",function(){
>+        if( checkout_settings.is(":hidden")){
>+            checkout_settings.show();
>+            checkout_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down");
>+        } else {
>+            $("#barcode").focus();
>+            checkout_settings.hide();
>+            checkout_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right");
>+        }
>+    });
>+
> });
> 
> function export_checkouts(format) {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index c548863..407ea3b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -644,7 +644,7 @@ No patron matched <span class="ex">[% message %]</span>
> 
>     [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
> 
>-    <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
>+    <label class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
> 
> 	<div class="hint">Enter item barcode:</div>
> 
>@@ -655,68 +655,77 @@ No patron matched <span class="ex">[% message %]</span>
>     [% END %]
>     <button type="submit" class="btn">Check out</button>
> 
>-    [% UNLESS noissues %]
>-        <div class="date-select">
>-            [% IF NEEDSCONFIRMATION %]
>-                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
>-            [% ELSE %]
>-                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" />
>-            [% END %]
>+    <div id="show-checkout-settings">
>+        <a href="#"><i class="fa fa-caret-right checkout-settings-icon"></i> Checkout settings</a>
>+    </div>
> 
>-            <label for="auto_renew">Automatic renewal</label>
>+    <div class="checkout-settings">
> 
>-            [% IF Koha.Preference('decreaseLoanHighHolds') %]
>-                [% IF NEEDSCONFIRMATION %]
>-                    [% IF override_high_holds %]
>-                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled" checked="checked"/>
>+        [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
>+            [% IF ( SpecifyDueDate ) %]
>+                <div id="specify-due-date" class="checkout-setting">
>+                    <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
>+                    [% IF ( duedatespec ) %]
>+                        <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec %]" readonly="readonly" />
>                     [% ELSE %]
>-                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled"/>
>+                        <input type="text" size="13" id="duedatespec" name="duedatespec" value="" readonly="readonly" />
>                     [% END %]
>-                [% ELSE %]
>-                    [% IF override_high_holds %]
>-                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" checked="checked" />
>+                    <label for="stickyduedate"> Remember for session:</label>
>+                    [% IF ( stickyduedate ) %]
>+                        <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="checked" />
>                     [% ELSE %]
>-                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" />
>+                        <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" />
>                     [% END %]
>-                [% END %]
>-                <label for="override_high_holds">Don't decrease loan length based on holds</label>
>+                    <button class="btn btn-small action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
>+                </div>
>             [% END %]
>-        </div>
>-    [% END %]
>+        [% END %]
> 
>-    [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
>-        [% IF ( SpecifyDueDate ) %]
>-            <div class="date-select">
>-                <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
>-                [% IF ( duedatespec ) %]
>-                    <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec %]" readonly="readonly" />
>+        [% UNLESS ( noissues ) %]
>+            <div id="set-automatic-renewal" class="checkout-setting">
>+                [% IF NEEDSCONFIRMATION %]
>+                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
>                 [% ELSE %]
>-                    <input type="text" size="13" id="duedatespec" name="duedatespec" value="" readonly="readonly" />
>+                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" />
>                 [% END %]
>-                <label for="stickyduedate"> Remember for session:</label>
>-                [% IF ( stickyduedate ) %]
>-                    <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="checked" />
>+
>+                <label for="auto_renew">Automatic renewal</label>
>+            </div>
>+            [% IF Koha.Preference('decreaseLoanHighHolds') %]
>+                <div id="set_high_holds_overrride" class="checkout-setting">
>+                    [% IF NEEDSCONFIRMATION %]
>+                        [% IF override_high_holds %]
>+                            <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled" checked="checked"/>
>+                        [% ELSE %]
>+                            <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled"/>
>+                        [% END %]
>+                    [% ELSE %]
>+                        [% IF override_high_holds %]
>+                            <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" checked="checked" />
>+                        [% ELSE %]
>+                            <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" />
>+                        [% END %]
>+                    [% END %]
>+                    <label for="override_high_holds">Don't decrease checkout length based on holds</label>
>+                </div>
>+            [% END %]
>+        [% END %]
>+
>+        [% IF Koha.Preference('OnSiteCheckouts') %]
>+            <div id="onsite_checkout-select" class="checkout-setting">
>+                [% IF noissues %]
>+                    <div class="onsite-checkout-only">
>+                        <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkouts only. Automatic due date: </label>
>+                        <input type="text" name="duedatespec" id="duedatespec" readonly="readonly" />
>+                        <input type="hidden" name="onsite_checkout" checked="checked" value="1" />
>+                    </div>
>                 [% ELSE %]
>-                    <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" />
>+                    <input type="checkbox" id="onsite_checkout" name="onsite_checkout" /> <label for="onsite_checkout">On-site checkout</label>
>                 [% END %]
>-                <button class="btn btn-small action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
>             </div>
>         [% END %]
>-    [% END %]
> 
>-    [% IF Koha.Preference('OnSiteCheckouts') %]
>-        <div class="onsite_checkout-select">
>-            [% IF noissues %]
>-                <div class="onsite-checkout-only">
>-                    <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkouts only. Automatic due date: </label>
>-                    <input type="text" name="duedatespec" id="duedatespec" readonly="readonly" />
>-                    <input type="hidden" name="onsite_checkout" checked="checked" value="1" />
>-                </div>
>-            [% ELSE %]
>-                <input type="checkbox" id="onsite_checkout" name="onsite_checkout" /> <label for="onsite_checkout">On-site checkout</label>
>-            [% END %]
>-        </div>
>-    [% END %]
>+    </div> 
> 
>           <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
>           <input type="hidden" name="branch" value="[% branch %]" />
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 11565: 42976 | 43160 | 43600 | 48679 | 49409 | 49937 | 50798 | 50799 | 50800 | 50815 | 50817 | 50818 | 50820 | 50821 | 50822 | 50828 | 50829