From 41104432c10e16fee1fa88034f4194f521c3988d Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 7 Jun 2021 12:49:54 -0400 Subject: [PATCH] LP1904036 Separate Circulation (Experimental) Menu Move all new experimental Angular Circulation interfaces into a single menu entry which can be enabled via a new org setting: ui.staff.angular_circ.enabled Signed-off-by: Bill Erickson --- Open-ILS/src/eg2/src/app/staff/nav.component.html | 70 ++++++++++++----- Open-ILS/src/eg2/src/app/staff/nav.component.ts | 14 ++++ Open-ILS/src/eg2/src/app/staff/resolver.service.ts | 1 + .../eg2/src/app/staff/share/circ/circ.service.ts | 2 +- .../sql/Pg/upgrade/XXXX.data.angular-patron.sql | 18 ++++- Open-ILS/src/templates/staff/navbar.tt2 | 87 +++++++++++++++------- .../web/js/ui/default/staff/services/navbar.js | 3 + 7 files changed, 149 insertions(+), 46 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 9416ccc9c4..7360b8bf17 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.html +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html @@ -23,10 +23,6 @@ Search for Patrons - - - Search for Patrons (Experimental) - Search for Items by Barcode @@ -59,22 +55,12 @@ Check In - - - Check In (Experimental) - Capture Holds - - - Capture Holds (Experimental) - Pull List for Hold Requests @@ -85,10 +71,6 @@ Renew Items - - - Renew Items (Experimental) - @@ -101,7 +83,7 @@ Retrieve Last Patron - + Retrieve Recent Patrons @@ -168,6 +150,56 @@ + +
+
+ + Circulation (Experimental) + +
+ + + Search for Patrons + +
+ + + Check Out + + + + Check In + + + + Capture Holds + + + + Renew Items + + + + Register Patron + + + + Retrieve Last Patron + + + + Retrieve Recent Patrons + +
+
+
+
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 89d98ac31e..84c93a9b68 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.ts @@ -26,6 +26,9 @@ export class StaffNavComponent implements OnInit, OnDestroy { // When active, show a link to the experimental Angular staff catalog showAngularCatalog: boolean; curbsideEnabled: boolean; + showAngularCirc = false; // ui.staff.angular_circ.enabled + showRecentPatron = false; + showRecentPatrons = false; @ViewChild('navOpChange', {static: false}) opChange: OpChangeComponent; permFailedSub: Subscription; @@ -72,6 +75,17 @@ export class StaffNavComponent implements OnInit, OnDestroy { this.permFailedSub = this.net.permFailed$.subscribe( (req: NetRequest) => this.opChange.escalateRequest(req)); + + this.org.settings([ + 'ui.staff.angular_circ.enabled', + 'ui.staff.max_recent_patrons' + ]) + .then(sets => { + this.showAngularCirc = sets['ui.staff.angular_circ.enabled']; + const maxRecent = Number(sets['ui.staff.max_recent_patrons']); + this.showRecentPatron = maxRecent > 0; + this.showRecentPatrons = maxRecent > 1; + }); } ngOnDestroy() { 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 de6252b059..ad9dc1010c 100644 --- a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts @@ -141,6 +141,7 @@ export class StaffResolver implements Resolve> { 'webstaff.format.dates', 'webstaff.format.date_and_time', 'ui.staff.max_recent_patrons', + 'ui.staff.angular_circ.enabled', 'ui.staff.angular_catalog.enabled' // navbar ]).then(settings => { // Avoid clobbering defaults diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts index 1891887c8d..ffe0d38b95 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts @@ -1187,7 +1187,7 @@ export class CircService { return this.components.badBarcodeDialog.open().toPromise() // Avoid prompting again on an override .then(response => { - params._checkbarcode = false + params._checkbarcode = false; return response; }); } diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql index 58abf7c38c..98e668b424 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql @@ -422,7 +422,7 @@ UPDATE config.print_template SET template = $TEMPLATE$
Printed by [% staff.first_given_name %] at [% staff_org.shortname %]
-$TEMPLATE$ WHERE name = 'transit_slip'; +$TEMPLATE$ WHERE name = 'hold_transit_slip'; INSERT INTO config.print_template (name, label, owner, active, locale, content_type, template) @@ -641,6 +641,22 @@ UPDATE config.print_template SET template = $TEMPLATE$ $TEMPLATE$ WHERE name = 'renew'; +INSERT into config.org_unit_setting_type (name, grp, label, description, datatype) +VALUES ( + 'ui.staff.angular_circ.enabled', 'gui', + oils_i18n_gettext( + 'ui.staff.angular_circ.enabled', + 'Enable Angular Circulation Menu', + 'coust', 'label' + ), + oils_i18n_gettext( + 'ui.staff.angular_circ.enabled', + 'Enable the Circulation menu for the experimental Angular Circulation UIs', + 'coust', 'description' + ), + 'bool' +); + COMMIT; diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2 index aad32ac26b..50d499fd0c 100644 --- a/Open-ILS/src/templates/staff/navbar.tt2 +++ b/Open-ILS/src/templates/staff/navbar.tt2 @@ -43,12 +43,6 @@
  • - - - [% l('Search for Patrons (Experimental)') %] - -
    • -
  • @@ -99,12 +93,6 @@ [% l('Check In') %]
    • -
  • - - - [% l('Check In (Experimental)') %] - -
  • - - - [% l('Capture Holds (Experimental)') %] - -
    • -
  • [% l('Pull List for Hold Requests') %] @@ -141,13 +123,6 @@ [% l('Renew Items') %]
    • -
  • - - - [% l('Renew Items (Experimental)') %] - -
    • -
    • + +
  • + [% l('Circulation (Experimental)') %] + + + +
    • +
  • [% l('Cataloging') %]