From c2179af664f79da278654ad13abc5fe010b3e062 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Fri, 1 Feb 2013 15:50:29 -0500
Subject: [PATCH] Selfcheck staff mode, rev 1

Supports checkin mode with backdate and amnesty checkin.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
---
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |   4 +-
 .../Pg/upgrade/XXXX.data.selfcheck-staff-mode.sql  |  17 ++
 Open-ILS/src/templates/circ/selfcheck/banner.tt2   |  10 +-
 .../src/templates/circ/selfcheck/checkin_page.tt2  |  47 +++
 Open-ILS/src/templates/circ/selfcheck/main.tt2     |  10 +
 Open-ILS/src/templates/circ/selfcheck/summary.tt2  |   1 +
 Open-ILS/web/css/skin/default/selfcheck.css        |  47 ++-
 Open-ILS/web/js/dojo/openils/Event.js              |   1 +
 Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js |   8 +-
 .../web/js/ui/default/circ/selfcheck/selfcheck.js  | 322 +++++++++++++++++++--
 10 files changed, 442 insertions(+), 25 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck-staff-mode.sql
 create mode 100644 Open-ILS/src/templates/circ/selfcheck/checkin_page.tt2

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 88051810eb..a7c7cc2389 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1573,7 +1573,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
  ( 541, 'ADMIN_TOOLBAR_FOR_WORKSTATION', oils_i18n_gettext( 541,
         'Allows a user to create, edit, and delete custom toolbars for workstations', 'ppl', 'description')),
  ( 542, 'ADMIN_TOOLBAR_FOR_USER', oils_i18n_gettext( 542,
-        'Allows a user to create, edit, and delete custom toolbars for users', 'ppl', 'description'))
+        'Allows a user to create, edit, and delete custom toolbars for users', 'ppl', 'description')),
+ ( 543, 'SELFCHECK_STAFF_MODE', oils_i18n_gettext( 543,
+        'Activates staff mode for the selcheck UI for users that have this permission', 'ppl', 'description')),
 ;
 
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck-staff-mode.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck-staff-mode.sql
new file mode 100644
index 0000000000..c73ba20752
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck-staff-mode.sql
@@ -0,0 +1,17 @@
+
+BEGIN;
+
+-- TODO version
+
+INSERT INTO permission.perm_list ( id, code, description ) VALUES (
+    543, -- verify
+    'SELFCHECK_STAFF_MODE',
+    oils_i18n_gettext(
+        543, -- verify
+        'Activates staff mode for the selcheck UI for users that have this permission',
+        'ppl',
+        'description'
+    )
+);
+
+COMMIT;
diff --git a/Open-ILS/src/templates/circ/selfcheck/banner.tt2 b/Open-ILS/src/templates/circ/selfcheck/banner.tt2
index cda4866c91..77a710441b 100644
--- a/Open-ILS/src/templates/circ/selfcheck/banner.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/banner.tt2
@@ -1,4 +1,12 @@
-<div id='oils-selfck-user-banner'></div>
+<div id='oils-selfck-user-info'>
+    <div id='oils-selfck-user-banner'></div>
+    <div id='oils-selfck-user-details' class='hidden'>
+        <div id='oils-selfck-user-name'></div>
+        <div id='oils-selfck-user-home-ou'></div>
+        <div id='oils-selfck-user-profile'></div>
+        <div id='oils-selfck-user-address'></div>
+    </div>
+</div>
 <div id='oils-selfck-logo-div'>
     <img src='[% ctx.media_prefix %]/images/eg_logo.jpg'/>
 </div>
