implemented items out page. made printing of top-level receipt optional. trimmed...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15060 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 e3b75ac..d8dd7b5 100644 (file)
--- a/Open-ILS/web/css/skin/default/selfcheck.css
+++ b/Open-ILS/web/css/skin/default/selfcheck.css
@@ -1,7 +1,7 @@
 
 body {
     font-family: Arial, Verdana;
-    font-size: 14px;
+    font-size: 13px;
 }
 
 #oils-selfck-top-div {
@@ -79,8 +79,8 @@ body {
 }
 
 #oils-selfck-info-nav span {
-    padding-left: 10px;
-    padding-right: 10px;
+    padding-left: 8px;
+    padding-right: 8px;
 }
 
 #oils-selfck-info-nav span.selected {

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 95fd2bd..173499b 100644 (file)
--- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
@@ -77,6 +77,9 @@ SelfCheckManager.prototype.init = function() {
     this.authtoken = openils.User.authtoken;
     this.loadOrgSettings();
 
+    this.circTbody = dojo.byId('oils-selfck-circ-tbody');
+    this.itemsOutTbody = dojo.byId('oils-selfck-circ-out-tbody');
+
     // workstation is required but none provided
     if(this.orgSettings[SET_WORKSTATION_REQUIRED] && !this.workstation) {
         alert(dojo.string.substitute(localeStrings.WORKSTATION_REQUIRED));
@@ -87,11 +90,13 @@ SelfCheckManager.prototype.init = function() {
     // connect onclick handlers to the various navigation links
     var linkHandlers = {
         'oils-selfck-hold-details-link' : function() { self.drawHoldsPage(); },
-        'oils-selfck-nav-holds' : function() { self.drawHoldsPage(); },
+        //'oils-selfck-nav-holds' : function() { self.drawHoldsPage(); },
         'oils-selfck-pay-fines-link' : function() { self.drawFinesPage(); },
-        'oils-selfck-nav-fines' : function() { self.drawFinesPage(); },
+        //'oils-selfck-nav-fines' : function() { self.drawFinesPage(); },
         'oils-selfck-nav-home' : function() { self.drawCircPage(); },
-        'oils-selfck-nav-logout' : function() { self.logoutPatron(); }
+        'oils-selfck-nav-logout' : function() { self.logoutPatron(); },
+        'oils-selfck-nav-logout-print' : function() { self.logoutPatron(true); },
+        'oils-selfck-items-out-details-link' : function() { self.drawItemsOutPage(); }
     }
 
     for(var id in linkHandlers) 
@@ -293,6 +298,11 @@ SelfCheckManager.prototype.updateScanBox = function(args) {
  */
 SelfCheckManager.prototype.drawCircPage = function() {
 
+    openils.Util.show('oils-selfck-circ-tbody');
+
+    while(this.itemsOutTbody.childNodes[0])
+        this.itemsOutTbody.removeChild(this.itemsOutTbody.childNodes[0]);
+
     var self = this;
     this.updateScanBox({
         msg : 'Please enter an item barcode', // TODO i18n
@@ -303,7 +313,6 @@ SelfCheckManager.prototype.drawCircPage = function() {
     openils.Util.hide('oils-selfck-holds-page');
     openils.Util.show('oils-selfck-circ-page');
 
-    this.circTbody = dojo.byId('oils-selfck-circ-tbody');
     if(!this.circTemplate)
         this.circTemplate = this.circTbody.removeChild(dojo.byId('oils-selfck-circ-row'));
 
@@ -338,6 +347,51 @@ SelfCheckManager.prototype.drawCircPage = function() {
     }
 }
 
+SelfCheckManager.prototype.drawItemsOutPage = function() {
+    openils.Util.hide('oils-selfck-circ-tbody');
+    openils.Util.hide('oils-selfck-payment-page');
+    openils.Util.hide('oils-selfck-holds-page');
+    openils.Util.show('oils-selfck-circ-page');
+
+    while(this.itemsOutTbody.childNodes[0])
+        this.itemsOutTbody.removeChild(this.itemsOutTbody.childNodes[0]);
+
+    progressDialog.show(true);
+    
+    var self = this;
+    fieldmapper.standardRequest(
+        ['open-ils.circ', 'open-ils.circ.actor.user.checked_out.atomic'],
+        {
+            async : true,
+            params : [this.authtoken, this.patron.id()],
+            oncomplete : function(r) {
+
+                var resp = openils.Util.readResponse(r);
+
+                var circs = resp.sort(
+                    function(a, b) {
+                        if(a.circ.due_date() > b.circ.due_date())
+                            return -1;
+                        return 1;
+                    }
+                );
+
+                progressDialog.hide();
+
+                dojo.forEach(circs,
+                    function(circ) {
+                        self.displayCheckout(
+                            {payload : circ}, 
+                            (circ.circ.parent_circ()) ? 'renew' : 'checkout',
+                            true
+                        );
+                    }
+                );
+            }
+        }
+    );
+}
+
 SelfCheckManager.prototype.updateHoldsSummary = function() {
 
     if(!this.holdsSummary) {
@@ -731,7 +785,7 @@ SelfCheckManager.prototype.renew = function(barcode, override) {
 /**
  * Display the result of a checkout or renewal in the items out table
  */
-SelfCheckManager.prototype.displayCheckout = function(evt, type) {
+SelfCheckManager.prototype.displayCheckout = function(evt, type, itemsOut) {
 
     var copy = evt.payload.copy;
     var record = evt.payload.record;
@@ -753,7 +807,9 @@ SelfCheckManager.prototype.displayCheckout = function(evt, type) {
         dojo.date.locale.format(date, {selector : 'date'});
 
     // put new circs at the top of the list
-    this.circTbody.insertBefore(row, this.circTbody.getElementsByTagName('tr')[0]);
+    var tbody = this.circTbody;
+    if(itemsOut) tbody = this.itemsOutTbody;
+    tbody.insertBefore(row, tbody.getElementsByTagName('tr')[0]);
 }
 
 
@@ -865,8 +921,8 @@ SelfCheckManager.prototype.printData = function(data, numItems, callback) {
 /**
  * Logout the patron and return to the login page
  */
-SelfCheckManager.prototype.logoutPatron = function() {
-    if(this.checkouts.length) {
+SelfCheckManager.prototype.logoutPatron = function(print) {
+    if(print && this.checkouts.length) {
         this.printReceipt(
             function() {
                 location.href = location.href;

diff --git a/Open-ILS/web/templates/default/circ/selfcheck/circ_page.tt2 b/Open-ILS/web/templates/default/circ/selfcheck/circ_page.tt2
index 0b8d961..953b8ca 100644 (file)
--- a/Open-ILS/web/templates/default/circ/selfcheck/circ_page.tt2
+++ b/Open-ILS/web/templates/default/circ/selfcheck/circ_page.tt2
@@ -25,5 +25,6 @@
                 </td>
             </tr>
         </tbody>
+        <tbody id='oils-selfck-circ-out-tbody' class='oils-selfck-item-table'/>
     </table>
 </div>