From 09d20a16b129ac0a450fddd3ca20f09133b02261 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Thu, 17 Dec 2015 18:24:34 -0500
Subject: [PATCH] These are modifications to the Evergreen self-check interface
 to:

1. Fix bugs with printing holds and fines.
2. Improve page layout overall, and with consideration for
   1024x768 resolution monitors that a lot of libraries use.
3. Hide hold status from view on holds table.
4. Hide buttons/fields from screen when user is not logged in.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

Conflicts:
	Open-ILS/src/templates/circ/selfcheck/banner.tt2
---
 Open-ILS/src/templates/circ/selfcheck/banner.tt2   | 14 ++++-----
 .../src/templates/circ/selfcheck/holds_page.tt2    |  4 +--
 Open-ILS/src/templates/circ/selfcheck/main.tt2     |  5 ++-
 Open-ILS/web/css/skin/default/selfcheck.css        | 20 ++++++------
 Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js |  2 +-
 .../web/js/ui/default/circ/selfcheck/selfcheck.js  | 36 +++++++---------------
 6 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/Open-ILS/src/templates/circ/selfcheck/banner.tt2 b/Open-ILS/src/templates/circ/selfcheck/banner.tt2
index e91625accf..73adc8da44 100644
--- a/Open-ILS/src/templates/circ/selfcheck/banner.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/banner.tt2
@@ -1,15 +1,13 @@
-<div id='oils-selfck-user-banner'></div>
 <div id='oils-selfck-logo-div'>
-    <img src='[% ctx.media_prefix %]/images/pines_logo_selfcheck.png'/>
+    <img src='[% ctx.media_prefix %]/images/pines_logo_selfcheck.png' style="height:50px;"/><br/>
+	<p style="color:#fff;font-weight:normal;font-size:1.1em;margin-top:5px;padding:0px;">
+	Use this self-check station to check out and renew your items.</p>
 </div>
-<br/>
-<br/>
+<div id='oils-selfck-user-banner'></div>
+
 <div id='oils-selfck-scan-div'>
     <div id='oils-selfck-scan-text'></div>
-    <br/>
-    <input jsId='selfckScanBox' dojoType='dijit.form.TextBox'/>
-    <br/>
-    <br/>
+    <input jsId='selfckScanBox' dojoType='dijit.form.TextBox' style="padding:2px;margin:5px;" />
 </div>
 <div id='oils-selfck-status-div'></div>
 
diff --git a/Open-ILS/src/templates/circ/selfcheck/holds_page.tt2 b/Open-ILS/src/templates/circ/selfcheck/holds_page.tt2
index 601c45d41d..c049f18529 100644
--- a/Open-ILS/src/templates/circ/selfcheck/holds_page.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/holds_page.tt2
@@ -5,7 +5,7 @@
                 <td id='oils-self-hold-pic-cell'></td>
                 <td>[% l('Title') %]</td>
                 <td>[% l('Author') %]</td>
-                <td>[% l('Status') %]</td>
+                <td class="hidden">[% l('Status') %]</td>
             </tr>
         </thead>
         <tbody id='oils-selfck-hold-tbody'>
@@ -13,7 +13,7 @@
                 <td><img class='oils-selfck-jacket' name='jacket'/></td>
                 <td name='title'></td>
                 <td name='author'></td>
-                <td name='status'></td>
+                <td name='status' class="hidden"></td>
             </tr>
         </tbody>
     </table>
diff --git a/Open-ILS/src/templates/circ/selfcheck/main.tt2 b/Open-ILS/src/templates/circ/selfcheck/main.tt2
index 6f571391d0..0588c60ba3 100644
--- a/Open-ILS/src/templates/circ/selfcheck/main.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/main.tt2
@@ -5,14 +5,13 @@
 <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/selfcheck.css'/>
 [% INCLUDE 'circ/selfcheck/audio_config.tt2' %]
 [% INCLUDE 'circ/selfcheck/logout_dialog.tt2' %]
-
 <div id='oils-selfck-top-div'>
     [% INCLUDE 'circ/selfcheck/banner.tt2' %]
 </div>
-<div id='oils-selfck-bottom-div'>
+<div id='oils-selfck-bottom-div' class="hidden">
     <div id='oils-selfck-content-div'>
         <div id='oils-selfck-content-header'>
-            <span><a id='oils-selfck-print-list-link' href='javascript:void(0);'><button type="button" class="self-button">[% l('Print List') %]</button></a></span>
+            <span><a id='oils-selfck-print-list-link' href='javascript:void(0);'><button type="button" class="self-button">[% l('Print This List') %]</button></a></span>
         </div>
         <div id='oils-selfck-circ-page' class='hidden'>
             <!-- Checkout / renewal and items out interface -->
diff --git a/Open-ILS/web/css/skin/default/selfcheck.css b/Open-ILS/web/css/skin/default/selfcheck.css
index 23bd38819f..4085e80e8f 100644
--- a/Open-ILS/web/css/skin/default/selfcheck.css
+++ b/Open-ILS/web/css/skin/default/selfcheck.css
@@ -23,18 +23,20 @@ body {
 }
 
 #oils-selfck-user-banner {
-    position:fixed;
-    top:30px;
-    /*right:30px;*/
     color: white;