diff --git a/Open-ILS/src/templates/circ/selfcheck/checkin_page.tt2 b/Open-ILS/src/templates/circ/selfcheck/checkin_page.tt2
new file mode 100644
index 0000000000..5ccb2683e8
--- /dev/null
+++ b/Open-ILS/src/templates/circ/selfcheck/checkin_page.tt2
@@ -0,0 +1,47 @@
+<div id='oils-selfck-checkin-table-div'>
+    <div id='oils-selfck-checkin-mods'>
+        <span class='oils-selfck-checkin-mod'>
+            <span>[% l('Backdate') %]</span>
+            <span><input 
+                id='oils-selfchk-backdate'
+                style='width: 8em;'
+                constraints='{max: new Date()}'
+                dojoType='dijit.form.DateTextBox' 
+                jsId='checkinBackdateInput'/>
+            </span>
+        </span>
+        <span class='oils-selfck-checkin-mod'>
+            <span>[% l('Amnesty Mode') %]</span>
+            <span><input 
+                id='oils-selfchk-amnesty-mode' 
+                type='checkbox' 
+                checked='checked'/>
+            </span>
+        </span>
+    </div>
+    <table id='oils-selfck-checkin-table' class='oils-selfck-item-table'>
+        <thead>
+            <tr>
+                <td id='oils-self-checkin-pic-cell'></td>
+                <td>[% l('Barcode') %]</td>
+                <td>[% l('Title') %]</td>
+                <td>[% l('Author') %]</td>
+                <td>[% l('Due Date') %]</td>
+                <td>[% l('Copy Status') %]</td>
+                <td>[% l('Outcome') %]</td>
+            </tr>
+        </thead>
+        <tbody id='oils-selfck-checkin-tbody'>
+            <tr id='oils-selfck-checkin-row'>
+                <td><img class='oils-selfck-jacket' name='jacket'/></td>
+                <td name='barcode'></td>
+                <td name='title'><img src='/opac/images/progressbar_green.gif'/></td>
+                <td name='author'></td>
+                <td name='due_date'></td>
+                <td name='status'></td>
+                <td name='outcome'></td>
+            </tr>
+        </tbody>
+        <tbody id='oils-selfck-checkin-out-tbody' class='oils-selfck-item-table'></tbody>
+    </table>
+</div>
diff --git a/Open-ILS/src/templates/circ/selfcheck/main.tt2 b/Open-ILS/src/templates/circ/selfcheck/main.tt2
index 42aaf49319..f5b3aafefe 100644
--- a/Open-ILS/src/templates/circ/selfcheck/main.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/main.tt2
@@ -17,6 +17,10 @@
             <!-- Checkout / renewal and items out interface -->
             [% INCLUDE 'circ/selfcheck/circ_page.tt2' %]
         </div>
+        <div id='oils-selfck-checkin-page' class='hidden'>
+            <!-- Checkin interface; Staff only -->
+            [% INCLUDE 'circ/selfcheck/checkin_page.tt2' %]
+        </div>
         <div id='oils-selfck-holds-page' class='hidden'>
             <!-- Patron holds interface -->
             [% INCLUDE 'circ/selfcheck/holds_page.tt2' %]
@@ -34,6 +38,12 @@
         [% INCLUDE 'circ/selfcheck/summary.tt2' %]
     </div>
 </div>
+<div id='oils-selfchk-staff-actions' class='hidden'>
+    <span>
+        <a id='oils-selfchk-staff-logout' 
+            href='javascript:;'>[% l('Staff Logout') %]</a>
+    </span>
+</div>
 <div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div>
 <div dojoType="dijit.Dialog" jsId='oilsSelfckWsDialog' class='oils-login-dialog' style='display:none;'>
     <form>
diff --git a/Open-ILS/src/templates/circ/selfcheck/summary.tt2 b/Open-ILS/src/templates/circ/selfcheck/summary.tt2
index 652815cb3c..c67f23a5b8 100644
--- a/Open-ILS/src/templates/circ/selfcheck/summary.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/summary.tt2
@@ -1,6 +1,7 @@
 <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'>[% l('Home') %]</a></span>
+        <span class='hidden'><a id='oils-selfck-nav-checkin' href='javascript:void(0);'>[% l('Checkin') %]</a></span>
         <span><a id='oils-selfck-nav-logout-print' href='javascript:void(0);'>[% l('Logout') %]</a></span>
         <span><a id='oils-selfck-nav-logout' href='javascript:void(0);'>[% l('Logout (No Receipt)') %]</a></span>
     </div>
diff --git a/Open-ILS/web/css/skin/default/selfcheck.css b/Open-ILS/web/css/skin/default/selfcheck.css
index 986b46f597..063a846179 100644
--- a/Open-ILS/web/css/skin/default/selfcheck.css
+++ b/Open-ILS/web/css/skin/default/selfcheck.css
@@ -12,12 +12,17 @@ body {
     font-weight:bold;
 }
 
