Attachment 126106 Details for Bug 28854 – Bug 28854: Add bundle content display to OPAC

[patch] Bug 28854: Add bundle content display to OPAC

Bug-28854-Add-bundle-content-display-to-OPAC.patch (text/plain), 6.60 KB, created by Martin Renvoize (ashimema) on 2021-10-12 15:51:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-10-12 15:51:36 UTC

Size: 6.60 KB

patch

obsolete

>From 7bc6b87d84e4e38e67ccc9341d0e948f641fb1e2 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 23 Sep 2021 15:08:55 +0100
>Subject: [PATCH] Bug 28854: Add bundle content display to OPAC
>
>TODO: Switch to /public api route
>TODO: Move expand button to right like staff client
>---
> .../bootstrap/en/modules/opac-detail.tt       | 92 ++++++++++++++++++-
> opac/opac-detail.pl                           | 10 ++
> 2 files changed, 100 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>index 0d417a7771..60ec639ce8 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>@@ -1068,7 +1068,9 @@
>         <caption class="sr-only">Holdings</caption>
>         <thead>
>             <tr>
>-
>+                [% IF ( itemdata_bundles ) %]
>+                    <th id="item_bundle" data-colname="item_bundle"></th>
>+                [% END %]
>                 [% IF Koha.Preference('OPACLocalCoverImages') && ( tab == 'holdings' && itemloop_has_images || tab == 'otherholdings' && otheritemloop_has_images ) %]
>                     <th id="item_cover" data-colname="item_cover">Cover image</th>
>                 [% END %]
>@@ -1118,7 +1120,17 @@
>         </thead>
>         <tbody>
>             [% FOREACH ITEM_RESULT IN items %]
>-                <tr vocab="http://schema.org/" typeof="Offer">
>+                <tr vocab="http://schema.org/" typeof="Offer" data-itemnumber="[% ITEM_RESULT.itemnumber | html %]">
>+
>+                [% IF ( itemdata_bundles ) %]
>+                    [% IF ITEM_RESULT.is_bundle %]
>+                    <td class="details-control">
>+                        <button><i class="fa fa-folder-open"></i></button>
>+                    </td>
>+                    [% ELSE %]
>+                    <td></td>
>+                    [% END %]
>+                [% END %]
> 
>                 [% IF Koha.Preference('OPACLocalCoverImages') && ( tab == 'holdings' && itemloop_has_images || tab == 'otherholdings' && otheritemloop_has_images ) %]
>                     <td class="cover">
>@@ -1421,6 +1433,82 @@
>                 "autoWidth": false
>             }, columns_settings);
> 
>+            function createChild ( row, itemnumber ) {
>+                // This is the table we'll convert into a DataTable
>+                var bundles_table = $('<table class="display" width="100%"/>');
>+
>+                // Display it the child row
>+                row.child( bundles_table ).show();
>+
>+                // Initialise as a DataTable
>+                var bundle_table_url = "/api/v1/items/" + itemnumber + "/bundled_items?";
>+                var bundle_table = bundles_table.api({
>+                    "ajax": {
>+                        "url": bundle_table_url
>+                    },
>+                    "header_filter": false,
>+                    "embed": [
>+                        "biblio",
>+                        "checkout"
>+                    ],
>+                    "order": [[ 0, "asc" ]],
>+                    "columns": [
>+                        {
>+                            "data": "item_type",
>+                            "title": "Item Type",
>+                            "searchable": false,
>+                            "orderable": true,
>+                        },
>+                        {
>+                            "data": "biblio.title",
>+                            "title": "Title",
>+                            "searchable": true,
>+                            "orderable": true,
>+                        },
>+                        {
>+                            "data": "damaged_status",
>+                            "title": "Status",
>+                            "searchable": false,
>+                            "orderable": true,
>+                        },
>+                        {
>+                            "data": "external_id",
>+                            "title": "Barcode",
>+                            "searchable": true,
>+                            "orderable": true,
>+                        },
>+                        {
>+                            "data": "callnumber",
>+                            "title": "Callnumber",
>+                            "searchable": true,
>+                            "orderable": true,
>+                        },
>+                    ]
>+                }, [], 1);
>+
>+                return;
>+            }
>+
>+            // Add event listener for opening and closing details
>+            $('#holdingst tbody').on('click', 'td.details-control', function () {
>+                var tr = $(this).closest('tr');
>+                var dTable = $(this).closest('table').DataTable({ 'retrieve': true });
>+
>+                var itemnumber = tr.data('itemnumber');
>+                var row = dTable.row( tr );
>+
>+                if ( row.child.isShown() ) {
>+                    // This row is already open - close it
>+                    row.child.hide();
>+                    tr.removeClass('shown');
>+                }
>+                else {
>+                    // Open this row
>+                    createChild(row, itemnumber);
>+                    tr.addClass('shown');
>+                }
>+            } );
>+
>             var serial_column_settings = [% TablesSettings.GetColumns( 'opac', 'biblio-detail', 'subscriptionst', 'json' ) | $raw %];
> 
>             KohaTable("#subscriptionst", {
>diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
>index eb9a6866b1..7e6ce44a8e 100755
>--- a/opac/opac-detail.pl
>+++ b/opac/opac-detail.pl
>@@ -751,6 +751,15 @@ if ( not $viewallitems and @items > $max_items_to_display ) {
>         $itm->{cover_images} = $item->cover_images;
>     }
> 
>+    if ($item->is_bundle) {
>+        $itemfields{bundles} = 1;
>+        $itm->{is_bundle} = 1;
>+    }
>+
>+    if ($item->in_bundle) {
>+        $itm->{bundle_host} = $item->bundle_host;
>+    }
>+
>     my $itembranch = $itm->{$separatebranch};
>     if ($currentbranch and C4::Context->preference('OpacSeparateHoldings')) {
>         if ($itembranch and $itembranch eq $currentbranch) {
>@@ -802,6 +811,7 @@ my $norequests = ! $biblio->items->filter_by_for_hold->count;
>                      MARCNOTES               => $marcnotesarray,
>                      norequests              => $norequests,
>                      RequestOnOpac           => C4::Context->preference("RequestOnOpac"),
>+                     itemdata_bundles        => $itemfields{bundles},
>                      itemdata_ccode          => $itemfields{ccode},
>                      itemdata_materials      => $itemfields{materials},
>                      itemdata_enumchron      => $itemfields{enumchron},
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 28854: 124319 | 124498 | 124616 | 125200 | 125201 | 125202 | 125203 | 125204 | 125205 | 125206 | 126103 | 126104 | 126105 | 126106 | 126107 | 126108 | 126109 | 126110 | 126148 | 126149 | 126150 | 126151 | 126152 | 126153 | 126154 | 126155 | 126166 | 126167 | 126168 | 126169 | 126170 | 126171 | 126172 | 126173 | 127498 | 127499 | 127500 | 127501 | 127502 | 127503 | 127504 | 127505 | 127659 | 127660 | 127661 | 127662 | 127663 | 127664 | 127665 | 127666 | 127829 | 127830 | 127831 | 127832 | 127833 | 127834 | 127835 | 127836 | 127837 | 127838 | 130313 | 130314 | 130315 | 130316 | 130317 | 130318 | 130319 | 130320 | 130321 | 130322 | 130323 | 130324 | 130325 | 130326 | 130327 | 130328 | 130329 | 130330 | 130331 | 130332 | 130456 | 132703 | 132704 | 132705 | 132706 | 132707 | 132708 | 132709 | 132710 | 132711 | 132712 | 132713 | 132714 | 132715 | 132716 | 132717 | 132718 | 132719 | 132720 | 132721 | 132722 | 132723 | 135019 | 135020 | 135021 | 135022 | 135023 | 135024 | 135025 | 135026 | 135027 | 135028 | 135029 | 135030 | 135031 | 135032 | 135033 | 135034 | 135035 | 135036 | 135037 | 136226 | 136227 | 136228 | 136229 | 136230 | 136231 | 136232 | 136233 | 136234 | 136235 | 136236 | 136237 | 136238 | 136239 | 136240 | 136241 | 136242 | 136243 | 136244 | 136249 | 136253 | 136254 | 136264 | 136265 | 136266 | 136267 | 136268 | 136269 | 136270 | 136271 | 136272 | 136273 | 136274 | 136275 | 136276 | 136277 | 136278 | 136279 | 136280 | 136281 | 136282 | 136283 | 136284 | 136285 | 136287 | 136340 | 136341 | 136342 | 136343 | 136344 | 136345 | 136346 | 136347 | 136348 | 136349 | 136350 | 136351 | 136352 | 136353 | 136354 | 136355 | 136356 | 136357 | 136358 | 136359 | 136360 | 136361 | 136362 | 136363 | 136364 | 136365 | 136366 | 136367 | 136368 | 136369 | 136370 | 136371 | 136498 | 136529 | 136530 | 136613 | 136614 | 136615 | 136616 | 136617 | 136618 | 136619 | 136620 | 136621 | 136622 | 136623 | 136624 | 136625 | 136626 | 136627 | 136628 | 136629 | 136630 | 136631 | 136632 | 136633 | 136634 | 136635 | 136636 | 136637 | 136638 | 136639 | 136640 | 136641 | 136642 | 136643 | 136644 | 136645 | 136646 | 136647 | 136648 | 136649 | 136650 | 136651 | 136652 | 136654 | 136655 | 136806 | 136809 | 136811 | 136814 | 136817 | 136821 | 136824 | 136826 | 136829 | 136832 | 136835 | 136838 | 136841 | 136843 | 136846 | 136849 | 136850 | 136851 | 136852 | 136853 | 136854 | 136855 | 136856 | 136857 | 136858 | 136859 | 136860 | 136861 | 136862 | 136863 | 136864 | 136865 | 136866 | 136867 | 136868 | 136869 | 136870 | 136871 | 136872 | 136873 | 136874 | 136875 | 136876 | 136877 | 136905 | 136906 | 136907 | 136908 | 136909 | 136910 | 136911 | 136912 | 136913 | 136914 | 136915 | 136916 | 136917 | 136918 | 136919 | 136920 | 136921 | 136922 | 136923 | 136924 | 136925 | 136926 | 136927 | 136928 | 136929 | 136930 | 136931 | 136932 | 136933 | 136934 | 136935 | 136936 | 136937 | 136938 | 136939 | 136940 | 136941 | 136942 | 136943 | 136944 | 136945 | 136946 | 136947 | 136949 | 136978 | 136979 | 136980 | 136981 | 136982 | 136985 | 136988 | 136989 | 136990 | 136991 | 136992 | 136993 | 136994 | 136995 | 136996 | 136997 | 136998 | 136999 | 137000 | 137001 | 137002 | 137003 | 137004 | 137005 | 137006 | 137007 | 137008 | 137009 | 137010 | 137011 | 137012 | 137013 | 137014 | 137015 | 137016 | 137017 | 137018 | 137019 | 137020 | 137021 | 137022 | 137461 | 137462 | 137463 | 137464 | 137465 | 137466 | 137467 | 137468 | 137469 | 137470 | 137471 | 137472 | 137473 | 137474 | 137475 | 137476 | 137477 | 137478 | 137479 | 137480 | 137481 | 137482 | 137483 | 137484 | 137485 | 137486 | 137487 | 137488 | 137489 | 137490 | 137491 | 137492 | 137493 | 137494 | 137495 | 137496 | 137497 | 137498 | 137499 | 137500 | 137501 | 137503 | 137506 | 137524 | 137525 | 137527 | 137528 | 137529 | 137530 | 137531 | 137532 | 137533 | 137534 | 137535 | 137536 | 137537 | 137538 | 137540 | 137541 | 137542 | 137543 | 137544 | 137545 | 137546 | 137547 | 137548 | 137549 | 137550 | 137551 | 137552 | 137553 | 137554 | 137555 | 137556 | 137557 | 137558 | 137559 | 137560 | 137561 | 137562 | 137563 | 137564 | 137565 | 137566 | 137567 | 137568 | 137569 | 137570 | 137571 | 137684 | 137685 | 139347