From 2f28e7d23d9f7e5562435effd394bb7649b83e10 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 23 Jun 2022 10:59:40 -0400 Subject: [PATCH] LP1840773 SCKO Angular Signed-off-by: Bill Erickson --- Open-ILS/src/eg2/src/app/scko/banner.component.ts | 2 +- Open-ILS/src/eg2/src/app/scko/fines.component.ts | 2 ++ Open-ILS/src/eg2/src/app/scko/holds.component.ts | 2 ++ Open-ILS/src/eg2/src/app/scko/items.component.ts | 2 ++ Open-ILS/src/eg2/src/app/scko/scko.service.ts | 5 ++--- 5 files changed, 9 insertions(+), 4 deletions(-) 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 b6b311e482..a5e3062114 100644 --- 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 ab79855f06..e70b0d7448 100644 --- 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 bed7a26472..81ae44fb08 100644 --- 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 fd76733997..9f2bf716d6 100644 --- 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 03b156fec3..9927903c70 100644 --- 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 -- 2.11.0