From fc3a3919af6fbde4ffc5607c97a3377b5cd1884a Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Mon, 6 Jun 2022 07:16:45 +0300 Subject: [PATCH 2/2] Bug 34142: Add new column sub_location to (deleted)items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add new column sub_location to items and deleteditems table. Column can be used to indicate e.g. if item has some other more specific location than permanent location. To test: 1) Add new authorized value for sublocation e.g. "SUBLOC" and add some values to it. 2) Add new 952 subfield e.g. S to MARC framework and link your new authorized value "SUBLOC" to it. 3) Link subfield to items.sub_location field in "Koha to MARC mapping" (add 952,S). 4) Find a record and attempt to add new item to it. => Note that new subfield S is now displayed on item form and dropdown selector contains values added to "SUBLOC". => Saving should be successfull. => After saving confirm that sublocation is displayed in its own column in items listing above item form and that sublocation is displayed with correct description. 5) Attempt to modify item. => Confirm that sublocation is displayed and it's correct. 6) Attempt to delete item. => Deleting should be successfull. Also confirm that sub location is displayed on these pages: 1) detail.pl 2) moredetail.pl 3. returns.pl Sponsored-by: Koha-Suomi Oy Signed-off-by: Tadeusz „tadzik” Sośnierz --- Koha/Database/Columns.pm | 1 + Koha/Item.pm | 1 + api/v1/swagger/definitions/item.yaml | 5 ++++ circ/returns.pl | 4 +++- .../data/mysql/atomicupdate/bug_34142.pl | 23 +++++++++++++++++++ installer/data/mysql/kohastructure.sql | 2 ++ .../tables/items/catalogue_detail.inc | 7 ++++++ .../prog/en/modules/catalogue/moredetail.tt | 6 +++++ .../prog/en/modules/circ/returns.tt | 2 +- 9 files changed, 49 insertions(+), 2 deletions(-) create mode 100755 installer/data/mysql/atomicupdate/bug_34142.pl diff --git a/Koha/Database/Columns.pm b/Koha/Database/Columns.pm index d6cd1d407f..0b5312c1dd 100644 --- a/Koha/Database/Columns.pm +++ b/Koha/Database/Columns.pm @@ -233,6 +233,7 @@ sub columns { "notforloan" => __("Not for loan"), "onloan" => __("Due date"), "permanent_location" => __("Permanent shelving location"), + "sub_location" => __("Sublocation"), "price" => __("Price"), "renewals" => __("Total renewals"), "replacementprice" => __("Replacement price"), diff --git a/Koha/Item.pm b/Koha/Item.pm index b325570910..96b186741e 100644 --- a/Koha/Item.pm +++ b/Koha/Item.pm @@ -1822,6 +1822,7 @@ sub to_api_mapping { stocknumber => 'inventory_number', new_status => 'new_status', deleted_on => undef, + sub_location => 'sub_location' }; } diff --git a/api/v1/swagger/definitions/item.yaml b/api/v1/swagger/definitions/item.yaml index ba1a8a890e..ef8b3eca79 100644 --- a/api/v1/swagger/definitions/item.yaml +++ b/api/v1/swagger/definitions/item.yaml @@ -224,6 +224,11 @@ properties: - string - "null" description: "'new' value, whatever free-text information." + sub_location: + type: + - string + - "null" + description: sub_location for this item exclude_from_local_holds_priority: type: boolean description: Exclude this item from local holds priority. diff --git a/circ/returns.pl b/circ/returns.pl index b57e64a920..1e78dacbd9 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -791,6 +791,8 @@ my $count = 0; my @riloop; my $shelflocations = { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.location' } ) }; +my $sublocation = + { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.sub_location' } ) }; foreach ( sort { $a <=> $b } keys %returneditems ) { my %ri; if ( $count++ < $returned_counter ) { @@ -849,7 +851,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { $ri{location} = $item->location; my $shelfcode = $ri{'location'}; $ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) ); - + $ri{sub_location} = $sublocation->{$item->sub_location} if ( defined( $item->sub_location ) && defined($sublocation) && exists( $sublocation->{$item->sub_location} ) ); } else { last; diff --git a/installer/data/mysql/atomicupdate/bug_34142.pl b/installer/data/mysql/atomicupdate/bug_34142.pl new file mode 100755 index 0000000000..2764faf262 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_34142.pl @@ -0,0 +1,23 @@ +use Modern::Perl; + +return { + bug_number => "34142", + description => "Add column sub_location to (deleted)items table", + up => sub { + my ($args) = @_; + my ( $dbh, $out ) = @$args{qw(dbh out)}; + + if ( !column_exists( 'items', 'sub_location' ) ) { + $dbh->do( +q{ALTER TABLE items ADD COLUMN sub_location VARCHAR(80) DEFAULT NULL AFTER permanent_location} + ); + say $out "Added new column items.sub_location"; + } + if ( !column_exists( 'deleteditems', 'sub_location' ) ) { + $dbh->do( +q{ALTER TABLE deleteditems ADD COLUMN sub_location VARCHAR(80) DEFAULT NULL AFTER permanent_location} + ); + say $out "Added new column deleteditems.sub_location"; + } + }, +}; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 2b2175fe2f..15131285a7 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2785,6 +2785,7 @@ CREATE TABLE `deleteditems` ( `deleted_on` datetime DEFAULT NULL COMMENT 'date/time of deletion', `location` varchar(80) DEFAULT NULL COMMENT 'authorized value for the shelving location for this item (MARC21 952$c)', `permanent_location` varchar(80) DEFAULT NULL COMMENT 'linked to the CART and PROC temporary locations feature, stores the permanent shelving location', + `sub_location` varchar(80) DEFAULT NULL COMMENT 'authorized value for the sublocation for this item', `onloan` date DEFAULT NULL COMMENT 'defines if item is checked out (NULL for not checked out, and due date for checked out)', `cn_source` varchar(10) DEFAULT NULL COMMENT 'classification source used on this item (MARC21 952$2)', `cn_sort` varchar(255) DEFAULT NULL COMMENT 'normalized form of the call number (MARC21 952$o) used for sorting', @@ -4043,6 +4044,7 @@ CREATE TABLE `items` ( `deleted_on` datetime DEFAULT NULL COMMENT 'date/time of deletion', `location` varchar(80) DEFAULT NULL COMMENT 'authorized value for the shelving location for this item (MARC21 952$c)', `permanent_location` varchar(80) DEFAULT NULL COMMENT 'linked to the CART and PROC temporary locations feature, stores the permanent shelving location', + `sub_location` varchar(80) DEFAULT NULL COMMENT 'authorized value for the sublocation for this item', `onloan` date DEFAULT NULL COMMENT 'defines if item is checked out (NULL for not checked out, and due date for checked out)', `cn_source` varchar(10) DEFAULT NULL COMMENT 'classification source used on this item (MARC21 952$2)', `cn_sort` varchar(255) DEFAULT NULL COMMENT 'normalized form of the call number (MARC21 952$o) used for sorting', diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc index 099cfdd6fd..8d890eb5a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc @@ -190,6 +190,7 @@ const can_edit_items_from = [% To.json(can_edit_items_from || []) | $raw %]; const item_type_image_locations = [% To.json(item_type_image_locations) | $raw %]; const av_loc = new Map([% To.json(AuthorisedValues.Get('LOC')) | $raw %].map( av => [av.authorised_value, av.lib])); + const av_subloc = new Map([% To.json(AuthorisedValues.GetDescriptionsByKohaField({ kohafield => 'items.sub_location' })) | $raw %].map( av => [av.authorised_value, av.lib])); const av_lost = new Map([% To.json(AuthorisedValues.GetDescriptionsByKohaField({ kohafield => 'items.itemlost' })) | $raw %].map( av => [av.authorised_value, av.lib])); const av_withdrawn = new Map([% To.json(AuthorisedValues.GetDescriptionsByKohaField({ kohafield => 'items.withdrawn' })) | $raw %].map( av => [av.authorised_value, av.lib])); const av_damaged = new Map([% To.json(AuthorisedValues.GetDescriptionsByKohaField({ kohafield => 'items.damaged' })) | $raw %].map( av => [av.authorised_value, av.lib])); @@ -376,6 +377,12 @@ } else { nodes += escape_str(loc_str); } + if ( row.sub_location ) { + nodes += ''; + let sub_location_str = av_subloc.get(row.sub_location.toString()); + nodes += '(%s)'.format(escape_str(sub_location_str)); + nodes += ''; + } nodes += ''; return nodes; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 3a73ab0229..d6490b8d67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -147,6 +147,12 @@ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_DAT.location ) | html %] [% END %] + [% IF ( ITEM_DAT.sub_location ) %] +
  • + Sublocation: + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.sub_location', authorised_value => ITEM_DAT.sub_location ) | html %] +
    • + [% END %] [% IF ( ITEM_DAT.replacementprice ) %]
  • Replacement price: [% ITEM_DAT.replacementprice | $Price %] 
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 6c132ef2b8..db1e0bf230 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1325,7 +1325,7 @@ [%- END -%] - [% riloo.location | html %] + [% riloo.location | html %] [% IF ( riloo.sub_location ) %] ([% riloo.sub_location | html %]) [% END %] [% riloo.itemcallnumber | html %] -- 2.34.1