+	font-weight:bold;
+	font-size:1.2em;
+	padding:0px;
+	margin:0px 0px 10px 0px;
 }
 
 #oils-selfck-logo-div {
-    /*margin: 20px;*/
+    /*margin: 10px;*/
 }
 
 #oils-selfck-scan-text {
-    font-size: 16px;
+    font-size: 1.2em;
+	font-weight:normal;
     background: none repeat scroll 0 0 #252525;
     color: white;
     padding: 10px;
@@ -90,14 +92,14 @@ body {
 #oils-selfck-content-header {
     text-align: right;
     width: 100%;
-    margin-top: 18px;
+    margin-top: 2px;
 }
 #oils-selfck-content-header span {
     padding-left: 5px;
 }
 
 #oils-selfck-info-nav {
-    margin: 15px 10px 15px 10px;
+    margin: 0px 10px 10px 10px;
     padding: 8px;
 }
 
@@ -143,8 +145,7 @@ body {
 
 #oils-selfck-status-div {
     background: white;
-    height: 20px;
-    padding-top: 10px;
+    height: 10px;
     font-weight: bold;
     vertical-align: middle;
     color: red;
@@ -177,6 +178,7 @@ body {
     padding: 5px 10px 6px;
     outline: 0 none;
     text-decoration: none;
+	margin: 3px;
 }
 
 A {
diff --git a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
index 438d55678b..884b7945b1 100644
--- a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
+++ b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
@@ -19,7 +19,7 @@
     "WORKSTATION_EXISTS" : "This workstation has already been registered.  Would you like to use it for this self-check station?",
     "CC_PAYABLE_BALANCE" : "Total amount to pay: $${0}",
     "TOTAL_FINES_SELECTED" : "Selected total: $${0}",
-    "WELCOME_BANNER" : "Welcome, ${0}",
+    "WELCOME_BANNER" : "Welcome, ${0}!",
     "ENTER_PASSWORD" : "Please enter your password",
     "PLEASE_LOGIN" : "Please log in with your username or library barcode.",
     "ENTER_BARCODE" : "Please enter an item barcode",
diff --git a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
index 61ec139208..edce285d48 100644
--- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
@@ -100,6 +100,8 @@ function SelfCheckManager() {
 
     this.checkouts = [];
     this.itemsOut = [];
+	this.holds = [];
+	this.fines = [];
 
     // During renewals, keep track of the ID of the previous circulation. 
     // Previous circ is used for tracking failed renewals (for receipts).
@@ -540,6 +542,7 @@ SelfCheckManager.prototype.updateScanBox = function(args) {
  */
 SelfCheckManager.prototype.drawCircPage = function() {
 
+    openils.Util.show('oils-selfck-bottom-div');
     openils.Util.show('oils-selfck-circ-tbody', 'table-row-group');
     this.goToTab('checkout');
 
@@ -791,6 +794,8 @@ SelfCheckManager.prototype.drawHoldsPage = function() {
                     return;
                 }
 
+				self.holds = ids;	
+								
                 fieldmapper.standardRequest( // fetch the hold objects with fleshed details
                     ['open-ils.circ', 'open-ils.circ.hold.details.batch.retrieve'],
                     {   async : true,
@@ -801,6 +806,7 @@ SelfCheckManager.prototype.drawHoldsPage = function() {
                         }
                     }
                 );
+				
             }
         }
     );
@@ -1386,7 +1392,6 @@ SelfCheckManager.prototype.printData = function(data, numItems, callback) {
  * Print a receipt for this user's items out
  */
 SelfCheckManager.prototype.printItemsOutReceipt = function(callback) {
-
     if(!this.itemsOut.length) return;
 
     progressDialog.show(true);
@@ -1426,39 +1431,20 @@ SelfCheckManager.prototype.printItemsOutReceipt = function(callback) {
 }
 
 /**
- * Print a receipt for this user's items out
+ * Print a receipt for this user's holds
  */
 SelfCheckManager.prototype.printHoldsReceipt = function(callback) {
-
     if(!this.holds.length) return;
 
     progressDialog.show(true);
 
-    var holdIds = [];
-    var holdData = [];
-
-    dojo.forEach(this.holds,
-        function(data) {
-            holdIds.push(data.hold.id());
-            if(data.status == 4) {
-                holdData.push({ready : true});
-            } else {
-                holdData.push({
-                    queue_position : data.queue_position, 
-                    potential_copies : data.potential_copies
-                });
-            }
-        }
-    );
-
     var params = [
         this.authtoken, 
         this.staff.ws_ou(),
         null,
         'format.selfcheck.holds',
         'print-on-demand',
-        holdIds,
-        holdData
+        this.holds
     ];
 
     var self = this;
@@ -1517,10 +1503,10 @@ SelfCheckManager.prototype.printPaymentReceipt = function(response, callback) {
 }
 
 /**
- * Print a receipt for this user's items out
+ * Print a receipt for this user's fines
  */
 SelfCheckManager.prototype.printFinesReceipt = function(callback) {
-
+    if(!this.finesData.length) return;
     progressDialog.show(true);
 
     var params = [
@@ -1529,7 +1515,7 @@ SelfCheckManager.prototype.printFinesReceipt = function(callback) {
         null,
         'format.selfcheck.fines',
         'print-on-demand',
-        [this.patron.id()]
+        this.patron.id()
     ];
 
     var self = this;
-- 
2.11.0