Attachment 106736 Details for Bug 24857 – Bug 24857: Add ability to attach newly cataloged items to a volume

[patch] Bug 24857: Add ability to attach newly cataloged items to a volume

Bug-24857-Add-ability-to-attach-newly-cataloged-it.patch (text/plain), 7.76 KB, created by ByWater Sandboxes on 2020-07-09 16:14:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ByWater Sandboxes

Created: 2020-07-09 16:14:22 UTC

Size: 7.76 KB

patch

obsolete

>From b03eee6d525e7e6347e48faa71a0eea2779166ef Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Wed, 26 Feb 2020 13:20:45 -0500
>Subject: [PATCH] Bug 24857: Add ability to attach newly cataloged items to a
> volume
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>
>Signed-off-by: Rebecca  Coert <rcoert@arlingtonva.us>
>---
> cataloguing/additem.pl                             | 61 +++++++++++++++++-----
> .../prog/en/modules/cataloguing/additem.tt         | 30 +++++++++++
> .../intranet-tmpl/prog/js/cataloging_additem.js    | 21 ++++++++
> 3 files changed, 99 insertions(+), 13 deletions(-)
>
>diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
>index 130ff0a3f2..84c1587a2a 100755
>--- a/cataloguing/additem.pl
>+++ b/cataloguing/additem.pl
>@@ -22,27 +22,29 @@
> use Modern::Perl;
> 
> use CGI qw ( -utf8 );
>+use List::MoreUtils qw/any/;
>+use MARC::File::XML;
>+use Storable qw(thaw freeze);
>+use URI::Escape;
>+
> use C4::Auth;
>-use C4::Output;
> use C4::Biblio;
>-use C4::Items;
>-use C4::Context;
> use C4::Circulation;
>-use C4::Koha;
> use C4::ClassSource;
>+use C4::Context;
>+use C4::Items;
>+use C4::Koha;
>+use C4::Members;
>+use C4::Output;
>+use C4::Search;
>+
>+use Koha::Biblio::Volume::Items;
>+use Koha::Biblio::Volumes;
> use Koha::DateUtils;
>-use Koha::Items;
> use Koha::ItemTypes;
>+use Koha::Items;
> use Koha::Libraries;
> use Koha::Patrons;
>-use List::MoreUtils qw/any/;
>-use C4::Search;
>-use Storable qw(thaw freeze);
>-use URI::Escape;
>-use C4::Members;
>-
>-use MARC::File::XML;
>-use URI::Escape;
> 
> our $dbh = C4::Context->dbh;
> 
>@@ -86,6 +88,34 @@ sub set_item_default_location {
>     $item->store;
> }
> 
>+sub add_item_to_volume {
>+    my ( $biblionumber, $itemnumber, $volume, $volume_description ) = @_;
>+
>+    return unless $volume;
>+
>+    my $volume_id;
>+    if ( $volume eq 'create' ) {
>+        my $volume = Koha::Biblio::Volume->new(
>+            {
>+                biblionumber => $biblionumber,
>+                description  => $volume_description,
>+            }
>+        )->store();
>+
>+        $volume_id = $volume->id;
>+    }
>+    else {
>+        $volume_id = $volume;
>+    }
>+
>+    my $volume_item = Koha::Biblio::Volume::Item->new(
>+        {
>+            itemnumber => $itemnumber,
>+            volume_id  => $volume_id,
>+        }
>+    )->store();
>+}
>+
> # NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code
> # NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript
> sub _increment_barcode {
>@@ -390,6 +420,8 @@ my $fa_barcode            = $input->param('barcode');
> my $fa_branch             = $input->param('branch');
> my $fa_stickyduedate      = $input->param('stickyduedate');
> my $fa_duedatespec        = $input->param('duedatespec');
>+my $volume                = $input->param('volume');
>+my $volume_description    = $input->param('volume_description');
> 
> my $frameworkcode = &GetFrameworkCode($biblionumber);
> 
>@@ -499,6 +531,7 @@ if ($op eq "additem") {
>         unless ($exist_itemnumber) {
>             my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) = AddItemFromMarc( $record, $biblionumber );
>             set_item_default_location($oldbibitemnum);
>+            add_item_to_volume( $oldbiblionumber, $oldbibitemnum, $volume, $volume_description );
> 
>             # Pushing the last created item cookie back
>             if ($prefillitem && defined $record) {
>@@ -599,6 +632,7 @@ if ($op eq "additem") {
>             my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) =
>                 AddItemFromMarc( $record, $biblionumber, { skip_modzebra_update => 1 } );
>             set_item_default_location($oldbibitemnum);
>+            add_item_to_volume( $oldbiblionumber, $oldbibitemnum, $volume, $volume_description );
> 
>             # We count the item only if it was really added
>             # That way, all items are added, even if there was some already existing barcodes
>@@ -958,6 +992,7 @@ my $item = Koha::Items->find($itemnumber); # We certainly want to fetch it earli
> 
> # what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
> $template->param(
>+    volumes      => scalar Koha::Biblio::Volumes->search({ biblionumber => $biblionumber }),
>     biblionumber => $biblionumber,
>     title        => $oldrecord->{title},
>     author       => $oldrecord->{author},
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>index 2d64bef70f..da825161da 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>@@ -16,6 +16,9 @@
> [% INCLUDE 'calendar.inc' %]
> [% INCLUDE 'str/cataloging_additem.inc' %]
> [% Asset.js("js/cataloging_additem.js") | $raw %]
>+<script>
>+  var has_volumes = [% volumes.count %];
>+</script>
> </head>
> 
> <body id="cat_additem" class="cat">
>@@ -224,6 +227,33 @@
>     <input type="hidden" name="indicator" value=" " />
>     <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
> 
>+[% IF volumes.count && op != 'saveitem' %]
>+    <fieldset class="rows">
>+        <legend><i class="fa fa-plus"></i> Add to volume</legend>
>+
>+        <p>
>+            <label for="select_volume">Options: </label>
>+            <select name="volume" id="volume-add-or-create-form-select">
>+                <optgroup label="Use existing volume">
>+                    [% FOREACH v IN volumes %]
>+                        <option value="[% v.id | html %]">Use: [% v.description | html %]</option>
>+                    [% END %]
>+                </optgroup>
>+                <optgroup label="Other options">
>+                    <option id="volume-add-or-create-form-no-add" value="">Do not add to volume</option>
>+                    <option value="create">Create new volume</option>
>+                </optgroup>
>+            </select>
>+        </p>
>+
>+        <p id="volume-add-or-create-form-description-block">
>+            <label for="volume_description" class="required">Name: </label>
>+            <input name="volume_description" id="volume-add-or-create-form-description" type="text" size="30" class="required" />
>+            <span class="required">Required</span>
>+        </p>
>+    </fieldset>
>+[% END %]
>+
> <fieldset class="action">    [% IF op != 'saveitem' %]
>     <input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" />
>     <!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js b/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js
>index e3e746764a..64fd9e26a4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js
>@@ -73,6 +73,27 @@ $(document).ready(function(){
>     });
> 
>     $('.subfield_line select').select2();
>+
>+    // Add new item to volume
>+    if ( has_volumes ) {
>+        $('#volume-add-or-create-form-description-block').hide();
>+        $('#volume-add-or-create-form-no-add').attr('selected', 'selected' );
>+
>+        $('#volume-add-or-create-form-select').on('change', function(){
>+            if ( $(this).val() == 'create' ) {
>+                $('#volume-add-or-create-form-description')
>+                    .addClass('required')
>+                    .attr( 'required', 'required' );
>+                $('#volume-add-or-create-form-description-block').show();
>+            } else {
>+                $('#volume-add-or-create-form-description')
>+                    .removeClass('required')
>+                    .removeAttr('required');
>+                $('#volume-add-or-create-form-description-block').hide();
>+            }
>+        });
>+    }
>+
> });
> 
> function Check(f) {
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24857: 100652 | 100653 | 100654 | 100655 | 100656 | 100657 | 100658 | 100659 | 100660 | 100661 | 100662 | 101637 | 101638 | 101639 | 101640 | 101641 | 101642 | 101643 | 101644 | 101645 | 101646 | 101647 | 101648 | 101650 | 101651 | 101652 | 101653 | 101654 | 101655 | 101656 | 101657 | 101658 | 101659 | 101660 | 101661 | 101670 | 101671 | 101672 | 101673 | 101674 | 101675 | 101676 | 101677 | 101678 | 101679 | 101680 | 101681 | 101730 | 101731 | 101732 | 101733 | 101734 | 101735 | 101736 | 101737 | 101738 | 101739 | 101740 | 101741 | 101752 | 101753 | 101754 | 101755 | 101756 | 101757 | 101758 | 101759 | 101760 | 101761 | 101762 | 101763 | 104952 | 104953 | 104954 | 104955 | 104956 | 104957 | 104958 | 104959 | 104960 | 104961 | 104962 | 104963 | 104964 | 104966 | 106728 | 106729 | 106730 | 106731 | 106732 | 106733 | 106734 | 106735 | 106736 | 106737 | 106738 | 106739 | 106740 | 106741 | 108443 | 108444 | 108445 | 108446 | 108447 | 108448 | 108449 | 108450 | 108451 | 108452 | 108453 | 108454 | 108455 | 108456 | 108666 | 108667 | 108668 | 108669 | 108670 | 108671 | 108672 | 108673 | 108674 | 108675 | 108676 | 108677 | 108678 | 108679 | 108680 | 108681 | 108682 | 108683 | 108684 | 108685 | 108686 | 109074 | 109075 | 109076 | 109077 | 109078 | 109079 | 109080 | 109081 | 109082 | 109083 | 109084 | 109085 | 109086 | 109087 | 109088 | 109089 | 109090 | 109091 | 109092 | 109093 | 109094 | 109795 | 109796 | 109797 | 109798 | 109799 | 109800 | 109801 | 109802 | 109803 | 109804 | 109805 | 109806 | 109807 | 109808 | 109809 | 109810 | 109811 | 109812 | 109813 | 109814 | 109815 | 109894 | 109901 | 109902 | 109903 | 109904 | 109905 | 109906 | 109907 | 109908 | 109909 | 109910 | 109911 | 109912 | 109913 | 109914 | 109915 | 109916 | 109917 | 109918 | 109919 | 109920 | 109921 | 109922 | 109923 | 113136 | 113137 | 113138 | 113139 | 113140 | 113141 | 113142 | 113143 | 113144 | 113145 | 113146 | 113147 | 113148 | 113149 | 113150 | 113151 | 113152 | 113153 | 113154 | 113155 | 113156 | 113157 | 113158 | 113159 | 113160 | 113168 | 113169 | 113170 | 113171 | 113172 | 113173 | 113174 | 113175 | 113176 | 113177 | 113178 | 113179 | 113180 | 113181 | 113182 | 113183 | 113184 | 113185 | 113186 | 113187 | 113188 | 113189 | 113190 | 113191 | 120495 | 120496 | 120497 | 120498 | 120499 | 120500 | 120501 | 120502 | 120503 | 120504 | 120505 | 120506 | 120507 | 120508 | 120509 | 120510 | 120511 | 120512 | 120513 | 120514 | 120515 | 120516 | 120517 | 120518 | 122808 | 122809 | 122810 | 122811 | 122812 | 122813 | 122814 | 122815 | 122816 | 122817 | 122818 | 122819 | 122820 | 122821 | 122822 | 122823 | 122824 | 122825 | 122826 | 122827 | 122828 | 122829 | 122830 | 122831 | 123882 | 123883 | 123884 | 123885 | 123886 | 123887 | 123888 | 123889 | 123890 | 123891 | 123892 | 123893 | 123894 | 123895 | 123896 | 123897 | 123898 | 123899 | 123900 | 123901 | 123902 | 123903 | 123904 | 123905 | 123906 | 123907 | 123908 | 123909 | 123910 | 123912 | 124021 | 124022 | 124023 | 124024 | 124025 | 124026 | 124027 | 124028 | 124029 | 124030 | 124031 | 124032 | 124033 | 124034 | 124035 | 124036 | 124037 | 124038 | 124039 | 124040 | 124041 | 124042 | 124043 | 124044 | 124045 | 124046 | 124047 | 124048 | 124049 | 124050 | 124051 | 124052 | 124053 | 124331 | 124332 | 124333 | 124334 | 124335 | 124336 | 124337 | 124338 | 124339 | 124340 | 124341 | 124342 | 124343 | 124344 | 124345 | 124346 | 124347 | 124348 | 124349 | 124351 | 124352 | 124353 | 124354 | 124355 | 124356 | 124357 | 124358 | 124359 | 124360 | 124361 | 124362 | 124363 | 124421 | 124463 | 124583 | 124584 | 124585 | 124586 | 124587 | 124588 | 124589 | 124590 | 124591 | 124592 | 124593 | 124594 | 124595 | 124596 | 124597 | 124598 | 124599 | 124600 | 124601 | 124602 | 124603 | 124604 | 124605 | 124606 | 124607 | 124608 | 124609 | 124610 | 124611 | 124612 | 124613 | 124614 | 124615 | 131449 | 131450 | 131451 | 131452 | 131453 | 131454 | 131455 | 131456 | 134288 | 134289 | 134290 | 134291 | 134292 | 134293 | 134294 | 134295 | 134296 | 135590 | 135591 | 135592 | 135593 | 135594 | 135595 | 135596 | 135597 | 135598 | 135599 | 135600 | 135601 | 135602 | 135603 | 135604 | 135605 | 135606 | 135607 | 135608 | 135609 | 135610 | 135614 | 135615 | 135616 | 135617 | 135618 | 135619 | 135620 | 135621 | 135622 | 135623 | 135624 | 135625 | 135626 | 135627 | 135628 | 135629 | 137259 | 137260 | 137261 | 137262 | 137263 | 137264 | 137265 | 137266 | 137267 | 137268 | 137311 | 137314 | 137315 | 137316 | 137317 | 137318 | 137319 | 137320 | 137321 | 137322 | 137323 | 137441 | 137442 | 137443 | 137608 | 138933