LP1904036 Patron UI; search persistence

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

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 5c5ec9b..b520060 100644 (file)
--- 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
@@ -145,6 +145,8 @@
           <ng-template ngbNavContent>
             <div class="">
               <eg-patron-search
+                [startWithSearch]="context.lastPatronSearch"
+                (searchFired)="patronSearchFired($event)"
                 (selectionChange)="patronSelectionChange($event)"
                 (patronsActivated)="patronsActivated($event)">
               </eg-patron-search> 

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.ts
index e65b8d2..c65d4d8 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.ts
@@ -6,7 +6,8 @@ import {AuthService} from '@eg/core/auth.service';
 import {ServerStoreService} from '@eg/core/server-store.service';
 import {PatronService} from '@eg/staff/share/patron/patron.service';
 import {PatronManagerService} from './patron.service';
-import {PatronSearchComponent} from '@eg/staff/share/patron/search.component';
+import {PatronSearch, PatronSearchComponent
+    } from '@eg/staff/share/patron/search.component';
 
 const MAIN_TABS =
     ['checkout', 'items_out', 'holds', 'bills', 'messages', 'edit', 'search'];
@@ -141,6 +142,10 @@ export class PatronComponent implements OnInit, AfterViewInit {
         this.routeToTab();
     }
 
+    patronSearchFired(patronSearch: PatronSearch) {
+        this.context.lastPatronSearch = patronSearch;
+    }
+
     disablePurge(): boolean {
         return
             this.context.patron.super_user() === 't' ||

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 4655789..eaef4a1 100644 (file)
--- 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
@@ -3,6 +3,7 @@ import {IdlObject} from '@eg/core/idl.service';
 import {NetService} from '@eg/core/net.service';
 import {AuthService} from '@eg/core/auth.service';
 import {PatronService} from '@eg/staff/share/patron/patron.service';
+import {PatronSearch} from '@eg/staff/share/patron/search.component';
 
 const PATRON_FLESH_FIELDS = [
     'card',
@@ -57,6 +58,8 @@ export class PatronManagerService {
     accountExpired = false;
     accountExpiresSoon = false;
 
+    lastPatronSearch: PatronSearch;
+
     constructor(
         private net: NetService,
         private auth: AuthService,

diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts
index 1d35a76..01418f7 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts
@@ -27,6 +27,20 @@ const DEFAULT_FLESH = [
 const EXPAND_FORM = 'eg.circ.patron.search.show_extras';
 const INCLUDE_INACTIVE = 'eg.circ.patron.search.include_inactive';
 
+export interface PatronSearchField {
+    value: any,
+    group?: number
+}
+
+export interface PatronSearchFieldSet {
+    [field: string]: PatronSearchField
+}
+
+export interface PatronSearch {
+    search: PatronSearchFieldSet,
+    orgId: number
+}
+
 @Component({
   selector: 'eg-patron-search',
   templateUrl: './search.component.html'
@@ -36,6 +50,8 @@ export class PatronSearchComponent implements OnInit, AfterViewInit {
 
     @ViewChild('searchGrid', {static: false}) searchGrid: GridComponent;
 
+    @Input() startWithSearch: PatronSearch;
+
     // Fires on dbl-click or Enter while one or more search result
     // rows are selected.
     @Output() patronsActivated: EventEmitter<any>;
@@ -44,6 +60,10 @@ export class PatronSearchComponent implements OnInit, AfterViewInit {
     // Emits an array of patron IDs
     @Output() selectionChange: EventEmitter<number[]>;
 
+    // Fired with each search that is run, except for
+    // any searches run as a result of @Input() startWithSearch.
+    @Output() searchFired: EventEmitter<PatronSearch>;
+
     search: any = {};
     searchOrg: IdlObject;
     expandForm: boolean;
@@ -59,6 +79,9 @@ export class PatronSearchComponent implements OnInit, AfterViewInit {
     ) {
         this.patronsActivated = new EventEmitter<any>();
         this.selectionChange = new EventEmitter<number[]>();
+        this.selectionChange = new EventEmitter<number[]>();
+        this.searchFired = new EventEmitter<PatronSearch>();
+
         this.dataSource = new GridDataSource();
         this.dataSource.getRows = (pager: Pager, sort: any[]) => {
             return this.getRows(pager, sort);
@@ -134,22 +157,46 @@ export class PatronSearchComponent implements OnInit, AfterViewInit {
         return user;
     }
 
+    // Absorbe a patron search object into the search form.
+    absorbPatronSearch(pSearch: PatronSearch) {
+
+        if (pSearch.orgId) {
+            this.searchOrg = this.org.get(pSearch.orgId);
+        }
+
+        Object.keys(pSearch.search).forEach(field => {
+            this.search[field] = pSearch.search[field].value;
+        });
+    }
+
     searchByForm(pager: Pager, sort: any[]): Observable<IdlObject> {
 
+        if (this.startWithSearch) {
+            this.absorbPatronSearch(this.startWithSearch);
+            this.startWithSearch = null;
+        }
+
         const search = this.compileSearch();
         if (!search) { return of(); }
 
         const sorter = this.compileSort(sort);
 
+        const pSearch: PatronSearch = {
+            search: search,
+            orgId: this.searchOrg.id()
+        };
+
+        this.searchFired.emit(pSearch);
+
         return this.net.request(
             'open-ils.actor',
             'open-ils.actor.patron.search.advanced.fleshed',
             this.auth.token(),
-            this.compileSearch(),
+            pSearch.search,
             pager.limit,
             sorter,
             null, // ?
-            this.searchOrg.id(),
+            pSearch.orgId,
             DEFAULT_FLESH,
             pager.offset
         );
@@ -168,14 +215,16 @@ export class PatronSearchComponent implements OnInit, AfterViewInit {
         return sort.map(def => `${def.name} ${def.dir}`);
     }
 
-    compileSearch(): any {
+    compileSearch(): PatronSearchFieldSet {
 
         let hasSearch = false;
-        const search: Object = {};
+        const search: PatronSearchFieldSet = {};
 
         Object.keys(this.search).forEach(field => {
             search[field] = this.mapSearchField(field);
-            if (search[field]) { hasSearch = true; }
+            if (field !== 'inactive') { // one filter is not enough
+                if (search[field]) { hasSearch = true; }
+            }
         });
 
         return hasSearch ? search : null;
@@ -185,12 +234,12 @@ export class PatronSearchComponent implements OnInit, AfterViewInit {
         return (val !== null && val !== undefined && val !== '');
     }
 
-    mapSearchField(field: string): any {
+    mapSearchField(field: string): PatronSearchField {
 
         const value = this.search[field];
         if (!this.isValue(value)) { return null; }
 
-        const chunk = {value: value, group: 0};
+        const chunk: PatronSearchField = {value: value, group: 0};
 
         switch (field) {