Attachment 108452 Details for Bug 24857 – Bug 24857: Add ability to manage item's volumes from detail.pl

[patch] Bug 24857: Add ability to manage item's volumes from detail.pl

Bug-24857-Add-ability-to-manage-items-volumes-from.patch (text/plain), 11.88 KB, created by Kyle M Hall (khall) on 2020-08-18 10:56:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2020-08-18 10:56:35 UTC

Size: 11.88 KB

patch

obsolete

>From 932beb57f9fc213cf1ed4b64535b1e42dfa2825e Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Wed, 26 Feb 2020 14:59:40 -0500
>Subject: [PATCH] Bug 24857: Add ability to manage item's volumes from
> detail.pl
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>
>Signed-off-by: Rebecca  Coert <rcoert@arlingtonva.us>
>---
> Koha/Biblio.pm                                |   3 +-
> catalogue/detail.pl                           |  68 ++++++++---
> .../prog/en/modules/catalogue/detail.tt       | 109 +++++++++++++++++-
> 3 files changed, 164 insertions(+), 16 deletions(-)
>
>diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm
>index efaf604b8e..724ab9ebf1 100644
>--- a/Koha/Biblio.pm
>+++ b/Koha/Biblio.pm
>@@ -37,13 +37,14 @@ use Koha::ArticleRequest::Status;
> use Koha::ArticleRequests;
> use Koha::Biblio::Metadatas;
> use Koha::Biblio::Volumes;
>+use Koha::Biblio::Volumes;
> use Koha::Biblioitems;
> use Koha::CirculationRules;
> use Koha::Item::Transfer::Limits;
> use Koha::Items;
> use Koha::Libraries;
>-use Koha::Suggestions;
> use Koha::Subscriptions;
>+use Koha::Suggestions;
> 
> =head1 NAME
> 
>diff --git a/catalogue/detail.pl b/catalogue/detail.pl
>index 4a2aa3afa7..0c604587b3 100755
>--- a/catalogue/detail.pl
>+++ b/catalogue/detail.pl
>@@ -21,34 +21,38 @@ use Modern::Perl;
> use CGI qw ( -utf8 );
> use HTML::Entities;
> use Try::Tiny;
>+
>+use C4::Acquisition qw(GetOrdersByBiblionumber);
> use C4::Auth;
>+use C4::Biblio;
>+use C4::Circulation;
> use C4::Context;
>+use C4::CourseReserves qw(GetItemCourseReservesInfo);
>+use C4::External::Amazon;
>+use C4::HTML5Media;
>+use C4::Images;
>+use C4::Items;
> use C4::Koha;
>-use C4::Serials;    #uses getsubscriptionfrom biblionumber
> use C4::Output;
>-use C4::Biblio;
>-use C4::Items;
>-use C4::Circulation;
> use C4::Reserves;
>-use C4::Serials;
>-use C4::XISBN qw(get_xisbns);
>-use C4::External::Amazon;
> use C4::Search;        # enabled_staff_search_views
>+use C4::Serials;
>+use C4::Serials;    #uses getsubscriptionfrom biblionumber
> use C4::Tags qw(get_tags);
>+use C4::XISBN qw(get_xisbns);
> use C4::XSLT;
>-use C4::Images;
>-use Koha::DateUtils;
>-use C4::HTML5Media;
>-use C4::CourseReserves qw(GetItemCourseReservesInfo);
>-use C4::Acquisition qw(GetOrdersByBiblionumber);
>+
> use Koha::AuthorisedValues;
>+use Koha::Biblio::Volume::Items;
> use Koha::Biblios;
>+use Koha::DateUtils qw(format_sqldatetime);
> use Koha::Illrequests;
>-use Koha::Items;
> use Koha::ItemTypes;
>+use Koha::Items;
>+use Koha::Items;
> use Koha::Patrons;
>-use Koha::Virtualshelves;
> use Koha::Plugins;
>+use Koha::Virtualshelves;
> 
> my $query = CGI->new();
> 
>@@ -115,6 +119,41 @@ if ( not defined $record ) {
> eval { $biblio->metadata->record };
> $template->param( decoding_error => $@ );
> 
>+my $op = $query->param('op') || q{};
>+if ( $op eq 'set_volume' ) {
>+    my $volume_id   = $query->param('volume_id');
>+    my @itemnumbers = $query->multi_param('itemnumber');
>+
>+    foreach my $itemnumber (@itemnumbers) {
>+        my $volume_item =
>+          Koha::Biblio::Volume::Items->find( { itemnumber => $itemnumber } );
>+
>+        if ($volume_item) {
>+            $volume_item->volume_id($volume_id);
>+        }
>+        else {
>+            $volume_item = Koha::Biblio::Volume::Item->new(
>+                {
>+                    itemnumber => $itemnumber,
>+                    volume_id  => $volume_id,
>+                }
>+            );
>+        }
>+
>+        $volume_item->store();
>+    }
>+}
>+elsif ( $op eq 'unset_volume' ) {
>+    my $volume_id   = $query->param('volume_id');
>+    my @itemnumbers = $query->multi_param('itemnumber');
>+
>+    foreach my $itemnumber (@itemnumbers) {
>+        my $volume_item =
>+          Koha::Biblio::Volume::Items->find( { itemnumber => $itemnumber } );
>+        $volume_item->delete() if $volume_item;
>+    }
>+}
>+
> if($query->cookie("holdfor")){ 
>     my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
>     $template->param(
>@@ -328,6 +367,7 @@ foreach my $item (@items) {
> 
>     # checking for holds
>     my $item_object = Koha::Items->find( $item->{itemnumber} );
>+    $item->{object} = $item_object;
>     my $holds = $item_object->current_holds;
>     if ( my $first_hold = $holds->next ) {
>         $item->{first_hold} = $first_hold;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index 7ac8daf6fb..aa901479cc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -267,6 +267,10 @@
>               [% IF CAN_user_tools_items_batchmod %]
>                 <a class="itemselection_action_modify"><i class="fa fa-pencil"></i> Modify selected items</a>
>               [% END %]
>+              [% IF biblio.volumes.count %]
>+                <a class="itemselection_action_volume_set" href="#"><i class="fa fa-book"></i> Add/move to volume</a>
>+                <a class="itemselection_action_volume_unset" href="#"><i class="fa fa-unlink"></i> Remove from volume</a>
>+              [% END %]
>             </span>
>         [% END %]
>     </div>
>@@ -278,6 +282,7 @@
>                 <th id="[% tab | html %]_holdingbranch" data-colname="[% tab | html %]_holdingbranch">Current location</th>
>                 <th id="[% tab | html %]_homebranch" data-colname="[% tab | html %]_homebranch">Home library</th>
>                 [% IF ( itemdata_ccode ) %]<th id="[% tab | html %]_ccode" data-colname="[% tab | html %]_ccode">Collection</th>[% END %]
>+                [% IF Koha.Preference('EnableVolumes') %]<th>Volume</th>[% END %]
>                 <th id="[% tab | html %]_itemcallnumber" data-colname="[% tab | html %]_itemcallnumber">Call number</th>
>                 [% IF volinfo %]
>                 [% IF itemdata_publisheddate #If there is at least one published date, use it for sorting%]
>@@ -340,6 +345,7 @@ Note that permanent location is a code, and location may be an authval.
>                         </span>
>                     </td>
>                     [% IF ( itemdata_ccode ) %]<td>[% item.ccode | html %]</td>[% END %]
>+                    [% IF Koha.Preference('EnableVolumes') %]<td>[% item.object.volume.description | html %]</td>[% END %]
>                     <td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber | html %][% END %]</td>
>                     [% IF ( volinfo ) %]
>                         <td class="enumchron">
>@@ -1029,7 +1035,7 @@ Note that permanent location is a code, and location may be an authval.
>     </div>
> </div>
> 
>-<div class="modal fade" id="modal-volume-delete" tabindex="-1" role="dialog" aria-labelledby="modal-volume-create-label">
>+<div class="modal fade" id="modal-volume-delete" tabindex="-1" role="dialog" aria-labelledby="modal-volume-delete-label">
>     <div class="modal-dialog">
>         <div class="modal-content">
>             <div class="modal-header">
>@@ -1047,6 +1053,54 @@ Note that permanent location is a code, and location may be an authval.
>     </div>
> </div>
> 
>+<div class="modal fade" id="modal-volume-set" tabindex="-1" role="dialog" aria-labelledby="modal-volume-set-label">
>+    <div class="modal-dialog">
>+        <div class="modal-content">
>+            <div class="modal-header">
>+                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>+                <h3 id="modal-volume-set-label"><i class='fa fa-book'></i> Set volume for items</h3>
>+            </div>
>+            <form id="modal-volume-set-form" class="validated">
>+                <div class="modal-body">
>+                    <fieldset>
>+                        <p>
>+                            <label for="volume" class="required">Volume: </label>
>+                            <select name="volume" id="volume-add-form-select">
>+                                [% FOREACH v IN biblio.volumes %]
>+                                    <option value="[% v.id | html %]">[% v.description | html %]</option>
>+                                [% END %]
>+                            </select>
>+                            <span class="required">Required</span>
>+                        </p>
>+                    </fieldset>
>+                </div>
>+                <div class="modal-footer">
>+                    <button id="modal-volume-set-submit" class="btn btn-default"><i class='fa fa-book'></i> Set volume</button>
>+                    <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+                </div>
>+            </form>
>+        </div>
>+    </div>
>+</div>
>+
>+<div class="modal fade" id="modal-volume-unset" tabindex="-1" role="dialog" aria-labelledby="modal-volume-unset-label">
>+    <div class="modal-dialog">
>+        <div class="modal-content">
>+            <div class="modal-header">
>+                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>+                <h3 id="modal-volume-unset-label"><i class='fa fa-unlink'></i> Remove item from volume</h3>
>+            </div>
>+            <div class="modal-body">
>+                Are you sure you want to remove these item(s) from their volume(s)?
>+            </div>
>+            <div class="modal-footer">
>+                <button id="modal-volume-unset-submit" class="btn btn-danger"><i class='fa fa-unlink'></i> Remove</button>
>+                <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+            </div>
>+        </div>
>+    </div>
>+</div>
>+
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'catalog-strings.inc' %]
>     [% Asset.js("js/catalog.js") | $raw %]
>@@ -1552,6 +1606,59 @@ Note that permanent location is a code, and location may be an authval.
>                     }
>                 });
>             });
>+
>+            // Add item(s) to a volume
>+            $('.itemselection_action_volume_set').on('click', function(){
>+                $('#modal-volume-set').modal('show');
>+            });
>+
>+            $("#modal-volume-set-form").validate({
>+                submitHandler: function(form) {
>+                    $('#modal-volume-set-submit').attr('disabled', 'disabled');
>+
>+                    const volume_id = $('#volume-add-form-select').val();
>+
>+                    let itemnumbers = new Array();
>+                    $("input[name='itemnumber'][type='checkbox']:checked").each(function() {
>+                        const itemnumber = $(this).val();
>+                        itemnumbers.push( itemnumber );
>+                    });
>+                    if (itemnumbers.length > 0) {
>+                        let url = '/cgi-bin/koha/catalogue/detail.pl?op=set_volume';
>+                        url += '&itemnumber=' + itemnumbers.join('&itemnumber=');
>+                        url += '&biblionumber=[% biblionumber | uri %]';
>+                        url += `&volume_id=${volume_id}`;
>+
>+                        window.location.replace(url);
>+                    }
>+
>+                    $('#modal-volume-set').modal('hide');
>+                }
>+            });
>+
>+            // Remove item(s) from a volume
>+            $('.itemselection_action_volume_unset').on('click', function(){
>+                $('#modal-volume-unset').modal('show');
>+            });
>+
>+            $("#modal-volume-unset-submit").on('click', function(){
>+                $('#modal-volume-unset-submit').attr('disabled', 'disabled');
>+
>+                let itemnumbers = new Array();
>+                $("input[name='itemnumber'][type='checkbox']:checked").each(function() {
>+                    const itemnumber = $(this).val();
>+                    itemnumbers.push( itemnumber );
>+                });
>+                if (itemnumbers.length > 0) {
>+                    let url = '/cgi-bin/koha/catalogue/detail.pl?op=unset_volume';
>+                    url += '&itemnumber=' + itemnumbers.join('&itemnumber=');
>+                    url += '&biblionumber=[% biblionumber | uri %]';
>+
>+                    window.location.replace(url);
>+                }
>+
>+                $('#modal-volume-unset').modal('hide');
>+            });
>         [% END %]
>     </script>
> [% END %]
>-- 
>2.24.1 (Apple Git-126)

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