From cd33336d7aa10b5672b09fe8b07ce1e84ea03eee Mon Sep 17 00:00:00 2001 From: blake Date: Fri, 21 Jan 2022 11:53:39 -0600 Subject: [PATCH] NOBLE client-side customizations Signed-off-by: blake --- .../staff/catalog/record/actions.component.html | 8 +- .../app/staff/catalog/search-form.component.html | 10 +- Open-ILS/src/eg2/src/app/staff/nav.component.html | 133 +++++++++++++++++---- .../src/app/staff/share/holds/grid.component.html | 4 +- .../src/eg2/src/app/staff/splash.component.html | 87 +++++++++++++- Open-ILS/src/eg2/src/app/staff/splash.component.ts | 9 +- Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js | 4 +- .../web/js/ui/default/circ/selfcheck/selfcheck.js | 26 +++- Open-ILS/web/js/ui/default/opac/ac_google_books.js | 17 ++- Open-ILS/web/js/ui/default/opac/ebook_api/avail.js | 8 +- .../web/js/ui/default/opac/ebook_api/loggedin.js | 4 +- .../web/js/ui/default/opac/holds-validation.js | 3 +- Open-ILS/web/js/ui/default/opac/simple.js | 87 ++++++++++++++ Open-ILS/web/js/ui/default/staff/app.js | 4 +- .../js/ui/default/staff/cat/bucket/record/app.js | 2 +- .../web/js/ui/default/staff/cat/volcopy/app.js | 17 ++- .../web/js/ui/default/staff/circ/patron/regctl.js | 3 +- .../web/js/ui/default/staff/circ/services/circ.js | 20 ++++ 18 files changed, 394 insertions(+), 52 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.html index 78f469505a..c27a8b09d5 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.html @@ -18,9 +18,13 @@
- - + + + + + + diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html index c63c5e8e63..c57f62fddb 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html @@ -66,10 +66,10 @@ - + i18n value='starts'>Starts with-->
@@ -122,8 +122,8 @@ - - + + @@ -227,7 +227,7 @@
'+ - '
{{empty_label_string}}
'+ + '
{{empty_label_string}}
'+ '
'+ '
'+ ''+ @@ -661,6 +661,9 @@ function(egCore , $q) { if (!$scope.callNumber.label()) $scope.callNumber.empty_label = true; $scope.empty_label = false; + egCore.org.settings('cat.require_call_number_labels').then(function(res) { + $scope.require_label = res['cat.require_call_numbrer_labels']; + }); $scope.empty_label_string = window.empty_label_string; $scope.idTracker = function (x) { if (x && x.id) return x.id() }; @@ -1054,6 +1057,11 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore , } }; + egCore.org.settings('cat.require_call_number_labels').then( + function(res) { + $scope.require_label = res['cat.require_call_number_labels' + ]; + }); $scope.new_lib_to_add = egCore.org.get(egCore.auth.user().ws_ou()); $scope.changeNewLib = function (org) { $scope.new_lib_to_add = org; @@ -1754,10 +1762,13 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore , itemSvc.copies, function (i) { if (!$scope.only_vols) { - if (i.duplicate_barcode || i.empty_barcode || i.call_number().empty_label) { + if (i.duplicate_barcode || i.empty_barcode || i.call_number().empty_label && $scope.require_label) { + can_save = false; + } + if (i.call_number().empty_label && $scope.require_label) { can_save = false; } - } else if (i.call_number().empty_label) { + } else if (i.call_number().empty_label && $scope.require_label) { can_save = false; } } diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js index ac1894ce45..73611c12bf 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js @@ -987,8 +987,7 @@ angular.module('egCoreMod') var clone_fields = [ 'day_phone', 'evening_phone', - 'other_phone', - 'usrgroup' + 'other_phone' ]; angular.forEach(clone_fields, function(field) { diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js index 6f22aa8cc1..cca9bb55a3 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js +++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js @@ -50,11 +50,13 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl } // these events can be overridden by staff during checkout + // NOBLE added PATRON_EXCEEDS_LONG_OVERDUE service.checkout_overridable_events = [ 'PATRON_EXCEEDS_OVERDUE_COUNT', 'PATRON_EXCEEDS_CHECKOUT_COUNT', 'PATRON_EXCEEDS_FINES', 'PATRON_EXCEEDS_LONGOVERDUE_COUNT', + 'PATRON_EXCEEDS_LONG_OVERDUE', 'PATRON_BARRED', 'CIRC_EXCEEDS_COPY_RANGE', 'ITEM_DEPOSIT_REQUIRED', @@ -87,12 +89,14 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl // overridable during renewal + // NOBLE added PATRON_EXCEEDS_LONG_OVERDUE service.renew_overridable_events = [ 'PATRON_EXCEEDS_OVERDUE_COUNT', 'PATRON_EXCEEDS_LOST_COUNT', 'PATRON_EXCEEDS_CHECKOUT_COUNT', 'PATRON_EXCEEDS_FINES', 'PATRON_EXCEEDS_LONGOVERDUE_COUNT', + 'PATRON_EXCEEDS_LONG_OVERDUE', 'CIRC_EXCEEDS_COPY_RANGE', 'ITEM_DEPOSIT_REQUIRED', 'ITEM_RENTAL_FEE_REQUIRED', @@ -1841,6 +1845,22 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl }); } print_context.patron = egCore.idl.toHash(data.patron); + /* NOBLE -- update preferrd name to always have a value for name */ + var pref_prefix = print_context.patron.pref_prefix; + if (!pref_prefix) print_context.patron.pref_prefix = print_context.patron.prefix; + + var pref_first = print_context.patron.pref_first_given_name; + if (!pref_first) print_context.patron.pref_first_given_name = print_context.patron.first_given_name; + + var pref_second = print_context.patron.pref_second_given_name; + if (!pref_second) print_context.patron.pref_second_given_name = print_context.patron.second_given_name; + + var pref_family = print_context.patron.pref_family_name; + if (!pref_family) print_context.patron.pref_family_name = print_context.patron.family_name; + + var pref_suffix = print_context.patron.pref_suffix; + if (!pref_suffix) print_context.patron.pref_suffix = print_context.patron.suffix; + /* END - NOBLE */ } var sound = 'info.checkin.transit'; -- 2.11.0