From de34eaf500eb235bc86e1163137edf87e3524692 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 21 Aug 2020 17:53:58 -0400
Subject: [PATCH] LP1904036 patron Ui holds tabs

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../src/app/staff/circ/patron/holds.component.html | 22 ++++++++++++++++++
 .../src/app/staff/circ/patron/holds.component.ts   | 26 ++++++++++++++++++++++
 .../app/staff/circ/patron/patron.component.html    |  8 +------
 .../eg2/src/app/staff/circ/patron/patron.module.ts |  2 ++
 .../src/app/staff/circ/patron/patron.service.ts    |  2 +-
 5 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 Open-ILS/src/eg2/src/app/staff/circ/patron/holds.component.html
 create mode 100644 Open-ILS/src/eg2/src/app/staff/circ/patron/holds.component.ts

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/holds.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/holds.component.html
new file mode 100644
index 0000000000..17a3671b83
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/holds.component.html
@@ -0,0 +1,22 @@
+
+
+<ul ngbNav #holdsNav="ngbNav" class="nav-tabs" (navChange)="beforeTabChange($event)">
+
+  <li ngbNavItem="active">
+    <a ngbNavLink i18n>Open Hold Requests</a>
+    <ng-template ngbNavContent>
+      <eg-holds-grid 
+        preFetchSetting="eg.circ.patron.holds.prefetch"
+        printTemplate="holds_for_patron"
+        persistKey="circ.patron.holds"
+        [hidePickupLibFilter]="true"
+        [defaultSort]="[{name:'request_time',dir:'asc'}]"
+        [patronId]="context.patron.id()"></eg-holds-grid>
+    </ng-template>
+  </li>
+
+</ul>
+
+<ng-container *ngIf="context.patron">
+  <div [ngbNavOutlet]="holdsNav"></div>
+</ng-container>
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/holds.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/holds.component.ts
new file mode 100644
index 0000000000..79bfae663b
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/holds.component.ts
@@ -0,0 +1,26 @@
+import {Component, OnInit, Input} from '@angular/core';
+import {Router, ActivatedRoute, ParamMap} from '@angular/router';
+import {NgbNav, NgbNavChangeEvent} from '@ng-bootstrap/ng-bootstrap';
+import {OrgService} from '@eg/core/org.service';
+import {NetService} from '@eg/core/net.service';
+import {PatronService} from '@eg/staff/share/patron/patron.service';
+import {PatronManagerService} from './patron.service';
+
+@Component({
+  templateUrl: 'holds.component.html',
+  selector: 'eg-patron-holds'
+})
+export class HoldsComponent implements OnInit {
+
+    constructor(
+        private org: OrgService,
+        private net: NetService,
+        public patronService: PatronService,
+        public context: PatronManagerService
+    ) {}
+
+    ngOnInit() {
+    }
+
+}
+
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html
index 55b619c1ea..5c5ec9b6ea 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html
@@ -64,13 +64,7 @@
         <li ngbNavItem="holds" [disabled]="!context.patron">
           <a ngbNavLink i18n>Holds</a>
           <ng-template ngbNavContent>
-            <eg-holds-grid [recordId]="recordId"
-              preFetchSetting="eg.circ.patron.holds.prefetch"
-              printTemplate="holds_for_patron"
-              persistKey="circ.patron.holds"
-              [hidePickupLibFilter]="true"
-              [defaultSort]="[{name:'request_time',dir:'asc'}]"
-              [patronId]="patronId"></eg-holds-grid>
+            <eg-patron-holds></eg-patron-holds>
           </ng-template>
         </li>
 
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.module.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.module.ts
index 76cd7dcf54..a46313dbd1 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.module.ts
@@ -10,6 +10,7 @@ import {PatronManagerService} from './patron.service';
 import {PatronComponent} from './patron.component';
 import {SummaryComponent} from './summary.component';
 import {CheckoutComponent} from './checkout.component';
+import {HoldsComponent} from './holds.component';
 import {EditComponent} from './edit.component';
 import {EditToolbarComponent} from './edit-toolbar.component';
 import {BcSearchComponent} from './bcsearch.component';
@@ -19,6 +20,7 @@ import {BcSearchComponent} from './bcsearch.component';
     PatronComponent,
     SummaryComponent,
     CheckoutComponent,
+    HoldsComponent,
     EditComponent,
     EditToolbarComponent,
     BcSearchComponent
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts
index 684ec84381..4655789712 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts
@@ -71,7 +71,7 @@ export class PatronManagerService {
             'open-ils.actor',
             'open-ils.actor.user.fleshed.retrieve',
             this.auth.token(), id, PATRON_FLESH_FIELDS).toPromise()
-        .then(patron => this.patron = patron)
+        .then(p => this.patron = p)
         .then(_ => this.getPatronStats(id))
         .then(_ => this.setExpires())
         .then(_ => this.loaded = true);
-- 
2.11.0