From 7a1800eb8b3c2f8326db35cc2324bd03eea87665 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 13 Oct 2022 12:05:04 -0400 Subject: [PATCH] LP1904036 Ang Circ Experimental Menu Signed-off-by: Bill Erickson Signed-off-by: Jane Sandberg Signed-off-by: Galen Charlton --- Open-ILS/src/eg2/src/app/staff/nav.component.html | 66 ++++++++++++++++++++ Open-ILS/src/eg2/src/app/staff/nav.component.ts | 17 ++++++ Open-ILS/src/eg2/src/app/staff/resolver.service.ts | 7 ++- Open-ILS/src/templates/staff/navbar.tt2 | 71 ++++++++++++++++++++++ .../web/js/ui/default/staff/services/navbar.js | 10 ++- 5 files changed, 168 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html index 19934124ce..52d7b321bd 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.html +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html @@ -150,6 +150,72 @@ +
+
+ + Circulation (Experimental) + +
+ + + Search for Patrons + + + + Check Out + + + + Check In + + + + Capture Holds + + + + Pull List for Hold Requests + + + + Renew Items + + + + Register Patron + + + + Retrieve Last Patron + + + + Retrieve Recent Patrons + + + + Verify Credentials + +
+
+
+
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.ts b/Open-ILS/src/eg2/src/app/staff/nav.component.ts index ccd6848a9e..e8246b44c6 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.ts @@ -10,6 +10,7 @@ import {PrintService} from '@eg/share/print/print.service'; import {StoreService} from '@eg/core/store.service'; import {NetRequest, NetService} from '@eg/core/net.service'; import {OpChangeComponent} from '@eg/staff/share/op-change/op-change.component'; +import {PermService} from '@eg/core/perm.service'; @Component({ selector: 'eg-staff-nav-bar', @@ -27,6 +28,7 @@ export class StaffNavComponent implements OnInit, OnDestroy { showTraditionalCatalog = true; showAngularAcq: boolean; curbsideEnabled: boolean; + showAngularCirc = false; @ViewChild('navOpChange', {static: false}) opChange: OpChangeComponent; permFailedSub: Subscription; @@ -37,6 +39,7 @@ export class StaffNavComponent implements OnInit, OnDestroy { private net: NetService, private org: OrgService, private auth: AuthService, + private perm: PermService, private pcrud: PcrudService, private locale: LocaleService, private printer: PrintService @@ -68,6 +71,20 @@ export class StaffNavComponent implements OnInit, OnDestroy { this.org.settings('circ.curbside') .then(settings => this.curbsideEnabled = Boolean(settings['circ.curbside'])); + + // Do we show the angular circ menu? + // TODO remove these once Angular Circ takes over. + const angSet = 'ui.staff.angular_circ.enabled'; + const angPerm = 'ACCESS_ANGULAR_CIRC'; + + this.org.settings(angSet).then(s => { + if (s[angSet]) { + return this.perm.hasWorkPermHere([angPerm]) + .then(perms => perms[angPerm]); + } else { + return false; + } + }).then(enable => this.showAngularCirc = enable); } // Wire up our op-change component as the general purpose diff --git a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts index 97e52d64a2..b8d224c43b 100644 --- a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts @@ -143,7 +143,7 @@ export class StaffResolver implements Resolve> { /** * Fetches data common to all staff interfaces. */ - loadStartupData(): Promise { + loadStartupData(): Promise { // Fetch settings needed globally. This will cache the values // in the org service. @@ -153,6 +153,7 @@ export class StaffResolver implements Resolve> { 'webstaff.format.date_and_time', 'ui.staff.max_recent_patrons', 'circ.curbside', // navbar + 'ui.staff.angular_circ.enabled', 'ui.staff.angular_catalog.enabled' // navbar ]).then(settings => { // Avoid clobbering defaults @@ -166,6 +167,10 @@ export class StaffResolver implements Resolve> { this.format.dateTimeFormat = settings['webstaff.format.date_and_time']; } + // TODO remove these once Angular Circ takes over. + if (settings['ui.staff.angular_circ.enabled']) { + return this.perm.hasWorkPermHere(['ACCESS_ANGULAR_CIRC']); + } }); } } diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2 index 355574bded..fb95da04d5 100644 --- a/Open-ILS/src/templates/staff/navbar.tt2 +++ b/Open-ILS/src/templates/staff/navbar.tt2 @@ -255,6 +255,77 @@ + + +
  • + [% l('Circulation (Experimental)') %] + + + + +
    • +
  • [% l('Cataloging') %]