LP1840773 SCKO Angular

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

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 376a750..a82e819 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/scko.service.ts
+++ b/Open-ILS/src/eg2/src/app/scko/scko.service.ts
@@ -15,8 +15,6 @@ export class SckoService {
     barcodeRegex: RegExp;
     patronPasswordRequired = false;
 
-    accountTotalCheckouts = 0;
-
     sessionCheckouts: any[] = [];
 
     constructor(
@@ -71,6 +69,12 @@ export class SckoService {
     sessionTotalCheckouts(): number {
         return this.sessionCheckouts.length;
     }
+
+    accountTotalCheckouts(): number {
+        return this.sessionTotalCheckouts() +
+            this.patronSummary.stats.checkouts.total_out;
+    }
+
 }
 
 

diff --git a/Open-ILS/src/eg2/src/app/scko/summary.component.html b/Open-ILS/src/eg2/src/app/scko/summary.component.html
index 673f8a3..d6e06fd 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/summary.component.html
+++ b/Open-ILS/src/eg2/src/app/scko/summary.component.html
@@ -43,7 +43,7 @@
     </div>
     <div class="mt-2">
       <span i18n>Total items on account: </span>
-      <span>{{scko.accountTotalCheckouts}}</span>
+      <span>{{scko.accountTotalCheckouts()}}</span>
     </div>
     <div class="mt-2">
       <a (click)="null">
@@ -53,8 +53,12 @@
   </fieldset>
   <fieldset>
     <legend i18n>Holds</legend>
-    <div i18n>You have {{scko.holdsReady}} item(s) ready for pickup</div>
-    <div class="mt-2" i18n>You have {{scko.totalHolds}} total holds</div>
+    <div i18n>
+      You have {{scko.patronSummary.stats.holds.ready}} item(s) ready for pickup
+    </div>
+    <div class="mt-2" i18n>
+      You have {{scko.patronSummary.stats.holds.total}} total holds
+    </div>
     <div class="mt-2">
       <a href='javascript:void(0);' id='oils-selfck-hold-details-link'>
         <button type="button" class="scko-button" i18n>View Holds</button>