-#oils-selfck-user-banner {
+#oils-selfck-user-info {
     position:fixed;
     top:30px;
     right:30px;
 }
 
+#oils-selfck-user-details {
+    text-align: left;
+    padding-right: 15px;
+}
+
 #oils-selfck-logo-div {
     margin: 20px;
 }
@@ -74,9 +79,10 @@ body {
 
 #oils-selfck-content-header {
     margin: 8px 10px 15px 10px;
-    padding: 8px;
+    padding: 10px 0 3px 0;
     border-bottom: 1px dashed #888;
     text-align: right;
+    line-height: 200%;  /* to line up with #oils-selfck-info-nav span */
     width: 100%;
 }
 #oils-selfck-content-header span {
@@ -92,12 +98,23 @@ body {
 #oils-selfck-circ-info-div span {
     padding-right: 8px;
 }
+
+
 #oils-selfck-info-nav span {
-    padding-left: 8px;
+    /* padding-left: 8px; */
+    line-height: 200%;
+}
+
+#oils-selfck-info-nav a {
+    padding-left: 4px;
+    padding-right: 4px;
+    padding-top: 4px;
+    white-space: nowrap;
 }
 
-#oils-selfck-info-nav span.selected {
+#oils-selfck-info-nav .selected {
     background-color: #e0e0e0;
+    border: 1px solid #333;
 }
 
 #oils-selfck-circ-info-div fieldset {
@@ -132,4 +149,26 @@ body {
     padding: 5px;
 }
 
+#oils-selfck-checkin-mods {
+   text-align: right;
+   border-bottom: 1px solid #333;
+   background-color: #e0e0e0;
+   padding: 10px;
+}
+
+.oils-selfck-checkin-mod {
+    border-left: 1px solid #333;
+    padding-left: 8px;
+    padding-left: 8px;
+}
 
+#oils-selfchk-staff-actions {
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+    text-align: right;
+    padding-left: 10px;
+    padding: 10px;
+    background-color: #e0e0e0;
+    border-top: 2px solid #333;
+}
diff --git a/Open-ILS/web/js/dojo/openils/Event.js b/Open-ILS/web/js/dojo/openils/Event.js
index b2bf745682..9d518ad2b7 100644
--- a/Open-ILS/web/js/dojo/openils/Event.js
+++ b/Open-ILS/web/js/dojo/openils/Event.js
@@ -30,6 +30,7 @@ if(!dojo._hasResource["openils.Event"]) {
             this.ilsperm = kwargs.ilsperm;
             this.ilspermloc = kwargs.ilspermloc;
             this.note = kwargs.note;
+            this.source = kwargs; // capture anything unexpected
         },
 
         toString : function() {
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 766fcbc8ae..7202e300f5 100644
--- a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
+++ b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
@@ -40,6 +40,12 @@
     "FAIL_PART_no_matchpoint": "System rules do not define how to handle this item",
     "FAIL_PART_no_user": "The system could not find this patron",
     "FAIL_PART_transit_range": "The item cannot transit this far",
-    "PAYMENT_INVALID_USER_XACT_ID" : "We cannot proceed with the payment, because your account was updated from another location.  Please refresh the interface or log out and back in to retrieve the latest account information"
+    "PAYMENT_INVALID_USER_XACT_ID" : "We cannot proceed with the payment, because your account was updated from another location.  Please refresh the interface or log out and back in to retrieve the latest account information",
+    "ADDRESS": "${0} ${1}<br/>${2}, ${3} ${4}",
+    "CHECKIN_SUCCESS" : "Successfully checked in ${0}",
+    "CHECKIN_NO_CHANGE" : "No change on checkin for ${0}",
+    "CHECKIN_ROUTE_ITEM" : "Item ${0} should be routed to ${1}",
+    "CHECKOUT_PROMPT" : "Please an item barcode to check out",
+    "CHECKIN_PROMPT" : "Please an item barcode to check in"
 }
 
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 0b47be3913..5d6f7a03a7 100644
--- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
@@ -2,11 +2,13 @@ dojo.require('dojo.date.locale');
 dojo.require('dojo.cookie');
 dojo.require('dojo.date.stamp');
 dojo.require('dijit.form.CheckBox');
