LP1840773 SCKO Angular

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

diff --git a/Open-ILS/src/eg2/src/app/scko/scko.component.html b/Open-ILS/src/eg2/src/app/scko/scko.component.html
index 3edb18b..4159fa2 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/scko.component.html
+++ b/Open-ILS/src/eg2/src/app/scko/scko.component.html
@@ -1,11 +1,11 @@
 
 <eg-scko-banner></eg-scko-banner>
 
-<div *ngIf="scko.patron" class="row mt-3">
-  <div class="col-lg-9">
+<div *ngIf="scko.patron" class="row mt-5">
+  <div class="col-lg-8">
     <router-outlet></router-outlet>
   </div>
-  <div class="col-lg-3"><eg-scko-summary></eg-scko-summary></div>
+  <div class="col-lg-4"><eg-scko-summary></eg-scko-summary></div>
 </div>
 
 <!-- global toast alerts -->

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 58899fd..0f9fd1d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/scko.service.ts
+++ b/Open-ILS/src/eg2/src/app/scko/scko.service.ts
@@ -14,6 +14,13 @@ export class SckoService {
     barcodeRegex: RegExp;
     patronPasswordRequired = false;
 
+    sessionTotalCheckouts = 0;
+    accountTotalCheckouts = 0;
+
+    totalHolds = 0;
+    holdsReady = 0;
+    totalFines = 0;
+
     constructor(
         private net: NetService,
         private evt: EventService,

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 4f20b9c..009c2f7 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/summary.component.html
+++ b/Open-ILS/src/eg2/src/app/scko/summary.component.html
@@ -36,19 +36,25 @@
 
   <fieldset>
     <legend i18n>Items Checked Out</legend>
-    <div id='oils-selfck-circ-session-total'></div>
-    <div id='oils-selfck-circ-account-total'></div>
     <div>
-      <a href='javascript:void(0);' id='oils-selfck-items-out-details-link'>
+      <span i18n>Total items this session: </span>
+      <span>{{scko.sessionTotalCheckouts}}</span>
+    </div>
+    <div class="mt-2">
+      <span i18n>Total items on account: </span>
+      <span>{{scko.accountTotalCheckouts}}</span>
+    </div>
+    <div class="mt-2">
+      <a (click)="null">
         <button type="button" class="scko-button" i18n>View Items Out</button>
       </a>
     </div>
   </fieldset>
   <fieldset>
     <legend i18n>Holds</legend>
-    <div id='oils-selfck-holds-ready'></div>
-    <div id='oils-selfck-holds-total'></div>
-    <div>
+    <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 class="mt-2">
       <a href='javascript:void(0);' id='oils-selfck-hold-details-link'>
         <button type="button" class="scko-button" i18n>View Holds</button>
       </a>
@@ -56,8 +62,8 @@
   </fieldset>
   <fieldset>
     <legend i18n>Fines</legend>
-    <div id='oils-selfck-fines-total'></div>
-    <div>
+    <div>{{scko.totalFines | currency}}</div>
+    <div class="mt-2">
       <span>
         <a href='javascript:void(0);' id='oils-selfck-view-fines-link'>
           <button type="button" class="scko-button" i18n>View Details</button>