From: Scott Angel Date: Wed, 17 May 2023 16:17:20 +0000 (-0500) Subject: LP2008834 - Option to Hide Strict Barcode X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fscottangel%2FLP2008834-option-to-hide-strict-barcode;p=working%2FEvergreen.git LP2008834 - Option to Hide Strict Barcode Added angular hide strict barcode functionallity. Updated my release note to better fit the 'style'. Signed-off-by: Scott Angel --- diff --git a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html index 4542213374..febb6b3df9 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html +++ b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html @@ -295,7 +295,7 @@
-
+
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.ts index f95481f00f..c193d6cba0 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.ts @@ -71,6 +71,7 @@ export class CheckinComponent implements OnInit, AfterViewInit { fineTally = 0; isHoldCapture = false; strictBarcode = false; + hideStrictBarcode: boolean = false; trimList = false; itemNeverCirced: string; persistKey: string; @@ -127,6 +128,9 @@ export class CheckinComponent implements OnInit, AfterViewInit { CHECKIN_MODIFIERS.map(mod => `eg.circ.checkin.${mod}`) .concat(SETTINGS); + this.store.getItem('ui.circ.hide_patron_strict_barcode') + .then(hideStrict => this.hideStrictBarcode = !hideStrict); + this.store.getItemBatch(setNames).then(sets => { CHECKIN_MODIFIERS.forEach(mod => this.modifiers[mod] = sets[`eg.circ.checkin.${mod}`]); diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html index 491be2922c..2c513358d0 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html @@ -150,7 +150,7 @@
-
+
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.ts index 839b0b62e2..5a7efdb9f1 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.ts @@ -45,6 +45,7 @@ export class CheckoutComponent implements OnInit, AfterViewInit { dueDateOptions: 0 | 1 | 2 = 0; // auto date; specific date; session date dueDateInvalid = false; printOnComplete = true; + hideStrictBarcode = false; strictBarcode = false; private copiesInFlight: {[barcode: string]: boolean} = {}; @@ -100,6 +101,9 @@ export class CheckoutComponent implements OnInit, AfterViewInit { ); }); + this.serverStore.getItem('ui.circ.hide_patron_strict_barcode') + .then(hideStrict => this.hideStrictBarcode = !hideStrict); + this.serverStore.getItem('circ.checkout.strict_barcode') .then(strict => this.strictBarcode = strict); } diff --git a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html index 726aa612f5..eb98f8ca5a 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html +++ b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html @@ -171,7 +171,7 @@
-
+
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.ts index 473014ce8a..c65496236b 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.ts @@ -50,6 +50,7 @@ export class RenewComponent implements OnInit, AfterViewInit { dueDate: string; useDueDate = false; fineTally = 0; + hideStrictBarcode: boolean = false; strictBarcode = false; trimList = false; itemNeverCirced: string; @@ -88,6 +89,9 @@ export class RenewComponent implements OnInit, AfterViewInit { return from(this.renewals); }; + this.store.getItem('ui.circ.hide_patron_strict_barcode') + .then(hideStrict => this.hideStrictBarcode = !hideStrict) + this.store.getItemBatch(['circ.renew.strict_barcode']) .then(sets => { this.strictBarcode = sets['circ.renew.strict_barcode']; diff --git a/docs/RELEASE_NOTES_NEXT/Circulation/option-to-hide-strict-barcode.adoc b/docs/RELEASE_NOTES_NEXT/Circulation/option-to-hide-strict-barcode.adoc index 0aecfa0cb8..4695c74877 100644 --- a/docs/RELEASE_NOTES_NEXT/Circulation/option-to-hide-strict-barcode.adoc +++ b/docs/RELEASE_NOTES_NEXT/Circulation/option-to-hide-strict-barcode.adoc @@ -1,3 +1,3 @@ == Option to hide strict barcode == -Allows libraries the option to hide the strict barcode checkbox via org setting as some libraries don't use the strict barcode feature. \ No newline at end of file +Adds option to hide the strict barcode checkbox via org setting. \ No newline at end of file