+dojo.require('dijit.form.DateTextBox');
 dojo.require('dijit.form.NumberSpinner');
 dojo.require('openils.CGI');
 dojo.require('openils.Util');
 dojo.require('openils.User');
 dojo.require('openils.Event');
+dojo.require('openils.PermaCrud');
 dojo.require('openils.widget.ProgressDialog');
 dojo.require('openils.widget.OrgUnitFilteringSelect');
 
@@ -56,6 +58,11 @@ function SelfCheckManager() {
     // dict of org unit settings for "here"
     this.orgSettings = {};
 
+    // true if we are exposing staff-only features (e.g. checkin)
+    this.staffMode = false;
+
+    this.copyStatusMap = {};
+
     // Construct a mock checkout for debugging purposes
     if(this.mockCheckouts = this.cgi.param('mock-circ')) {
 
@@ -87,18 +94,54 @@ SelfCheckManager.prototype.setupStaffLogin = function(verify) {
     this.authtoken = openils.User.authtoken;
 }
 
+SelfCheckManager.prototype.logoutStaff = function() {
+    // remove the authtoken
+    dojo.cookie('ses', null, {expires:-1, path:'/'}); 
+    // reload the page, which displays the login dialog
+    location.href = location.href;
+}
+
+SelfCheckManager.prototype.activateStaffMode = function(permorgs) {
+    var self = this;
+
+    // make sure this staff account has the needed permission here
+    if (permorgs.indexOf(Number(this.staff.ws_ou())) == -1) return;
+
+    this.staffMode = true;
+
+    openils.Util.show(
+        dojo.byId('oils-selfck-nav-checkin').parentNode, 
+        'inline'
+    );
+
+    openils.Util.show(dojo.byId('oils-selfchk-staff-actions'));
+
+    dojo.byId('oils-selfchk-staff-logout').onclick = function() {
+        self.logoutStaff();
+    };
+}
 
 
 /**
  * Fetch the org-unit settings, initialize the display, etc.
  */
 SelfCheckManager.prototype.init = function() {
+    var self = this;
 
     this.setupStaffLogin();
     this.loadOrgSettings();
+    this.loadCopyStatuses();
+
+    // are we in staff mode?
+    new openils.User().getPermOrgList(['SELFCHECK_STAFF_MODE'], 
+        function(orglist) { self.activateStaffMode(orglist) },
+        true, true
+    );
 
     this.circTbody = dojo.byId('oils-selfck-circ-tbody');
+    this.checkinTbody = dojo.byId('oils-selfck-checkin-tbody');
     this.itemsOutTbody = dojo.byId('oils-selfck-circ-out-tbody');
+    this.itemsCheckinTbody = dojo.byId('oils-selfck-checkin-out-tbody');
 
     // workstation is required but none provided
     if(this.orgSettings[SET_WORKSTATION_REQUIRED] && !this.workstation) {
@@ -108,7 +151,6 @@ SelfCheckManager.prototype.init = function() {
         return;
     }
     
-    var self = this;
     // connect onclick handlers to the various navigation links
     var linkHandlers = {
         'oils-selfck-hold-details-link' : function() { self.drawHoldsPage(); },
@@ -143,6 +185,7 @@ SelfCheckManager.prototype.init = function() {
             );
         },
         'oils-selfck-nav-home' : function() { self.drawCircPage(); },
+        'oils-selfck-nav-checkin' : function() { self.drawCheckinPage(); },
         '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(); },
@@ -176,6 +219,20 @@ SelfCheckManager.prototype.init = function() {
 }
 
 
+SelfCheckManager.prototype.loadCopyStatuses = function() {
+    var self = this;
+    var pcrud = new openils.PermaCrud();
+    pcrud.retrieveAll('ccs', {
+        async : true,
+        oncomplete : function(r) {
+            var list = openils.Util.readResponse(r);
+            dojo.forEach(list, function(stat) {
+                self.copyStatusMap[stat.id()] = stat;
+            });
+        }
+    });
+};
+
 SelfCheckManager.prototype.getSelectedFinesTotal = function() {
     var total = 0;
     dojo.forEach(
@@ -366,7 +423,15 @@ SelfCheckManager.prototype.fetchPatron = function(barcode, usrname) {
     // retrieve the fleshed user by id
     this.patron = fieldmapper.standardRequest(
         ['open-ils.actor', 'open-ils.actor.user.fleshed.retrieve.authoritative'],
-        {params : [this.authtoken, patron_id]}
+        {params : [this.authtoken, patron_id,
+            [   'card',                                                                
+                'cards',
+                'addresses',                                                           
+                'billing_address',                                                     
+                'mailing_address',  
+                'profile'
+            ]
+        ]}
     );
 
     var evt = openils.Event.parse(this.patron);
@@ -394,13 +459,57 @@ SelfCheckManager.prototype.fetchPatron = function(barcode, usrname) {
     } else {
 
         this.handleAlert('', false, 'login-success');
-        dojo.byId('oils-selfck-user-banner').innerHTML = 
-            dojo.string.substitute(localeStrings.WELCOME_BANNER, [this.patron.first_given_name()]);
+
+        if (this.staffMode) {
+            this.drawPatronInfo();
+
+        } else {
+            dojo.byId('oils-selfck-user-banner').innerHTML = 
+                dojo.string.substitute(localeStrings.WELCOME_BANNER, 
+                    [this.patron.first_given_name()]);
+        }
+
+
         this.drawCircPage();
     }
 }
 
 
+SelfCheckManager.prototype.drawPatronInfo = function() {
+
+    openils.Util.show('oils-selfck-user-details');
+
+    var patron = this.patron;
+
+    dojo.byId('oils-selfck-user-name').innerHTML = 
+        openils.User.formalName(patron);
+
+    dojo.byId('oils-selfck-user-home-ou').innerHTML = 
+        fieldmapper.aou.findOrgUnit(patron.home_ou()).shortname();
+
+    dojo.byId('oils-selfck-user-profile').innerHTML = 
+        patron.profile().name();
+
+    var addr = patron.mailing_address() || 
+               patron.billing_address() || 
+               patron.addresses()[0];
+
+    if (addr) {
+
+        dojo.byId('oils-selfck-user-address').innerHTML = 
+            dojo.string.substitute(localeStrings.ADDRESS, [
+                addr.street1(),
+                addr.street2() || '',
+                addr.city(),
+                addr.state(),
+                addr.post_code()
+            ]);
+
+    } else {
+        dojo.byId('oils-selfck-user-address').innerHTML = '';
+    }
+}
+
 SelfCheckManager.prototype.handleAlert = function(message, shouldPopup, sound) {
 
     console.log("Handling alert " + message);
@@ -479,7 +588,7 @@ SelfCheckManager.prototype.drawCircPage = function() {
 
     var self = this;
     this.updateScanBox({
-        msg : 'Please enter an item barcode', // TODO i18n
+        msg : dojo.string.substitute(localeStrings.CHECKOUT_PROMPT),
         handler : function(barcode) { self.checkout(barcode); }
     });
 
@@ -502,6 +611,62 @@ SelfCheckManager.prototype.drawCircPage = function() {
     }
 }
 
+/**
+ * Sets up the checkin page
+ */
+SelfCheckManager.prototype.drawCheckinPage = function() {
+    openils.Util.show('oils-selfck-checkin-tbody', 'table-row-group');
+    this.goToTab('checkin');
+
+    while(this.itemsCheckinTbody.childNodes[0])
+        this.itemsCheckinTbody.removeChild(
+            this.itemsCheckinTbody.childNodes[0]);
+
+    if(!this.checkinTemplate) {
+        this.checkinTemplate = 
+            this.checkinTbody.removeChild(
+                dojo.byId('oils-selfck-checkin-row'));
+    }
+
+    var self = this;
+    this.updateScanBox({
+        msg : dojo.string.substitute(localeStrings.CHECKIN_PROMPT),
+        handler : function(barcode) { self.checkin(barcode); }
+    });
+};
+
+
+SelfCheckManager.prototype.checkin = function(barcode) {
+    var self = this;
+
+    // clear the box now so checkins can continue
+    this.updateScanBox();
+
+    var backdate = checkinBackdateInput.attr('value') || null;
+    if (backdate) backdate = dojo.date.stamp.toISOString(backdate);
+
+    var row = this.checkinTemplate.cloneNode(true);
+    this.byName(row, 'barcode').innerHTML = barcode;
+
+    // put new circs at the top of the list
+    var tbody = this.checkinTbody;
+    tbody.insertBefore(row, tbody.getElementsByTagName('tr')[0]);
+
+    this.checkinCopy({
+        barcode : barcode, 
+        void_overdues : dojo.byId('oils-selfchk-amnesty-mode').checked,
+        backdate : backdate,
+        onload : function(evts) {
+            if (!evts.length) evts = [evts];
+            dojo.forEach(evts, 
+                function(evt) {
+                    self.handleCheckinResult(row, barcode, evt);
+                }
+            );
+        }
+    });
+};
+
 
 SelfCheckManager.prototype.updateFinesSummary = function() {
     var self = this; 
@@ -582,11 +747,21 @@ SelfCheckManager.prototype.goToTab = function(name) {
     openils.Util.hide('oils-selfck-payment-page');
     openils.Util.hide('oils-selfck-holds-page');
     openils.Util.hide('oils-selfck-circ-page');
+    openils.Util.hide('oils-selfck-checkin-page');
     openils.Util.hide('oils-selfck-pay-fines-link');
-    
+
+    dojo.removeClass('oils-selfck-nav-home', 'selected'); 
+    dojo.removeClass('oils-selfck-nav-checkin', 'selected'); 
+
+
     switch(name) {
         case 'checkout':
             openils.Util.show('oils-selfck-circ-page');
+            dojo.addClass('oils-selfck-nav-home', 'selected'); 
+            break;
+        case 'checkin':
+            openils.Util.show('oils-selfck-checkin-page');
+            dojo.addClass('oils-selfck-nav-checkin', 'selected'); 
             break;
         case 'items_out':
             openils.Util.show('oils-selfck-circ-page');
@@ -669,7 +844,7 @@ SelfCheckManager.prototype.updateCircSummary = function(increment) {
 
     if(increment) {
         // local checkout occurred.  Add to the total and the session.
-        this.circSummary.total += 1;
+        this.circSummary.total += increment;
         this.circSummary.session += 1;
     }
 
@@ -869,16 +1044,39 @@ SelfCheckManager.prototype.drawFinesPage = function() {
     );
 }
 
-SelfCheckManager.prototype.checkin = function(barcode, abortTransit) {
-
-    var resp = fieldmapper.standardRequest(
-        ['open-ils.circ', 'open-ils.circ.transit.abort'],
-        {params : [this.authtoken, {barcode : barcode}]}
+/** top-level checkin handler */
+SelfCheckManager.prototype.checkinCopy = function(args) {
+    fieldmapper.standardRequest(
+        ['open-ils.circ', 'open-ils.circ.checkin.override'],
+        {   async : true,
+            params : [
+                this.authtoken, {
+                    copy_barcode : args.barcode,
+                    backdate : args.backdate,
+                    void_overdues : args.void_overdues
+                }
+            ],
+            oncomplete : function(r) {
+                var resp = openils.Util.readResponse(r, true);
+                args.onload(resp);
+            }
+        }
     );
+};
 
-    // resp == 1 on success
-    if(openils.Event.parse(resp))
-        return false;
+/** used for checkins required to fullfil a checkout */
+SelfCheckManager.prototype.inlineCheckinCopy = function(barcode, abortTransit) {
+
+    if (abortTransit) {
+        var resp = fieldmapper.standardRequest(
+            ['open-ils.circ', 'open-ils.circ.transit.abort'],
+            {params : [this.authtoken, {barcode : barcode}]}
+        );
+    
+        // resp == 1 on success
+        if(openils.Event.parse(resp))
+            return false;
+    }
 
     var resp = fieldmapper.standardRequest(
         ['open-ils.circ', 'open-ils.circ.checkin.override'],
@@ -963,6 +1161,94 @@ SelfCheckManager.prototype.failPartMessage = function(result) {
     }
 }
 
+SelfCheckManager.prototype.displayCheckin = function(row, result, outcomeText) {
+    console.log('display checkin results ' + result);
+
+    var copy = result.payload.copy;
+    var record = result.payload.record;
+    var circ = result.payload.circ;
+
+    if(record.isbn()) {
+        this.byName(row, 'jacket').setAttribute('src', 
+            '/opac/extras/ac/jacket/small/' + record.isbn());
+    }
+
+    this.byName(row, 'barcode').innerHTML = copy.barcode();
+    this.byName(row, 'title').innerHTML = record.title();
+    this.byName(row, 'author').innerHTML = record.author();
+    this.byName(row, 'status').innerHTML = this.copyStatusMap[copy.status()].name();
+    this.byName(row, 'outcome').innerHTML = outcomeText || result.textcode;
+
+    if (circ) {
+        var date = dojo.date.stamp.fromISOString(circ.due_date());
+        this.byName(row, 'due_date').innerHTML = 
+            dojo.date.locale.format(date, {selector : 'date'});
+
+        // if a patron is loaded and we just checked an item
+        // in for this patron, decrement the items-out count by 1
+        if (this.patron && this.patron.id() == circ.usr())
+            this.updateCircSummary(-1);
+    }
+}
+
+SelfCheckManager.prototype.handleCheckinResult = function(row, item, result) {
+    var displayText = '';
+    var popup = false;  
+    var sound = ''; // sound file reference
+    var payload = result.payload || {};
+    var tc = result.textcode;
+
+    console.log('checkin resulted in ' + tc);
+
+    if (tc == 'NO_SESSION') {
+
+        return this.logoutStaff();
+
+    } else if (tc == 'SUCCESS') {
+
+        displayText = dojo.string.substitute(
+            localeStrings.CHECKIN_SUCCESS, [item]);
+        this.displayCheckin(row, result);
+
+    } else if (tc == 'NO_CHANGE') {
+
+        displayText = dojo.string.substitute(
+            localeStrings.CHECKIN_NO_CHANGE, [item]);
+        this.displayCheckin(row, result);
+
+    } else if (tc == 'ROUTE_ITEM') {
+
+        var outcomeText;
+        if (result.source.org) {
+            var sn = fieldmapper.aou.findOrgUnit(result.source.org).shortname();
+            displayText = dojo.string.substitute(
+                localeStrings.CHECKIN_ROUTE_ITEM, [item, sn]);
+            outcomeText = tc + ' => ' + sn;
+        }
+
+        this.displayCheckin(row, result, outcomeText);
+
+    } else if (tc == 'ASSET_COPY_NOT_FOUND') {
+
+        // remove the in-progress row
+        row.parentNode.removeChild(row);
+
+        displayText = dojo.string.substitute(
+            localeStrings.ITEM_NOT_CATALOGED, [item]);
+
+    } else {
+
+        // remove the in-progress row
+        row.parentNode.removeChild(row);
+
+        displayText = dojo.string.substitute(
+            localeStrings.UNKNOWN_ERROR, [tc]);
+    }
+
+    this.handleAlert(displayText, popup, sound);
+    return {};
+}
+
 SelfCheckManager.prototype.handleXactResult = function(action, item, result) {
 
     var displayText = '';
@@ -993,7 +1279,7 @@ SelfCheckManager.prototype.handleXactResult = function(action, item, result) {
                 this.updateHoldsSummary();
             }
 
-            this.updateCircSummary(true);
+            this.updateCircSummary(1);
 
         } else if(action == 'renew') {
 
@@ -1037,7 +1323,7 @@ SelfCheckManager.prototype.handleXactResult = function(action, item, result) {
                 overrideEvents && overrideEvents.length &&
                 overrideEvents.indexOf('COPY_STATUS_LOST') != -1) {
 
-                    if(this.checkin(item)) {
+                    if(this.inlineCheckinCopy(item)) {
                         return { doOver : true };
                     }
             }
@@ -1086,7 +1372,7 @@ SelfCheckManager.prototype.handleXactResult = function(action, item, result) {
 
                 if(result[i].textcode == 'COPY_IN_TRANSIT') {
                     // to override a transit, we have to abort the transit and check it in first
-                    if(this.checkin(item, true)) {
+                    if(this.inlineCheckinCopy(item, true)) {
                         return { doOver : true };
                     } else {
                         override = false;
-- 
2.11.0