initial inline status text, some cleanup

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14965 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/css/skin/default/selfcheck.css b/Open-ILS/web/css/skin/default/selfcheck.css
index 2df9216..e3b75ac 100644 (file)
--- a/Open-ILS/web/css/skin/default/selfcheck.css
+++ b/Open-ILS/web/css/skin/default/selfcheck.css
@@ -48,7 +48,7 @@ body {
 
 .oils-selfck-item-table td {
     text-align: left;
-    padding: 10px;
+    padding: 7px;
 }
 
 .oils-selfck-item-table thead {
@@ -59,10 +59,6 @@ body {
     border-bottom: 1px solid #888;
 }
 
-.oils-selfck-item-table tbody td {
-    padding:10px;
-}
-
 
 #oils-selfck-content-div {
     width: 70%;
@@ -106,4 +102,12 @@ body {
     padding: 3px;
 }
 
+#oils-selfck-status-div {
+    height: 20px;
+    padding: 10px;
+    font-weight: bold;
+    vertical-align: middle;
+    color: red;
+}
+
 

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 64ac970..6e4a6b4 100644 (file)
--- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
@@ -207,7 +207,11 @@ SelfCheckManager.prototype.loginPatron = function(barcode, passwd) {
  */
 SelfCheckManager.prototype.updateScanBox = function(args) {
 
-    selfckScanBox.attr('value', '');
+    if(args.select) {
+        selfckScanBox.domNode.select();
+    } else {
+        selfckScanBox.attr('value', '');
+    }
 
     if(args.value)
         selfckScanBox.attr('value', args.value);
@@ -372,18 +376,23 @@ SelfCheckManager.prototype.drawHoldsPage = function() {
 
     var self = this;
     fieldmapper.standardRequest( // fetch the hold IDs
+
         ['open-ils.circ', 'open-ils.circ.holds.id_list.retrieve'],
         {   async : true,
             params : [this.authtoken, this.patron.id()],
 
             oncomplete : function(r) { 
                 var ids = openils.Util.readResponse(r);
-                if(!ids || ids.length == 0) return;
+                if(!ids || ids.length == 0) {
+                    progressDialog.hide();
+                    return;
+                }
 
                 fieldmapper.standardRequest( // fetch the hold objects with fleshed details
                     ['open-ils.circ', 'open-ils.circ.hold.details.batch.retrieve.atomic'],
                     {   async : true,
                         params : [self.authtoken, ids],
+
                         oncomplete : function(rr) {
                             self.drawHolds(openils.Util.readResponse(rr));
                         }
@@ -497,8 +506,12 @@ SelfCheckManager.prototype.checkout = function(barcode, override) {
                 break;
 
             case 'NO_SESSION':
-                // TODO logout staff
+                // TODO logout staff?
                 break;
+
+            default:
+                dojo.byId('oils-selfck-status-div').innerHTML = evt.textcode;
+                this.updateScanBox({select:true});
         }
     }
 

diff --git a/Open-ILS/web/templates/default/circ/selfcheck/main.tt2 b/Open-ILS/web/templates/default/circ/selfcheck/main.tt2
index 585bf89..0a9031c 100644 (file)
--- a/Open-ILS/web/templates/default/circ/selfcheck/main.tt2
+++ b/Open-ILS/web/templates/default/circ/selfcheck/main.tt2
@@ -12,6 +12,7 @@
         <div id='oils-selfck-scan-text'></div>
         <input jsId='selfckScanBox' dojoType='dijit.form.TextBox'></input>
     </div>
+    <div id='oils-selfck-status-div'></div>
 </div>
 <div id='oils-selfck-bottom-div'>
     <div id='oils-selfck-content-div'>

diff --git a/Open-ILS/web/templates/default/circ/selfcheck/summary.tt2 b/Open-ILS/web/templates/default/circ/selfcheck/summary.tt2
index b69cf8e..ab776e6 100644 (file)
--- a/Open-ILS/web/templates/default/circ/selfcheck/summary.tt2
+++ b/Open-ILS/web/templates/default/circ/selfcheck/summary.tt2
@@ -1,8 +1,8 @@
 <div id='oils-selfck-circ-info-div'>
     <div id='oils-selfck-info-nav'>
         <span><a id='oils-selfck-nav-home' href='javascript:void(0);' class='selected'>Home</a></span>
-        <span><a id='oils-selfck-nav-holds' href='javascript:void(0);'>My Holds</a></span>
-        <span><a id='oils-selfck-nav-fines' href='javascript:void(0);'>Pay Fines</a></span>
+        <span><a id='oils-selfck-nav-holds' href='javascript:void(0);'>Holds</a></span>
+        <span><a id='oils-selfck-nav-fines' href='javascript:void(0);'>Fines</a></span>
         <span><a id='oils-selfck-nav-logout' href='javascript:void(0);'>Log Out</a></span>
     </div>
     <fieldset>