From 716c0b650211efad753b13b9bce9328d8f4262e5 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 5 Apr 2021 17:55:37 -0400 Subject: [PATCH] LP1904036 adding patron to bucket; merging Signed-off-by: Bill Erickson Signed-off-by: Jane Sandberg Signed-off-by: Galen Charlton --- .../src/app/staff/circ/patron/group.component.ts | 2 +- .../app/staff/circ/patron/patron.component.html | 4 +- .../eg2/src/app/staff/circ/patron/patron.module.ts | 2 - .../src/app/staff/circ/patron/patron.service.ts | 156 ++------------------- .../src/app/staff/circ/patron/resolver.service.ts | 3 - .../share/buckets/bucket-dialog.component.html | 3 + .../staff/share/buckets/bucket-dialog.component.ts | 5 +- .../staff/share/patron/merge-dialog.component.html | 51 +++++++ .../staff/share/patron/merge-dialog.component.ts | 84 +++++++++++ .../src/app/staff/share/patron/patron.module.ts | 6 + .../src/app/staff/share/patron/patron.service.ts | 147 ++++++++++++++++++- .../app/staff/share/patron/search.component.html | 12 ++ .../src/app/staff/share/patron/search.component.ts | 18 ++- .../{circ => share}/patron/summary.component.css | 0 .../{circ => share}/patron/summary.component.html | 92 ++++++------ .../{circ => share}/patron/summary.component.ts | 34 +++-- 16 files changed, 403 insertions(+), 216 deletions(-) create mode 100644 Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html create mode 100644 Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.ts rename Open-ILS/src/eg2/src/app/staff/{circ => share}/patron/summary.component.css (100%) rename Open-ILS/src/eg2/src/app/staff/{circ => share}/patron/summary.component.html (59%) rename Open-ILS/src/eg2/src/app/staff/{circ => share}/patron/summary.component.ts (73%) diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/group.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/group.component.ts index 1221995c99..a4459c7e69 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/group.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/group.component.ts @@ -78,7 +78,7 @@ export class PatronGroupComponent implements OnInit { {authoritative: true}) .pipe(concatMap(u => { - const promise = this.context.getPatronVitalStats(u.id()) + const promise = this.patronService.getVitalStats(u.id()) .then(stats => { this.totalOwed += stats.fines.balance_owed; this.totalOut += stats.checkouts.total_out; 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 77507e7dce..bab79c3b2b 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 @@ -20,7 +20,9 @@
- + +
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 77b421b25d..479f69b7fe 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 @@ -12,7 +12,6 @@ import {PatronModule} from '@eg/staff/share/patron/patron.module'; import {PatronContextService} from './patron.service'; import {PatronComponent} from './patron.component'; import {PatronAlertsComponent} from './alerts.component'; -import {SummaryComponent} from './summary.component'; import {CheckoutComponent} from './checkout.component'; import {HoldsComponent} from './holds.component'; import {EditComponent} from './edit.component'; @@ -36,7 +35,6 @@ import {PatronMessagesComponent} from './messages.component'; declarations: [ PatronComponent, PatronAlertsComponent, - SummaryComponent, CheckoutComponent, HoldsComponent, EditComponent, 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 bb703bc6ed..e25a05bf1b 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 @@ -3,7 +3,8 @@ import {IdlObject} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {OrgService} from '@eg/core/org.service'; import {AuthService} from '@eg/core/auth.service'; -import {PatronService} from '@eg/staff/share/patron/patron.service'; +import {PatronService, PatronStats, PatronAlerts + } from '@eg/staff/share/patron/patron.service'; import {PatronSearch} from '@eg/staff/share/patron/search.component'; import {StoreService} from '@eg/core/store.service'; import {CircService, CircDisplayInfo} from '@eg/staff/share/circ/circ.service'; @@ -43,52 +44,6 @@ const PATRON_FLESH_FIELDS = [ 'groups' ]; -interface PatronStats { - fines: { - balance_owed: number, - group_balance_owed: number - }; - checkouts: { - overdue: number, - claims_returned: number, - lost: number, - out: number, - total_out: number, - long_overdue: number, - noncat: number - }; - holds: { - ready: number; - total: number; - }; -} - -export class PatronAlerts { - holdsReady = 0; - accountExpired = false; - accountExpiresSoon = false; - patronBarred = false; - patronInactive = false; - retrievedWithInactive = false; - invalidAddress = false; - alertMessage: string = null; - alertPenalties: IdlObject[] = []; - - hasAlerts(): boolean { - return ( - this.holdsReady > 0 || - this.accountExpired || - this.accountExpiresSoon || - this.patronBarred || - this.patronInactive || - this.retrievedWithInactive || - this.invalidAddress || - this.alertMessage !== null || - this.alertPenalties.length > 0 - ); - } -} - @Injectable() export class PatronContextService { @@ -96,9 +51,6 @@ export class PatronContextService { patronStats: PatronStats; alerts: PatronAlerts; - noTallyClaimsReturned = false; // circ.do_not_tally_claims_returned - tallyLost = false; // circ.tally_lost - loaded = false; lastPatronSearch: PatronSearch; @@ -111,16 +63,13 @@ export class PatronContextService { constructor( private store: StoreService, - private net: NetService, private org: OrgService, - private auth: AuthService, private circ: CircService, - public patronService: PatronService + public patrons: PatronService ) {} loadPatron(id: number): Promise { this.loaded = false; - this.patron = null; this.checkouts = []; return this.refreshPatron(id).then(_ => this.loaded = true); } @@ -131,45 +80,12 @@ export class PatronContextService { this.alerts = new PatronAlerts(); - return this.net.request( - 'open-ils.actor', - 'open-ils.actor.user.fleshed.retrieve', - this.auth.token(), id, PATRON_FLESH_FIELDS).toPromise() + return this.patrons.getFleshedById(id, PATRON_FLESH_FIELDS) .then(p => this.patron = p) .then(_ => this.getPatronStats(id)) .then(_ => this.compileAlerts()); } - getPatronVitalStats(id: number): Promise { - - return this.net.request( - 'open-ils.actor', - 'open-ils.actor.user.opac.vital_stats.authoritative', - this.auth.token(), id).toPromise() - - .then((stats: PatronStats) => { - - // force numeric values - stats.fines.balance_owed = Number(stats.fines.balance_owed); - - Object.keys(stats.checkouts).forEach(key => - stats.checkouts[key] = Number(stats.checkouts[key])); - - stats.checkouts.total_out = stats.checkouts.out + - stats.checkouts.overdue + stats.checkouts.long_overdue; - - if (!this.noTallyClaimsReturned) { - stats.checkouts.total_out += stats.checkouts.claims_returned; - } - - if (this.tallyLost) { - stats.checkouts.total_out += stats.checkouts.lost; - } - - return stats; - }); - } - getPatronStats(id: number): Promise { // When quickly navigating patron search results it's possible @@ -177,39 +93,8 @@ export class PatronContextService { // is called. Exit early instead of making an unneeded call. if (!this.patron) { return Promise.resolve(); } - return this.getPatronVitalStats(id) - - .then(stats => this.patronStats = stats) - - .then(_ => { - if (!this.patron) { return; } - - return this.net.request( - 'open-ils.circ', - 'open-ils.circ.open_non_cataloged_circulation.user.authoritative', - this.auth.token(), id - ).toPromise(); - - }).then(noncats => { - if (!this.patron) { return; } - - if (noncats && this.patronStats) { - this.patronStats.checkouts.noncat = noncats.length; - } - - return this.net.request( - 'open-ils.actor', - 'open-ils.actor.usergroup.members.balance_owed.authoritative', - this.auth.token(), this.patron.usrgroup() - ).toPromise(); - - }).then(fines => { - if (!this.patron) { return; } - - let total = 0; - fines.forEach(f => total += Number(f.balance_owed) * 100); - this.patronStats.fines.group_balance_owed = total / 100; - }); + return this.patrons.getVitalStats(this.patron) + .then(stats => this.patronStats = stats); } patronAlertsShown(): boolean { @@ -225,28 +110,15 @@ export class PatronContextService { // User navigated to a different patron mid-data load. if (!this.patron) { return Promise.resolve(); } - this.alerts.holdsReady = this.patronStats.holds.ready; - this.alerts.patronBarred = this.patron.barred() === 't'; - this.alerts.patronInactive = this.patron.active() === 'f'; - this.alerts.invalidAddress = this.patron.addresses() - .filter(a => a.valid() === 'f').length > 0; - this.alerts.alertMessage = this.patron.alert_message(); - this.alerts.alertPenalties = this.patron.standing_penalties() - .filter(p => p.standing_penalty().staff_alert() === 't'); - - if (this.searchBarcode) { - const card = this.patron.cards() - .filter(c => c.barcode() === this.searchBarcode)[0]; - this.alerts.retrievedWithInactive = card && card.active() === 'f'; - this.searchBarcode = null; - } + return this.patrons.compileAlerts(this.patron, this.patronStats) + .then(alerts => { + this.alerts = alerts; - return this.patronService.testExpire(this.patron) - .then(value => { - if (value === 'expired') { - this.alerts.accountExpired = true; - } else if (value === 'soon') { - this.alerts.accountExpiresSoon = true; + if (this.searchBarcode) { + const card = this.patron.cards() + .filter(c => c.barcode() === this.searchBarcode)[0]; + this.alerts.retrievedWithInactive = card && card.active() === 'f'; + this.searchBarcode = null; } }); } diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/resolver.service.ts index a781d55b85..db2787c252 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/resolver.service.ts @@ -130,9 +130,6 @@ export class PatronResolver implements Resolve> { 'ui.admin.patron_log.max_entries' ]).then(settings => { this.context.settingsCache = settings; - this.context.noTallyClaimsReturned = - settings['circ.do_not_tally_claims_returned']; - this.context.tallyLost = settings['circ.tally_lost']; }); } } diff --git a/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html index fcd885f751..f92f9d6c02 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html @@ -1,3 +1,6 @@ + + +

diff --git a/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.ts index b743edded9..478c3a941e 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.ts @@ -10,6 +10,7 @@ import {DialogComponent} from '@eg/share/dialog/dialog.component'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; +import {StringComponent} from '@eg/share/string/string.component' /** * Dialog for adding bib records to new and existing record buckets. @@ -42,7 +43,8 @@ export class BucketDialogComponent extends DialogComponent implements OnInit { bucketFmClass: 'ccb' | 'ccnb' | 'cbreb' | 'cub'; targetField: string; - @ViewChild('confirmAddToShared', {static: true}) confirmAddToShared: ConfirmDialogComponent; + @ViewChild('confirmAddToShared') confirmAddToShared: ConfirmDialogComponent; + @ViewChild('successString') successString: StringComponent; constructor( private modal: NgbModal, // required for passing to parent @@ -196,6 +198,7 @@ export class BucketDialogComponent extends DialogComponent implements OnInit { if (evt) { this.toast.danger(evt.toString()); } else { + this.toast.success(this.successString.text); this.close(); } }); diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html new file mode 100644 index 0000000000..bc5551d4cc --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html @@ -0,0 +1,51 @@ + +
+

Merge Patrons

+ +
+
+
+
+ +
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+ + + + +
+ + diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.ts new file mode 100644 index 0000000000..c3d9eb448e --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.ts @@ -0,0 +1,84 @@ +import {Component, OnInit, Input, Output, ViewChild} from '@angular/core'; +import {from} from 'rxjs'; +import {switchMap, concatMap} from 'rxjs/operators'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {PatronService, PatronStats, PatronAlerts} from './patron.service'; + +/** + */ + +const PATRON_FLESH_FIELDS = [ + 'card', + 'cards', + 'settings', + 'standing_penalties', + 'addresses', + 'billing_address', + 'mailing_address', + 'waiver_entries', + 'usr_activity', + 'notes', + 'profile', + 'net_access_level', + 'ident_type', + 'ident_type2', + 'groups' +]; + +class MergeContext { + patron: IdlObject; + stats: PatronStats; + alerts: PatronAlerts; +} + +@Component({ + selector: 'eg-patron-merge-dialog', + templateUrl: 'merge-dialog.component.html' +}) + +export class PatronMergeDialogComponent + extends DialogComponent implements OnInit { + + @Input() patronIds: [number, number]; + + context1: MergeContext; + context2: MergeContext; + + leadAccount: number = null; + loading = true; + + constructor( + private modal: NgbModal, + private patrons: PatronService + ) { super(modal); } + + ngOnInit() { + this.onOpen$.subscribe(_ => { + this.loading = true; + this.loadPatron(this.patronIds[0]) + .then(ctx => this.context1 = ctx) + .then(_ => this.loadPatron(this.patronIds[1])) + .then(ctx => this.context2 = ctx) + .then(_ => this.loading = false); + }); + } + + loadPatron(id: number): Promise { + const ctx = new MergeContext(); + return this.patrons.getFleshedById(id, PATRON_FLESH_FIELDS) + .then(patron => ctx.patron = patron) + .then(_ => this.patrons.getVitalStats(ctx.patron)) + .then(stats => ctx.stats = stats) + .then(_ => this.patrons.compileAlerts(ctx.patron, ctx.stats)) + .then(alerts => ctx.alerts = alerts) + .then(_ => ctx); + } + + merge() { + } +} + + + diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/patron.module.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/patron.module.ts index 48ab1753ef..41e4115015 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/patron/patron.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/patron/patron.module.ts @@ -7,12 +7,16 @@ import {PatronSearchDialogComponent} from './search-dialog.component'; import {ProfileSelectComponent} from './profile-select.component'; import {PatronPenaltyDialogComponent} from './penalty-dialog.component'; import {BarcodesModule} from '@eg/staff/share/barcodes/barcodes.module'; +import {PatronMergeDialogComponent} from './merge-dialog.component'; +import {PatronSummaryComponent} from './summary.component'; @NgModule({ declarations: [ PatronSearchComponent, PatronSearchDialogComponent, ProfileSelectComponent, + PatronSummaryComponent, + PatronMergeDialogComponent, PatronPenaltyDialogComponent ], imports: [ @@ -24,6 +28,8 @@ import {BarcodesModule} from '@eg/staff/share/barcodes/barcodes.module'; PatronSearchComponent, PatronSearchDialogComponent, ProfileSelectComponent, + PatronSummaryComponent, + PatronMergeDialogComponent, PatronPenaltyDialogComponent ], providers: [ diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/patron.service.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/patron.service.ts index 32a5c79710..3333ee0605 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/patron/patron.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/patron/patron.service.ts @@ -8,6 +8,54 @@ import {PcrudService} from '@eg/core/pcrud.service'; import {AuthService} from '@eg/core/auth.service'; import {Observable} from 'rxjs'; import {BarcodeSelectComponent} from '@eg/staff/share/barcodes/barcode-select.component'; +import {ServerStoreService} from '@eg/core/server-store.service'; + +export interface PatronStats { + fines: { + balance_owed: number, + group_balance_owed: number + }; + checkouts: { + overdue: number, + claims_returned: number, + lost: number, + out: number, + total_out: number, + long_overdue: number, + noncat: number + }; + holds: { + ready: number; + total: number; + }; +} + +export class PatronAlerts { + holdsReady = 0; + accountExpired = false; + accountExpiresSoon = false; + patronBarred = false; + patronInactive = false; + retrievedWithInactive = false; + invalidAddress = false; + alertMessage: string = null; + alertPenalties: IdlObject[] = []; + + hasAlerts(): boolean { + return ( + this.holdsReady > 0 || + this.accountExpired || + this.accountExpiresSoon || + this.patronBarred || + this.patronInactive || + this.retrievedWithInactive || + this.invalidAddress || + this.alertMessage !== null || + this.alertPenalties.length > 0 + ); + } +} + @Injectable() @@ -25,7 +73,8 @@ export class PatronService { private org: OrgService, private evt: EventService, private pcrud: PcrudService, - private auth: AuthService + private auth: AuthService, + private store: ServerStoreService ) {} bcSearch(barcode: string): Observable { @@ -193,5 +242,101 @@ export class PatronService { surveys.sort((s1, s2) => s1.name() < s2.name() ? -1 : 1); }); } + + getVitalStats(patron: IdlObject): Promise { + + let patronStats: PatronStats; + let noTallyClaimsReturned, tallyLost; + + return this.store.getItemBatch([ + 'circ.do_not_tally_claims_returned', + 'circ.tally_lost' + + ]).then(settings => { + + noTallyClaimsReturned = settings['circ.do_not_tally_claims_returned']; + tallyLost = settings['circ.tally_lost']; + + }).then(_ => { + + return this.net.request( + 'open-ils.actor', + 'open-ils.actor.user.opac.vital_stats.authoritative', + this.auth.token(), patron.id()).toPromise() + + }).then((stats: PatronStats) => { + + // force numeric values + stats.fines.balance_owed = Number(stats.fines.balance_owed); + + Object.keys(stats.checkouts).forEach(key => + stats.checkouts[key] = Number(stats.checkouts[key])); + + stats.checkouts.total_out = stats.checkouts.out + + stats.checkouts.overdue + stats.checkouts.long_overdue; + + if (!noTallyClaimsReturned) { + stats.checkouts.total_out += stats.checkouts.claims_returned; + } + + if (tallyLost) { + stats.checkouts.total_out += stats.checkouts.lost; + } + + return patronStats = stats; + }) + + .then(_ => { + return this.net.request( + 'open-ils.circ', + 'open-ils.circ.open_non_cataloged_circulation.user.authoritative', + this.auth.token(), patron.id() + ).toPromise(); + + }).then(noncats => { + if (noncats && patronStats) { + patronStats.checkouts.noncat = noncats.length; + } + + return this.net.request( + 'open-ils.actor', + 'open-ils.actor.usergroup.members.balance_owed.authoritative', + this.auth.token(), patron.usrgroup() + ).toPromise(); + + }).then(fines => { + + let total = 0; + fines.forEach(f => total += Number(f.balance_owed) * 100); + patronStats.fines.group_balance_owed = total / 100; + + return patronStats; + }); + } + + compileAlerts(patron: IdlObject, stats: PatronStats): Promise { + + const alerts = new PatronAlerts(); + + alerts.holdsReady = stats.holds.ready; + alerts.patronBarred = patron.barred() === 't'; + alerts.patronInactive = patron.active() === 'f'; + alerts.invalidAddress = patron.addresses() + .filter(a => a.valid() === 'f').length > 0; + alerts.alertMessage = patron.alert_message(); + alerts.alertPenalties = patron.standing_penalties() + .filter(p => p.standing_penalty().staff_alert() === 't'); + + return this.testExpire(patron) + .then(value => { + if (value === 'expired') { + alerts.accountExpired = true; + } else if (value === 'soon') { + alerts.accountExpiresSoon = true; + } + + return alerts; + }) + } } diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html index fe8bcd824c..647f1f674a 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html @@ -1,4 +1,9 @@ + + + + +
@@ -185,6 +190,13 @@ [dataSource]="dataSource" [showDeclaredFieldsOnly]="true"> + + + r.id()); + this.addToBucket.open().subscribe(); + } + + mergePatrons(rows: IdlObject[]) { + this.mergeDialog.patronIds = [rows[0].id(), rows[1].id()]; + this.mergeDialog.open({size: 'lg'}).subscribe(changes => { + if (changes) { this.searchGrid.reload(); } + }); + } } diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/summary.component.css b/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.css similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/circ/patron/summary.component.css rename to Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.css diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/summary.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.html similarity index 59% rename from Open-ILS/src/eg2/src/app/staff/circ/patron/summary.component.html rename to Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.html index 0a523dba64..c41f46ae89 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/summary.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.html @@ -1,12 +1,12 @@
-
+

- {{patron().family_name()}}, - {{patron().first_given_name()}} - {{patron().second_given_name()}} + {{patron.family_name()}}, + {{patron.first_given_name()}} + {{patron.second_given_name()}}

@@ -17,23 +17,23 @@

- {{patronService.namePart(patron(), 'family_name')}}, - {{patronService.namePart(patron(), 'first_given_name')}} - {{patronService.namePart(patron(), 'second_given_name')}} + {{patronService.namePart(patron, 'family_name')}}, + {{patronService.namePart(patron, 'first_given_name')}} + {{patronService.namePart(patron, 'second_given_name')}}

preferred
+ *ngIf="alerts.accountExpiresSoon">
Patron account will expire soon. Please renew.
+ *ngFor="let pen of alerts.alertPenalties">
{{pen.note() || pen.standing_penalty().label()}} @@ -43,95 +43,95 @@
Profile
-
{{patron().profile().name()}}
+
{{patron.profile().name()}}
Home Library
-
{{context.orgSn(patron().home_ou())}}
+
{{orgSn(patron.home_ou())}}
Net Access
-
{{patron().net_access_level().name()}}
+
{{patron.net_access_level().name()}}
Date of Birth
-
{{patron().dob() | date:'shortDate'}}
+
{{patron.dob() | date:'shortDate'}}
Parent/Guardian
-
{{patron().guardian()}}
+
{{patron.guardian()}}
Last Activity
- - {{patron().usr_activity()[0].event_time() | date:'shortDate'}} + + {{patron.usr_activity()[0].event_time() | date:'shortDate'}}
Last Updated
-
{{patron().last_update_time() | date:'shortDate'}}
+
{{patron.last_update_time() | date:'shortDate'}}
Create Date
-
{{patron().create_date() | date:'shortDate'}}
+
{{patron.create_date() | date:'shortDate'}}
-
+
Expire Date
-
{{patron().expire_date() | date:'shortDate'}}
+
{{patron.expire_date() | date:'shortDate'}}
- +
+ [ngClass]="{'alert alert-danger p-0': stats.fines.balance_owed > 0}">
Fines Owed
-
{{stats().fines.balance_owed | currency}}
+
{{stats.fines.balance_owed | currency}}
+ *ngIf="stats.fines.group_balance_owed > stats.fines.balance_owed">
Group Fines
-
{{stats().fines.group_balance_owed | currency}}
+
{{stats.fines.group_balance_owed | currency}}
Items Out
-
{{stats().checkouts.total_out}}
+
{{stats.checkouts.total_out}}
+ [ngClass]="{'alert alert-danger p-0': stats.checkouts.overdue > 0}">
Overdue
-
{{stats().checkouts.overdue}}
+
{{stats.checkouts.overdue}}
+ [ngClass]="{'alert alert-danger p-0': stats.checkouts.long_overdue > 0}">
Long Overdue
-
{{stats().checkouts.long_overdue}}
+
{{stats.checkouts.long_overdue}}
+ [ngClass]="{'alert alert-danger p-0': stats.checkouts.claims_returned > 0}">
Claimed Returned
-
{{stats().checkouts.claims_returned}}
+
{{stats.checkouts.claims_returned}}
+ [ngClass]="{'alert alert-danger p-0': stats.checkouts.lost > 0}">
Lost
-
{{stats().checkouts.lost}}
+
{{stats.checkouts.lost}}
Non-Cataloged
-
{{stats().checkouts.noncat}}
+
{{stats.checkouts.noncat}}
Holds
- {{stats().holds.ready}} / {{stats().holds.total}} + {{stats.holds.ready}} / {{stats.holds.total}}
@@ -141,44 +141,44 @@
Card
- {{patron().card() ? patron().card().barcode() : ''}} + {{patron.card() ? patron.card().barcode() : ''}}
Username
-
{{patron().usrname()}}
+
{{patron.usrname()}}
Day Phone
-
{{patron().day_phone()}}
+
{{patron.day_phone()}}
Evening Phone
-
{{patron().evening_phone()}}
+
{{patron.evening_phone()}}
Other Phone
-
{{patron().other_phone()}}
+
{{patron.other_phone()}}
ID1
-
{{patron().ident_value()}}
+
{{patron.ident_value()}}
ID2
-
{{patron().ident_value2()}}
+
{{patron.ident_value2()}}
Email
- {{patron().email()}} + {{patron.email()}}
-
+
@@ -197,7 +197,7 @@
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/summary.component.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.ts similarity index 73% rename from Open-ILS/src/eg2/src/app/staff/circ/patron/summary.component.ts rename to Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.ts index 119e1cf648..a80835e60f 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/summary.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.ts @@ -4,42 +4,36 @@ import {NgbNav, NgbNavChangeEvent} from '@ng-bootstrap/ng-bootstrap'; import {OrgService} from '@eg/core/org.service'; import {IdlObject} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; -import {PatronService} from '@eg/staff/share/patron/patron.service'; -import {PatronContextService} from './patron.service'; import {PrintService} from '@eg/share/print/print.service'; +import {PatronService, PatronStats, PatronAlerts} from './patron.service'; @Component({ templateUrl: 'summary.component.html', styleUrls: ['summary.component.css'], selector: 'eg-patron-summary' }) -export class SummaryComponent implements OnInit { +export class PatronSummaryComponent implements OnInit { + + @Input() patron: IdlObject; + @Input() stats: PatronStats; + @Input() alerts: PatronAlerts; constructor( private org: OrgService, private net: NetService, private printer: PrintService, - public patronService: PatronService, - public context: PatronContextService + public patronService: PatronService ) {} ngOnInit() { } - patron(): IdlObject { - return this.context.patron; - } - - stats(): any { - return this.context.patronStats; - } - hasPrefName(): boolean { - if (this.patron()) { + if (this.patron) { return ( - this.patron().pref_first_given_name() || - this.patron().pref_second_given_name() || - this.patron().pref_family_name() + this.patron.pref_first_given_name() || + this.patron.pref_second_given_name() || + this.patron.pref_family_name() ); } } @@ -48,7 +42,7 @@ export class SummaryComponent implements OnInit { this.printer.print({ templateName: 'patron_address', contextData: { - patron: this.context.patron, + patron: this.patron, address: addr }, printContext: 'default' @@ -76,5 +70,9 @@ export class SummaryComponent implements OnInit { node.style.visibility = 'hidden'; } + orgSn(orgId: number): string { + const org = this.org.get(orgId); + return org ? org.shortname() : ''; + } } -- 2.11.0