May 2025 - Evergreen-commits - Evergreen Mailing Lists Server

[GIT] Evergreen ILS branch rel_3_15 updated. 99c30adb72a1c9755d5f74f9e2383d2b77a4bfff
by Git User 19 May '25

19 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via 99c30adb72a1c9755d5f74f9e2383d2b77a4bfff (commit) from 6ba23044461d431c4e867858202d660cace6dbef (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 99c30adb72a1c9755d5f74f9e2383d2b77a4bfff Author: Jason Stephenson <jason(a)sigio.com> Date: Fri Aug 14 12:42:24 2020 -0400 LP 1890629: Make Self-Registration Opt-in Settings Lookup Tree Aware Patron self-registration in the OPAC only shows the opt-in settings if the events are owned specifically at one of the locations where patron self-registration is also allowed. The event could be owned higher up the org. tree from the libraries that allow self-registration, particularly in a consortium where not all members do self-registration. This patch changes the search for opt-in events to include the ancestor org. units of those that allow self-registration. Release-note: Makes patron self-registration aware of org unit tree. Signed-off-by: Jason Stephenson <jason(a)sigio.com> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm index c3530334ea..2cb875e217 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm @@ -6,6 +6,7 @@ use OpenILS::Utils::Fieldmapper; use OpenILS::Application::AppUtils; use OpenILS::Utils::CStoreEditor qw/:funcs/; use OpenILS::Event; +use List::MoreUtils qw/uniq/; use Data::Dumper; $Data::Dumper::Indent = 0; my $U = 'OpenILS::Application::AppUtils'; @@ -142,13 +143,20 @@ sub collect_opt_in_settings { my $self = shift; my $e = $self->editor; + # Get the valid_orgs and their ancestors, because the event def + # may be owned higher up the tree. + my @opt_orgs = (); + for my $orgs (map { $U->get_org_ancestors($_) } @{ $self->ctx->{register}{valid_orgs} }) { + push(@opt_orgs, @{$orgs}); + } + my $types = $e->json_query({ select => {cust => ['name']}, from => {atevdef => 'cust'}, transform => 'distinct', where => { '+atevdef' => { - owner => [ map { $_ } @{ $self->ctx->{register}{valid_orgs} } ], + owner => [ uniq @opt_orgs ], active => 't' } } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 6493ac73e950a8d3bd682279a1f9bd7d129f301d
by Git User 19 May '25

19 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 6493ac73e950a8d3bd682279a1f9bd7d129f301d (commit) from a90440c7a53fff9d8feff78f61a2bae2d0464d0d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6493ac73e950a8d3bd682279a1f9bd7d129f301d Author: Jason Stephenson <jason(a)sigio.com> Date: Fri Aug 14 12:42:24 2020 -0400 LP 1890629: Make Self-Registration Opt-in Settings Lookup Tree Aware Patron self-registration in the OPAC only shows the opt-in settings if the events are owned specifically at one of the locations where patron self-registration is also allowed. The event could be owned higher up the org. tree from the libraries that allow self-registration, particularly in a consortium where not all members do self-registration. This patch changes the search for opt-in events to include the ancestor org. units of those that allow self-registration. Release-note: Makes patron self-registration aware of org unit tree. Signed-off-by: Jason Stephenson <jason(a)sigio.com> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm index c3530334ea..2cb875e217 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm @@ -6,6 +6,7 @@ use OpenILS::Utils::Fieldmapper; use OpenILS::Application::AppUtils; use OpenILS::Utils::CStoreEditor qw/:funcs/; use OpenILS::Event; +use List::MoreUtils qw/uniq/; use Data::Dumper; $Data::Dumper::Indent = 0; my $U = 'OpenILS::Application::AppUtils'; @@ -142,13 +143,20 @@ sub collect_opt_in_settings { my $self = shift; my $e = $self->editor; + # Get the valid_orgs and their ancestors, because the event def + # may be owned higher up the tree. + my @opt_orgs = (); + for my $orgs (map { $U->get_org_ancestors($_) } @{ $self->ctx->{register}{valid_orgs} }) { + push(@opt_orgs, @{$orgs}); + } + my $types = $e->json_query({ select => {cust => ['name']}, from => {atevdef => 'cust'}, transform => 'distinct', where => { '+atevdef' => { - owner => [ map { $_ } @{ $self->ctx->{register}{valid_orgs} } ], + owner => [ uniq @opt_orgs ], active => 't' } } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 03b9783eaed54a5f64f30b6f720ffdd3a7e89d7b
by Git User 19 May '25

19 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via 03b9783eaed54a5f64f30b6f720ffdd3a7e89d7b (commit) from f446fe82a7718476db98049ff0f20c95ed8c561b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 03b9783eaed54a5f64f30b6f720ffdd3a7e89d7b Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue May 13 18:40:49 2025 +0000 LP2109745 Color correction for heading 2 (staff) In bug 2106666, a typo caused H2 in light mode to use the dark mode color definition, a very light green, which creates contrast issues on the staff splash page and many other pages that use subheadings (patron registration, reports, etc.). Release-note: Fixes the H2 green color for staff screens in light mode Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: John Amundson <jamundson(a)cwmars.org> Signed-off-by: Jason Stephenson <jason(a)sigio.com> diff --git a/Open-ILS/src/eg2/src/assets/css/light.css b/Open-ILS/src/eg2/src/assets/css/light.css index 7f099be099..f37c7123c1 100644 --- a/Open-ILS/src/eg2/src/assets/css/light.css +++ b/Open-ILS/src/eg2/src/assets/css/light.css @@ -1,6 +1,6 @@ /* Light mode */ :root { - --evergreen: var(--eg-green-200); /* brand color */ + --evergreen: var(--eg-green-600); /* brand color */ --black: black; --white: white; --bs-white: white; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/assets/css/light.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 6ba23044461d431c4e867858202d660cace6dbef
by Git User 19 May '25

19 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via 6ba23044461d431c4e867858202d660cace6dbef (commit) from 0117c2666d63e599850262574581b3a0d618aba2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6ba23044461d431c4e867858202d660cace6dbef Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue May 13 18:40:49 2025 +0000 LP2109745 Color correction for heading 2 (staff) In bug 2106666, a typo caused H2 in light mode to use the dark mode color definition, a very light green, which creates contrast issues on the staff splash page and many other pages that use subheadings (patron registration, reports, etc.). Release-note: Fixes the H2 green color for staff screens in light mode Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: John Amundson <jamundson(a)cwmars.org> Signed-off-by: Jason Stephenson <jason(a)sigio.com> diff --git a/Open-ILS/src/eg2/src/assets/css/light.css b/Open-ILS/src/eg2/src/assets/css/light.css index 7f099be099..f37c7123c1 100644 --- a/Open-ILS/src/eg2/src/assets/css/light.css +++ b/Open-ILS/src/eg2/src/assets/css/light.css @@ -1,6 +1,6 @@ /* Light mode */ :root { - --evergreen: var(--eg-green-200); /* brand color */ + --evergreen: var(--eg-green-600); /* brand color */ --black: black; --white: white; --bs-white: white; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/assets/css/light.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. a90440c7a53fff9d8feff78f61a2bae2d0464d0d
by Git User 19 May '25

19 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via a90440c7a53fff9d8feff78f61a2bae2d0464d0d (commit) from 6c34d66d7185d9b7d583a3c262b01c08dcb5a8ce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a90440c7a53fff9d8feff78f61a2bae2d0464d0d Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue May 13 18:40:49 2025 +0000 LP2109745 Color correction for heading 2 (staff) In bug 2106666, a typo caused H2 in light mode to use the dark mode color definition, a very light green, which creates contrast issues on the staff splash page and many other pages that use subheadings (patron registration, reports, etc.). Release-note: Fixes the H2 green color for staff screens in light mode Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: John Amundson <jamundson(a)cwmars.org> Signed-off-by: Jason Stephenson <jason(a)sigio.com> diff --git a/Open-ILS/src/eg2/src/assets/css/light.css b/Open-ILS/src/eg2/src/assets/css/light.css index 7f099be099..f37c7123c1 100644 --- a/Open-ILS/src/eg2/src/assets/css/light.css +++ b/Open-ILS/src/eg2/src/assets/css/light.css @@ -1,6 +1,6 @@ /* Light mode */ :root { - --evergreen: var(--eg-green-200); /* brand color */ + --evergreen: var(--eg-green-600); /* brand color */ --black: black; --white: white; --bs-white: white; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/assets/css/light.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 6c34d66d7185d9b7d583a3c262b01c08dcb5a8ce
by Git User 15 May '25

15 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 6c34d66d7185d9b7d583a3c262b01c08dcb5a8ce (commit) via 4a7d84b3bd563c8212533f987547186862dd08ed (commit) from 7dfe7cd53939a0c3faed5ca4255099bd0389a7b0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6c34d66d7185d9b7d583a3c262b01c08dcb5a8ce Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Thu May 15 11:46:33 2025 -0400 LP2095128 Stamp upgrade script Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 13d695aadf..01eed66e7e 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps BEFORE INSERT OR UPDATE ON config.db_patch_dependencies FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1468', :eg_version); -- miker/rdavis/jeffdavis/jeff +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1469', :eg_version); -- dbriem/edavis/tmccanna CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.in_house_use_inventory_cwst.sql b/Open-ILS/src/sql/Pg/upgrade/1469.data.in_house_use_inventory_cwst.sql similarity index 82% rename from Open-ILS/src/sql/Pg/upgrade/xxxx.data.in_house_use_inventory_cwst.sql rename to Open-ILS/src/sql/Pg/upgrade/1469.data.in_house_use_inventory_cwst.sql index 3947bd3129..246baa46b7 100644 --- a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.in_house_use_inventory_cwst.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1469.data.in_house_use_inventory_cwst.sql @@ -1,6 +1,6 @@ BEGIN; -SELECT evergreen.upgrade_deps_block_check('xxxx', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1469', :eg_version); INSERT INTO config.workstation_setting_type (name, grp, datatype, label) VALUES ('eg.circ.in_house.do_inventory_update', 'circ', 'bool', commit 4a7d84b3bd563c8212533f987547186862dd08ed Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Fri Jan 31 19:31:48 2025 +0000 LP#2095128 Add inventory option to in-house use Adds workstation setting type: eg.circ.in_house.do_inventory_update that will create a copy inventory when creating an in-house use if the location matches the copy's circulating library or the copy can float there. The setting is toggled by a checkbox on the in-house use interface. The setting is ignored when non-cataloged in-house uses are created. To test: 1. Scan an in-house use for a copy at your workstation library 2. Scan WS copy in item status, note no inventory was created 3. Check the Update Inventory checkbox in the in-house use interface 4. Repeat steps 1 and 2, note an inventory was created 5. Scan an in-house for a copy at a different library 6. Scan the copy in item status, note an inventory was not created 7. Create a floating group and add 2 libs (or ancestor) as members 8. Edit the copy and change its floating attribute to the group 9. Repeat step 5 and 6, note an inventory was created Release-note: Adds checkbox to in-house use to allow inventory updates. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Elizabeth Davis <elizabeth.davis(a)sparkpa.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm index 17808476a6..474e00db9a 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm @@ -715,6 +715,7 @@ __PACKAGE__->register_method( 'location' The org unit id where the in-house use occurs 'copyid' The copy in question 'count' The number of in-house uses to apply to this copy + 'do_inventory_update' If true, create an inventory entry (optional) @return An array of id's representing the id's of the newly created in-house use objects or an event on an error /); @@ -785,6 +786,32 @@ sub create_in_house_use { push( @ids, $ihu->id ); } + if ($params->{do_inventory_update} && !$non_cat) { + my $do_inventory = $copy->circ_lib == $org; + + if (!$do_inventory && $copy->floating) { + my $res = $e->json_query({ + from => [ + 'evergreen.can_float', + $copy->floating, + $copy->circ_lib, + $org + ] + }); + $do_inventory = $U->is_true( + $res->[0]->{'evergreen.can_float'} + ); + } + + if ($do_inventory) { + my $aci = Fieldmapper::asset::copy_inventory->new; + $aci->inventory_date('now'); + $aci->inventory_workstation($e->requestor->wsid); + $aci->copy($copyid); + $e->create_asset_copy_inventory($aci) or return $e->event; + } + } + $e->commit; return \@ids; } diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 8f34ce9ced..a57aaafb5d 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -19454,6 +19454,13 @@ VALUES ( 'Checkin: Update Inventory', 'cwst', 'label' ) +), ( + 'eg.circ.in_house.do_inventory_update', 'circ', 'bool', + oils_i18n_gettext ( + 'eg.circ.in_house.do_inventory_update', + 'In-House Use: Update Inventory', + 'cwst', 'label' + ) ), ( 'eg.circ.patron.summary.collapse', 'circ', 'bool', oils_i18n_gettext( diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.in_house_use_inventory_cwst.sql b/Open-ILS/src/sql/Pg/upgrade/xxxx.data.in_house_use_inventory_cwst.sql new file mode 100644 index 0000000000..3947bd3129 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/xxxx.data.in_house_use_inventory_cwst.sql @@ -0,0 +1,14 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('xxxx', :eg_version); + +INSERT INTO config.workstation_setting_type (name, grp, datatype, label) +VALUES ('eg.circ.in_house.do_inventory_update', 'circ', 'bool', + oils_i18n_gettext ( + 'eg.circ.in_house.do_inventory_update', + 'In-House Use: Update Inventory', + 'cwst', 'label' + ) +); + +COMMIT; diff --git a/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 b/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 index 4c5ddfc482..8971463500 100644 --- a/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 @@ -57,6 +57,13 @@ class="form-control" ng-model="args.barcode" ng-disabled="args.noncat_type != 'barcode'"/> <input class="btn btn-default" type="submit" value="[% l('Submit') %]"/> + + <label class="pad-horiz"> + <input type="checkbox" ng-model="do_inventory_update" + ng-change="toggle_do_inventory_update()" + ng-disabled="!isBarcodeMode()"> + [% l('Update Inventory') %] + </label> </div> </div> </div> @@ -66,6 +73,14 @@ <div class="col-md-6 alert alert-danger">[% l('Item Not Found') %]</div> </div> +<div class="row" ng-if="do_inventory_update && isBarcodeMode()"> + <div class="col-md-12"> + <div class="alert alert-danger pad-all-min"> + [% l('Update Inventory') %] + </div> + </div> +</div> + <eg-grid id-field="index" features="-display,-sort,-multisort" diff --git a/Open-ILS/web/js/ui/default/staff/circ/in_house_use/app.js b/Open-ILS/web/js/ui/default/staff/circ/in_house_use/app.js index 6c65122210..f5bf8ea2bf 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/in_house_use/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/in_house_use/app.js @@ -16,6 +16,8 @@ function($scope , egCore , egGridDataProvider , egConfirmDialog, var countCap; var countMax; + $scope.do_inventory_update = false; + egCore.startup.go().then(function() { // grab our non-cat types after startup @@ -44,6 +46,11 @@ function($scope , egCore , egGridDataProvider , egConfirmDialog, $scope.checkinAlert = checkinAlert = set['circ.in_house_use.checkin_alert'] || false; }); + + egCore.hatch.getItem('eg.circ.in_house.do_inventory_update') + .then(function(doInventoryUpdate) { + $scope.do_inventory_update = doInventoryUpdate; + }); }); $scope.bcFocus = true; @@ -114,6 +121,10 @@ function($scope , egCore , egGridDataProvider , egConfirmDialog, coArgs.copyid = copy.id(); + if ($scope.do_inventory_update) { + coArgs.do_inventory_update = true; + } + copy.call_number().record().flat_display_entries( egBibDisplay.mfdeToHash( copy.call_number().record().flat_display_entries()) @@ -189,4 +200,17 @@ function($scope , egCore , egGridDataProvider , egConfirmDialog, }); } + $scope.toggle_do_inventory_update = function() { + var key = 'eg.circ.in_house.do_inventory_update'; + if ($scope.do_inventory_update) { + egCore.hatch.setItem(key, true); + } else { + egCore.hatch.removeItem(key); + } + }; + + $scope.isBarcodeMode = function() { + return $scope.args.noncat_type === 'barcode'; + }; + }]) ----------------------------------------------------------------------- Summary of changes: .../src/perlmods/lib/OpenILS/Application/Circ.pm | 27 ++++++++++++++++++++++ Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 7 ++++++ .../1469.data.in_house_use_inventory_cwst.sql | 14 +++++++++++ .../templates/staff/circ/in_house_use/index.tt2 | 15 ++++++++++++ .../js/ui/default/staff/circ/in_house_use/app.js | 24 +++++++++++++++++++ 6 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1469.data.in_house_use_inventory_cwst.sql hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. f446fe82a7718476db98049ff0f20c95ed8c561b
by Git User 15 May '25

15 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via f446fe82a7718476db98049ff0f20c95ed8c561b (commit) via 84f1bb59ab5cf419e16cc5f4604628269d68659c (commit) from 5f958ee28fcf2b036af146100d5ae68910e6a3b8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f446fe82a7718476db98049ff0f20c95ed8c561b Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Mar 21 17:57:29 2025 +0000 LP2037689 Follow-up: handle query errors gracefully Adds an error catch to reset the search button's in-progress state. Also clears progress and errors when switching between ID and TCN modes. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Bill Erickson <berickxx(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html index c062f4c14a..7cf4ac55f8 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html @@ -16,7 +16,7 @@ </label> <select class="form-select w-auto mx-2" id="bib-ident-type" - [(ngModel)]="identType" formControlName="bibIdentType"> + [(ngModel)]="identType" (ngModelChange)="resetQuery()" formControlName="bibIdentType"> <option value="id">ID</option> <option value="tcn">TCN</option> </select> @@ -29,23 +29,28 @@ (keyup.enter)="search()" [(ngModel)]="identValue" formControlName="bibIdentValue" class="form-control mx-2 w-auto" aria-describedby="bib-ident-status" /> - <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()" i18n> - Search + <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()"> + <span *ngIf="!searchInProgress" i18n>Search</span> + <span *ngIf="searchInProgress" i18n>Searching...</span> </button> <div *ngIf="searchInProgress" role="status"> <span class="visually-hidden">Searching...</span> - <span class="material-icons" aria-hidden="true">pending</span> </div> </div> - <div class="invalid-feedback d-block fs-4" role="status" id="bib-ident-status"> - <div *ngIf="notFound && !multiRecordsFound" i18n> - Record not found: {{identValue}} - </div> - <div *ngIf="multiRecordsFound" i18n> - More than one Bib Record found with TCN: {{identValue}} + <div role="status" id="bib-ident-status"> + <div class="invalid-feedback d-block fs-4"> + <div *ngIf="notFound && !multiRecordsFound" i18n> + Record not found: {{identValue}} + </div> + <div *ngIf="multiRecordsFound" i18n> + More than one Bib Record found with TCN: {{identValue}} + </div> + <div *ngIf="queryError" i18n> + The server encountered an error. Please try a different search. + </div> </div> </div> </form> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts index dcd844d9d0..68489f85aa 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts @@ -16,7 +16,8 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { notFound = false; multiRecordsFound = false; bibIdentGroup: FormGroup; - searchInProgress: boolean = null; + searchInProgress = false; + queryError = false; constructor( private router: Router, @@ -44,6 +45,7 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { search() { if (!this.identValue) { return; } this.searchInProgress = true; + this.queryError = null; this.notFound = false; this.multiRecordsFound = false; @@ -63,9 +65,18 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { } else { this.goToRecord(id); } + }).catch(err => { + this.queryError = true; + this.searchInProgress = false; }); } + resetQuery() { + this.notFound = false; + this.queryError = false; + this.searchInProgress = false; + } + getById(): Promise<number> { // Confirm the record exists before redirecting. return this.pcrud.retrieve('bre', this.identValue).toPromise() commit 84f1bb59ab5cf419e16cc5f4604628269d68659c Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Mar 14 05:45:26 2025 +0000 LP2037689 Retrieve Bib by ID/TCN form accessibility Fixes overly wide search input and isolated submit button in Retrieve Bib by ID/TCN form. Adds a dropdown to switch between ID and TCN without having to go to the navbar. Adds search in progress icon, form labels, ARIA messaging, and Angular form validation logic. Release-note: Fixes display and accessibility bugs in Retrieve Bib by ID/TCN form Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Bill Erickson <berickxx(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html index 475f6c4f48..c062f4c14a 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html @@ -9,28 +9,43 @@ </ng-container> -<div class="row form-validated mt-5"> - <div class="col-lg-6 form-inline"> - <div class="input-group"> - <span class="input-group-text" id="bib-ident-label"> - <ng-container *ngIf="identType === 'id'" i18n>Record ID:</ng-container> - <ng-container *ngIf="identType === 'tcn'" i18n>Record TCN:</ng-container> - </span> - <input id="bib-ident-value" type="text" required - (keyup.enter)="search()" [(ngModel)]="identValue" - class="form-control" aria-describedby="bib-ident-label"/> +<form class="mt-3"> + <div class="hstack align-items-baseline w-auto" [formGroup]="bibIdentGroup"> + <label class="form-label" for="bib-ident-type"> + Retrieve record by + </label> + + <select class="form-select w-auto mx-2" id="bib-ident-type" + [(ngModel)]="identType" formControlName="bibIdentType"> + <option value="id">ID</option> + <option value="tcn">TCN</option> + </select> + + <label class="form-label mx-2" for="bib-ident-value"> + <ng-container *ngIf="identType === 'id'" i18n>ID:</ng-container> + <ng-container *ngIf="identType === 'tcn'" i18n>TCN:</ng-container> + </label> + <input id="bib-ident-value" type="text" required + (keyup.enter)="search()" [(ngModel)]="identValue" formControlName="bibIdentValue" + class="form-control mx-2 w-auto" aria-describedby="bib-ident-status" /> + + <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()" i18n> + Search + </button> + + <div *ngIf="searchInProgress" role="status"> + <span class="visually-hidden">Searching...</span> + <span class="material-icons" aria-hidden="true">pending</span> </div> - <button type="button" class="btn btn-outline-dark" (click)="search()" i18n>Submit</button> + </div> -</div> -<div class="row mt-3"> - <div class="col-lg-6"> - <div class="alert alert-warning" *ngIf="notFound && !multiRecordsFound" i18n> + <div class="invalid-feedback d-block fs-4" role="status" id="bib-ident-status"> + <div *ngIf="notFound && !multiRecordsFound" i18n> Record not found: {{identValue}} </div> - <div class="alert alert-warning" *ngIf="multiRecordsFound" i18n> + <div *ngIf="multiRecordsFound" i18n> More than one Bib Record found with TCN: {{identValue}} </div> </div> -</div> +</form> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts index 1eaacd0460..dcd844d9d0 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts @@ -1,8 +1,8 @@ -import {Component, OnInit, ViewChild, Input, AfterViewInit} from '@angular/core'; +import {Component, OnInit, AfterViewInit} from '@angular/core'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; -import {IdlObject} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {PcrudService} from '@eg/core/pcrud.service'; +import {FormControl, FormGroup} from '@angular/forms'; /* Component for retrieving bib records by ID, TCN */ @@ -15,6 +15,8 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { identValue: string; notFound = false; multiRecordsFound = false; + bibIdentGroup: FormGroup; + searchInProgress: boolean = null; constructor( private router: Router, @@ -24,18 +26,24 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { ) {} ngOnInit() { + this.bibIdentGroup = new FormGroup({ + bibIdentType: new FormControl(), + bibIdentValue: new FormControl() + }); + this.route.paramMap.subscribe((params: ParamMap) => { this.identType = params.get('identType') as 'id' | 'tcn'; }); } ngAfterViewInit() { - const node = document.getElementById('bib-ident-value'); + const node = document.getElementById('bib-ident-type'); setTimeout(() => node.focus()); } search() { if (!this.identValue) { return; } + this.searchInProgress = true; this.notFound = false; this.multiRecordsFound = false; @@ -51,6 +59,7 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { promise.then(id => { if (id === null) { this.notFound = true; + this.searchInProgress = false; } else { this.goToRecord(id); } ----------------------------------------------------------------------- Summary of changes: .../src/app/staff/cat/bib-by-ident.component.html | 60 ++++++++++++++-------- .../src/app/staff/cat/bib-by-ident.component.ts | 26 ++++++++-- 2 files changed, 63 insertions(+), 23 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 0117c2666d63e599850262574581b3a0d618aba2
by Git User 15 May '25

15 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via 0117c2666d63e599850262574581b3a0d618aba2 (commit) via 702e2a9e5b2381604ddf43ad4b0d5854f744c371 (commit) from d55b8ed60518dc2bfffd6a33089b5d672202aca5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0117c2666d63e599850262574581b3a0d618aba2 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Mar 21 17:57:29 2025 +0000 LP2037689 Follow-up: handle query errors gracefully Adds an error catch to reset the search button's in-progress state. Also clears progress and errors when switching between ID and TCN modes. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Bill Erickson <berickxx(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html index c062f4c14a..7cf4ac55f8 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html @@ -16,7 +16,7 @@ </label> <select class="form-select w-auto mx-2" id="bib-ident-type" - [(ngModel)]="identType" formControlName="bibIdentType"> + [(ngModel)]="identType" (ngModelChange)="resetQuery()" formControlName="bibIdentType"> <option value="id">ID</option> <option value="tcn">TCN</option> </select> @@ -29,23 +29,28 @@ (keyup.enter)="search()" [(ngModel)]="identValue" formControlName="bibIdentValue" class="form-control mx-2 w-auto" aria-describedby="bib-ident-status" /> - <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()" i18n> - Search + <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()"> + <span *ngIf="!searchInProgress" i18n>Search</span> + <span *ngIf="searchInProgress" i18n>Searching...</span> </button> <div *ngIf="searchInProgress" role="status"> <span class="visually-hidden">Searching...</span> - <span class="material-icons" aria-hidden="true">pending</span> </div> </div> - <div class="invalid-feedback d-block fs-4" role="status" id="bib-ident-status"> - <div *ngIf="notFound && !multiRecordsFound" i18n> - Record not found: {{identValue}} - </div> - <div *ngIf="multiRecordsFound" i18n> - More than one Bib Record found with TCN: {{identValue}} + <div role="status" id="bib-ident-status"> + <div class="invalid-feedback d-block fs-4"> + <div *ngIf="notFound && !multiRecordsFound" i18n> + Record not found: {{identValue}} + </div> + <div *ngIf="multiRecordsFound" i18n> + More than one Bib Record found with TCN: {{identValue}} + </div> + <div *ngIf="queryError" i18n> + The server encountered an error. Please try a different search. + </div> </div> </div> </form> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts index dcd844d9d0..68489f85aa 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts @@ -16,7 +16,8 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { notFound = false; multiRecordsFound = false; bibIdentGroup: FormGroup; - searchInProgress: boolean = null; + searchInProgress = false; + queryError = false; constructor( private router: Router, @@ -44,6 +45,7 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { search() { if (!this.identValue) { return; } this.searchInProgress = true; + this.queryError = null; this.notFound = false; this.multiRecordsFound = false; @@ -63,9 +65,18 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { } else { this.goToRecord(id); } + }).catch(err => { + this.queryError = true; + this.searchInProgress = false; }); } + resetQuery() { + this.notFound = false; + this.queryError = false; + this.searchInProgress = false; + } + getById(): Promise<number> { // Confirm the record exists before redirecting. return this.pcrud.retrieve('bre', this.identValue).toPromise() commit 702e2a9e5b2381604ddf43ad4b0d5854f744c371 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Mar 14 05:45:26 2025 +0000 LP2037689 Retrieve Bib by ID/TCN form accessibility Fixes overly wide search input and isolated submit button in Retrieve Bib by ID/TCN form. Adds a dropdown to switch between ID and TCN without having to go to the navbar. Adds search in progress icon, form labels, ARIA messaging, and Angular form validation logic. Release-note: Fixes display and accessibility bugs in Retrieve Bib by ID/TCN form Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Bill Erickson <berickxx(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html index 475f6c4f48..c062f4c14a 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html @@ -9,28 +9,43 @@ </ng-container> -<div class="row form-validated mt-5"> - <div class="col-lg-6 form-inline"> - <div class="input-group"> - <span class="input-group-text" id="bib-ident-label"> - <ng-container *ngIf="identType === 'id'" i18n>Record ID:</ng-container> - <ng-container *ngIf="identType === 'tcn'" i18n>Record TCN:</ng-container> - </span> - <input id="bib-ident-value" type="text" required - (keyup.enter)="search()" [(ngModel)]="identValue" - class="form-control" aria-describedby="bib-ident-label"/> +<form class="mt-3"> + <div class="hstack align-items-baseline w-auto" [formGroup]="bibIdentGroup"> + <label class="form-label" for="bib-ident-type"> + Retrieve record by + </label> + + <select class="form-select w-auto mx-2" id="bib-ident-type" + [(ngModel)]="identType" formControlName="bibIdentType"> + <option value="id">ID</option> + <option value="tcn">TCN</option> + </select> + + <label class="form-label mx-2" for="bib-ident-value"> + <ng-container *ngIf="identType === 'id'" i18n>ID:</ng-container> + <ng-container *ngIf="identType === 'tcn'" i18n>TCN:</ng-container> + </label> + <input id="bib-ident-value" type="text" required + (keyup.enter)="search()" [(ngModel)]="identValue" formControlName="bibIdentValue" + class="form-control mx-2 w-auto" aria-describedby="bib-ident-status" /> + + <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()" i18n> + Search + </button> + + <div *ngIf="searchInProgress" role="status"> + <span class="visually-hidden">Searching...</span> + <span class="material-icons" aria-hidden="true">pending</span> </div> - <button type="button" class="btn btn-outline-dark" (click)="search()" i18n>Submit</button> + </div> -</div> -<div class="row mt-3"> - <div class="col-lg-6"> - <div class="alert alert-warning" *ngIf="notFound && !multiRecordsFound" i18n> + <div class="invalid-feedback d-block fs-4" role="status" id="bib-ident-status"> + <div *ngIf="notFound && !multiRecordsFound" i18n> Record not found: {{identValue}} </div> - <div class="alert alert-warning" *ngIf="multiRecordsFound" i18n> + <div *ngIf="multiRecordsFound" i18n> More than one Bib Record found with TCN: {{identValue}} </div> </div> -</div> +</form> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts index 1eaacd0460..dcd844d9d0 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts @@ -1,8 +1,8 @@ -import {Component, OnInit, ViewChild, Input, AfterViewInit} from '@angular/core'; +import {Component, OnInit, AfterViewInit} from '@angular/core'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; -import {IdlObject} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {PcrudService} from '@eg/core/pcrud.service'; +import {FormControl, FormGroup} from '@angular/forms'; /* Component for retrieving bib records by ID, TCN */ @@ -15,6 +15,8 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { identValue: string; notFound = false; multiRecordsFound = false; + bibIdentGroup: FormGroup; + searchInProgress: boolean = null; constructor( private router: Router, @@ -24,18 +26,24 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { ) {} ngOnInit() { + this.bibIdentGroup = new FormGroup({ + bibIdentType: new FormControl(), + bibIdentValue: new FormControl() + }); + this.route.paramMap.subscribe((params: ParamMap) => { this.identType = params.get('identType') as 'id' | 'tcn'; }); } ngAfterViewInit() { - const node = document.getElementById('bib-ident-value'); + const node = document.getElementById('bib-ident-type'); setTimeout(() => node.focus()); } search() { if (!this.identValue) { return; } + this.searchInProgress = true; this.notFound = false; this.multiRecordsFound = false; @@ -51,6 +59,7 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { promise.then(id => { if (id === null) { this.notFound = true; + this.searchInProgress = false; } else { this.goToRecord(id); } ----------------------------------------------------------------------- Summary of changes: .../src/app/staff/cat/bib-by-ident.component.html | 60 ++++++++++++++-------- .../src/app/staff/cat/bib-by-ident.component.ts | 26 ++++++++-- 2 files changed, 63 insertions(+), 23 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 7dfe7cd53939a0c3faed5ca4255099bd0389a7b0
by Git User 15 May '25

15 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 7dfe7cd53939a0c3faed5ca4255099bd0389a7b0 (commit) via 4c15ce361e7fd6fd877df405444a22b41dd7f04f (commit) from b25f6a8837881e0c9b050a63764418bf9849d770 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7dfe7cd53939a0c3faed5ca4255099bd0389a7b0 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Mar 21 17:57:29 2025 +0000 LP2037689 Follow-up: handle query errors gracefully Adds an error catch to reset the search button's in-progress state. Also clears progress and errors when switching between ID and TCN modes. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Bill Erickson <berickxx(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html index c062f4c14a..7cf4ac55f8 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html @@ -16,7 +16,7 @@ </label> <select class="form-select w-auto mx-2" id="bib-ident-type" - [(ngModel)]="identType" formControlName="bibIdentType"> + [(ngModel)]="identType" (ngModelChange)="resetQuery()" formControlName="bibIdentType"> <option value="id">ID</option> <option value="tcn">TCN</option> </select> @@ -29,23 +29,28 @@ (keyup.enter)="search()" [(ngModel)]="identValue" formControlName="bibIdentValue" class="form-control mx-2 w-auto" aria-describedby="bib-ident-status" /> - <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()" i18n> - Search + <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()"> + <span *ngIf="!searchInProgress" i18n>Search</span> + <span *ngIf="searchInProgress" i18n>Searching...</span> </button> <div *ngIf="searchInProgress" role="status"> <span class="visually-hidden">Searching...</span> - <span class="material-icons" aria-hidden="true">pending</span> </div> </div> - <div class="invalid-feedback d-block fs-4" role="status" id="bib-ident-status"> - <div *ngIf="notFound && !multiRecordsFound" i18n> - Record not found: {{identValue}} - </div> - <div *ngIf="multiRecordsFound" i18n> - More than one Bib Record found with TCN: {{identValue}} + <div role="status" id="bib-ident-status"> + <div class="invalid-feedback d-block fs-4"> + <div *ngIf="notFound && !multiRecordsFound" i18n> + Record not found: {{identValue}} + </div> + <div *ngIf="multiRecordsFound" i18n> + More than one Bib Record found with TCN: {{identValue}} + </div> + <div *ngIf="queryError" i18n> + The server encountered an error. Please try a different search. + </div> </div> </div> </form> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts index dcd844d9d0..68489f85aa 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts @@ -16,7 +16,8 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { notFound = false; multiRecordsFound = false; bibIdentGroup: FormGroup; - searchInProgress: boolean = null; + searchInProgress = false; + queryError = false; constructor( private router: Router, @@ -44,6 +45,7 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { search() { if (!this.identValue) { return; } this.searchInProgress = true; + this.queryError = null; this.notFound = false; this.multiRecordsFound = false; @@ -63,9 +65,18 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { } else { this.goToRecord(id); } + }).catch(err => { + this.queryError = true; + this.searchInProgress = false; }); } + resetQuery() { + this.notFound = false; + this.queryError = false; + this.searchInProgress = false; + } + getById(): Promise<number> { // Confirm the record exists before redirecting. return this.pcrud.retrieve('bre', this.identValue).toPromise() commit 4c15ce361e7fd6fd877df405444a22b41dd7f04f Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Mar 14 05:45:26 2025 +0000 LP2037689 Retrieve Bib by ID/TCN form accessibility Fixes overly wide search input and isolated submit button in Retrieve Bib by ID/TCN form. Adds a dropdown to switch between ID and TCN without having to go to the navbar. Adds search in progress icon, form labels, ARIA messaging, and Angular form validation logic. Release-note: Fixes display and accessibility bugs in Retrieve Bib by ID/TCN form Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Bill Erickson <berickxx(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html index 475f6c4f48..c062f4c14a 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html @@ -9,28 +9,43 @@ </ng-container> -<div class="row form-validated mt-5"> - <div class="col-lg-6 form-inline"> - <div class="input-group"> - <span class="input-group-text" id="bib-ident-label"> - <ng-container *ngIf="identType === 'id'" i18n>Record ID:</ng-container> - <ng-container *ngIf="identType === 'tcn'" i18n>Record TCN:</ng-container> - </span> - <input id="bib-ident-value" type="text" required - (keyup.enter)="search()" [(ngModel)]="identValue" - class="form-control" aria-describedby="bib-ident-label"/> +<form class="mt-3"> + <div class="hstack align-items-baseline w-auto" [formGroup]="bibIdentGroup"> + <label class="form-label" for="bib-ident-type"> + Retrieve record by + </label> + + <select class="form-select w-auto mx-2" id="bib-ident-type" + [(ngModel)]="identType" formControlName="bibIdentType"> + <option value="id">ID</option> + <option value="tcn">TCN</option> + </select> + + <label class="form-label mx-2" for="bib-ident-value"> + <ng-container *ngIf="identType === 'id'" i18n>ID:</ng-container> + <ng-container *ngIf="identType === 'tcn'" i18n>TCN:</ng-container> + </label> + <input id="bib-ident-value" type="text" required + (keyup.enter)="search()" [(ngModel)]="identValue" formControlName="bibIdentValue" + class="form-control mx-2 w-auto" aria-describedby="bib-ident-status" /> + + <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()" i18n> + Search + </button> + + <div *ngIf="searchInProgress" role="status"> + <span class="visually-hidden">Searching...</span> + <span class="material-icons" aria-hidden="true">pending</span> </div> - <button type="button" class="btn btn-outline-dark" (click)="search()" i18n>Submit</button> + </div> -</div> -<div class="row mt-3"> - <div class="col-lg-6"> - <div class="alert alert-warning" *ngIf="notFound && !multiRecordsFound" i18n> + <div class="invalid-feedback d-block fs-4" role="status" id="bib-ident-status"> + <div *ngIf="notFound && !multiRecordsFound" i18n> Record not found: {{identValue}} </div> - <div class="alert alert-warning" *ngIf="multiRecordsFound" i18n> + <div *ngIf="multiRecordsFound" i18n> More than one Bib Record found with TCN: {{identValue}} </div> </div> -</div> +</form> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts index 1eaacd0460..dcd844d9d0 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.ts @@ -1,8 +1,8 @@ -import {Component, OnInit, ViewChild, Input, AfterViewInit} from '@angular/core'; +import {Component, OnInit, AfterViewInit} from '@angular/core'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; -import {IdlObject} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {PcrudService} from '@eg/core/pcrud.service'; +import {FormControl, FormGroup} from '@angular/forms'; /* Component for retrieving bib records by ID, TCN */ @@ -15,6 +15,8 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { identValue: string; notFound = false; multiRecordsFound = false; + bibIdentGroup: FormGroup; + searchInProgress: boolean = null; constructor( private router: Router, @@ -24,18 +26,24 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { ) {} ngOnInit() { + this.bibIdentGroup = new FormGroup({ + bibIdentType: new FormControl(), + bibIdentValue: new FormControl() + }); + this.route.paramMap.subscribe((params: ParamMap) => { this.identType = params.get('identType') as 'id' | 'tcn'; }); } ngAfterViewInit() { - const node = document.getElementById('bib-ident-value'); + const node = document.getElementById('bib-ident-type'); setTimeout(() => node.focus()); } search() { if (!this.identValue) { return; } + this.searchInProgress = true; this.notFound = false; this.multiRecordsFound = false; @@ -51,6 +59,7 @@ export class BibByIdentComponent implements OnInit, AfterViewInit { promise.then(id => { if (id === null) { this.notFound = true; + this.searchInProgress = false; } else { this.goToRecord(id); } ----------------------------------------------------------------------- Summary of changes: .../src/app/staff/cat/bib-by-ident.component.html | 60 ++++++++++++++-------- .../src/app/staff/cat/bib-by-ident.component.ts | 26 ++++++++-- 2 files changed, 63 insertions(+), 23 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. b25f6a8837881e0c9b050a63764418bf9849d770
by Git User 06 May '25

06 May '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via b25f6a8837881e0c9b050a63764418bf9849d770 (commit) from fd26d0fcd024dab8d0268aeb3c94dd2f7a117d00 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b25f6a8837881e0c9b050a63764418bf9849d770 Author: Jane Sandberg <js7389(a)princeton.edu> Date: Fri Dec 20 14:16:31 2024 -0800 Forward-port 3.14.1 -> 3.14.2 upgrade script Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.14.1-3.14.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.14.1-3.14.2-upgrade-db.sql new file mode 100644 index 0000000000..61a567826e --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.14.1-3.14.2-upgrade-db.sql @@ -0,0 +1,130 @@ +--Upgrade Script for 3.14.1 to 3.14.2 +\set eg_version '''3.14.2''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.14.2', :eg_version); +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('1445', :eg_version); + +UPDATE action_trigger.event_definition +SET template = +$$ + +[%- USE date -%][%- SET user = target.0.xact.usr -%] +<div style="font-family: Arial, Helvetica, sans-serif;"> + +  + <div style="text-align:left;"> + <span style="padding-top:1em;">[% date.format %]</span> + </div><br/> + + [% SET grand_total = 0.00 %] + <ol> + [% SET xact_mp_hash = {} %] + [% FOR mp IN target %][%# Create an array of transactions/amount paid for each payment made %] + [% SET xact_id = mp.xact.id %] + [% SET amount = mp.amount %] + [% IF ! xact_mp_hash.defined( xact_id ) %] + [% xact_mp_hash.$xact_id = { 'xact' => mp.xact, 'payment' => amount } %] + [% END %] + [% END %] + + [% FOR xact_id IN xact_mp_hash.keys.sort %] + [% SET xact = xact_mp_hash.$xact_id.xact %] + <li> + Transaction ID: [% xact_mp_hash.$xact_id.xact.id %]<br /> + [% IF xact.circulation %] + Title: "[% helpers.get_copy_bib_basics(xact.circulation.target_copy).title %]" <br /> + [% END %] + + [%# Go get all the date needed from xact_summary %] + + [% SET mbts = xact.summary %] + + Transaction Type: [% mbts.last_billing_type%]<br /> + Date: [% mbts.last_billing_ts %] <br /> + + Note: [% mbts.last_billing_note %] <br /> + + Amount: $[% xact_mp_hash.$xact_id.payment | format("%.2f") %] + [% grand_total = grand_total + xact_mp_hash.$xact_id.payment %] + </li> + <br /> + [% END %] + </ol> + + <div>  + Payment Type: [% SWITCH mp.payment_type -%] + [% CASE "cash_payment" %]Cash + [% CASE "check_payment" %]Check + [% CASE "credit_card_payment" %]Credit Card + [%- IF mp.credit_card_payment.cc_number %] ([% mp.credit_card_payment.cc_number %])[% END %] + [% CASE "debit_card_payment" %]Debit Card + [% CASE "credit_payment" %]Credit + [% CASE "forgive_payment" %]Forgiveness + [% CASE "goods_payment" %]Goods + [% CASE "work_payment" %]Work + [%- END %] <br /> + Total:<strong> $[% grand_total | format("%.2f") %] </strong> + </div> + +</div> +$$ +WHERE id = 30 AND template = +$$ + +[%- USE date -%][%- SET user = target.0.xact.usr -%] +<div style="font-family: Arial, Helvetica, sans-serif;"> + +  + <div style="text-align:left;"> + <span style="padding-top:1em;">[% date.format %]</span> + </div><br/> + + [% SET grand_total = 0.00 %] + <ol> + [% SET xact_mp_hash = {} %] + [% FOR mp IN target %][%# Create an array of transactions/amount paid for each payment made %] + [% SET xact_id = mp.xact.id %] + [% SET amount = mp.amount %] + [% IF ! xact_mp_hash.defined( xact_id ) %] + [% xact_mp_hash.$xact_id = { 'xact' => mp.xact, 'payment' => amount } %] + [% END %] + [% END %] + + [% FOR xact_id IN xact_mp_hash.keys.sort %] + [% SET xact = xact_mp_hash.$xact_id.xact %] + <li> + Transaction ID: [% xact_mp_hash.$xact_id.xact.id %]<br /> + [% IF xact.circulation %] + Title: "[% helpers.get_copy_bib_basics(xact.circulation.target_copy).title %]" <br /> + [% END %] + + [%# Go get all the date needed from xact_summary %] + + [% SET mbts = xact.summary %] + + Transaction Type: [% mbts.last_billing_type%]<br /> + Date: [% mbts.last_billing_ts %] <br /> + + Note: [% mbts.last_billing_note %] <br /> + + Amount: $[% xact_mp_hash.$xact_id.payment | format("%.2f") %] + [% grand_total = grand_total + xact_mp_hash.$xact_id.payment %] + </li> + <br /> + [% END %] + </ol> + + <div>  + Payment Type: Credit Card <br /> + Total:<strong> $[% grand_total | format("%.2f") %] </strong> + </div> + +</div> +$$; + +COMMIT; + +-- Update auditor tables to catch changes to source tables. +-- Can be removed/skipped if there were no schema changes. +SELECT auditor.update_auditors(); ----------------------------------------------------------------------- Summary of changes: .../{3.13.6-3.13.7-upgrade-db.sql => 3.14.1-3.14.2-upgrade-db.sql} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) copy Open-ILS/src/sql/Pg/version-upgrade/{3.13.6-3.13.7-upgrade-db.sql => 3.14.1-3.14.2-upgrade-db.sql} (98%) hooks/post-receive -- Evergreen ILS

1 0