LP1840773 SCKO Angular

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/scko/banner.component.ts b/Open-ILS/src/eg2/src/app/scko/banner.component.ts
index b6b311e..a5e3062 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/banner.component.ts
+++ b/Open-ILS/src/eg2/src/app/scko/banner.component.ts
@@ -117,7 +117,7 @@ export class SckoBannerComponent implements OnInit {
     }
 
     submitItemBarcode() {
-        console.log('Submitting barcode ', this.itemBarcode);
+        this.scko.resetPatronTimeout();
     }
 }
 

diff --git a/Open-ILS/src/eg2/src/app/scko/fines.component.ts b/Open-ILS/src/eg2/src/app/scko/fines.component.ts
index ab79855..e70b0d7 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/fines.component.ts
+++ b/Open-ILS/src/eg2/src/app/scko/fines.component.ts
@@ -32,6 +32,8 @@ export class SckoFinesComponent implements OnInit {
             return;
         }
 
+        this.scko.resetPatronTimeout();
+
         this.pcrud.search('mbts',
             {   usr: this.scko.patronSummary.id,
                 xact_finish: null,

diff --git a/Open-ILS/src/eg2/src/app/scko/holds.component.ts b/Open-ILS/src/eg2/src/app/scko/holds.component.ts
index bed7a26..81ae44f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/holds.component.ts
+++ b/Open-ILS/src/eg2/src/app/scko/holds.component.ts
@@ -32,6 +32,8 @@ export class SckoHoldsComponent implements OnInit {
             return;
         }
 
+        this.scko.resetPatronTimeout();
+
         const orderBy = [
            {shelf_time: {nulls: 'last'}},
            {capture_time: {nulls: 'last'}},

diff --git a/Open-ILS/src/eg2/src/app/scko/items.component.ts b/Open-ILS/src/eg2/src/app/scko/items.component.ts
index fd76733..9f2bf71 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/items.component.ts
+++ b/Open-ILS/src/eg2/src/app/scko/items.component.ts
@@ -40,6 +40,8 @@ export class SckoItemsComponent implements OnInit {
             return;
         }
 
+        this.scko.resetPatronTimeout();
+
         this.net.request(
             'open-ils.actor',
             'open-ils.actor.user.checked_out.authoritative',

diff --git a/Open-ILS/src/eg2/src/app/scko/scko.service.ts b/Open-ILS/src/eg2/src/app/scko/scko.service.ts
index 03b156f..9927903 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/scko.service.ts
+++ b/Open-ILS/src/eg2/src/app/scko/scko.service.ts
@@ -135,10 +135,11 @@ export class SckoService {
         .then(patron => this.patronSummary = new PatronSummary(patron))
         .then(_ => this.patrons.getVitalStats(this.patronSummary.patron))
         .then(stats => this.patronSummary.stats = stats)
-        .then(_ => this.startPatronTimer());
+        .then(_ => this.resetPatronTimeout());
     }
 
     resetPatronTimeout() {
+        console.debug('Resetting patron timeout=' + this.patronIdleTimeout);
         if (this.patronTimeoutId) {
             clearTimeout(this.patronTimeoutId);
         }
@@ -146,8 +147,6 @@ export class SckoService {
     }
 
     startPatronTimer() {
-        console.debug('Starting patron timeout counter', this.patronIdleTimeout);
-
         this.patronTimeoutId = setTimeout(
             () => this.showPatronLogoutWarning(),
             this.patronIdleTimeout * 1000