Attachment 142185 Details for Bug 31028 – Bug 31028: Add concerns tab to biblio details display

[patch] Bug 31028: Add concerns tab to biblio details display

Bug-31028-Add-concerns-tab-to-biblio-details-displ.patch (text/plain), 11.86 KB, created by Martin Renvoize (ashimema) on 2022-10-19 15:08:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-10-19 15:08:02 UTC

Size: 11.86 KB

patch

obsolete

>From 477bdb89040b2d19cd3eb32ca87a76bd0f4be96c Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 20 Sep 2022 16:15:59 +0100
>Subject: [PATCH] Bug 31028: Add concerns tab to biblio details display
>
>This patch adds a 'Concerns' tab to the catalogue/detail display
>---
> Koha/Biblio.pm                                |  15 ++
> .../prog/en/modules/catalogue/detail.tt       | 170 ++++++++++++++++++
> 2 files changed, 185 insertions(+)
>
>diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm
>index 3c8e5cb4b2..451361428f 100644
>--- a/Koha/Biblio.pm
>+++ b/Koha/Biblio.pm
>@@ -35,6 +35,7 @@ use Koha::ArticleRequests;
> use Koha::Biblio::Metadatas;
> use Koha::Biblio::ItemGroups;
> use Koha::Biblioitems;
>+use Koha::Catalog::Concerns;
> use Koha::Checkouts;
> use Koha::CirculationRules;
> use Koha::Item::Transfer::Limits;
>@@ -119,6 +120,20 @@ sub active_orders {
>     return $self->orders->search({ datecancellationprinted => undef });
> }
> 
>+=head3 concerns
>+
>+  my $concerns = $biblio->concerns();
>+
>+Returns all concerns linked to the biblio
>+
>+=cut
>+
>+sub concerns {
>+    my ( $self ) = @_;
>+    my $rs = $self->_result->catalog_concerns;
>+    return Koha::Catalog::Concerns->_new_from_dbic( $rs );
>+}
>+
> =head3 item_groups
> 
> my $item_groups = $biblio->item_groups();
>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 b1b77e3cc3..7443d6b1a5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -299,6 +299,7 @@
> [% IF Koha.Preference('AcquisitionDetails') %]<li role="presentation"><a href="#acq_details"  aria-controls="acq_details" role="tab" data-toggle="tab">Acquisition details</a></li>[% END %]
> [% IF suggestions.count %]<li role="presentation"><a href="#suggestion_details"  aria-controls="suggestion_details" role="tab" data-toggle="tab">Suggestion details</a></li>[% END %]
> [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]<li role="presentation"><a href="#editions"  aria-controls="editions" role="tab" data-toggle="tab">Editions</a></li>[% END %][% END %]
>+[% IF ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) %]<li role="presentation"><a href="#concerns" aria-controls="concerns" role="tab" data-toggle="tab">Concerns ([% biblio.concerns.count | html %])</a></li>[% END %]
> [% IF ( LocalCoverImages ) %]
>     <li role="presentation">
>         <a href="#images"  aria-controls="images" role="tab" data-toggle="tab">Images ([% localimages.count || 0 | html %])</a>
>@@ -1000,6 +1001,59 @@ Note that permanent location is a code, and location may be an authval.
> </table></div>[% END %]
> [% END %]
> 
>+[% IF ( Koha.Prefernce('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) %]
>+<div role="tabpanel" class="tab-pane" id="concerns">
>+    <fieldset class="action" style="cursor:pointer;">
>+        <a id="hideResolved"><i class="fa fa-minus-square"></i> Hide resolved</a>
>+        | <a id="showAll"><i class="fa fa-bars"></i> Show all</a>
>+    </fieldset>
>+
>+    <table id="table_concerns" width="100%">
>+        <thead>
>+            <tr>
>+                <th>Reported</th>
>+                <th>Details</th>
>+                <th>Status</th>
>+                <th data-class-name="actions noExport">Actions</th>
>+            </tr>
>+        </thead>
>+    </table>
>+
>+    
>+    <div class="modal" id="resolveConcernModal" tabindex="-1" role="dialog" aria-labelledby="resolveConcernLabel">
>+        <div class="modal-dialog" role="document">
>+            <div class="modal-content">
>+                <div class="modal-header">
>+                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>+                    <h4 class="modal-title" id="resolveConcernLabel">Resolve concern</h4>
>+                </div>
>+                <div class="modal-body">
>+                    <fieldset class="rows">
>+                        <ol>
>+                            <li>
>+                                <label for="notify">Notify: </label>
>+                                <input type="checkbox" name="notify" id="resolve_notify">
>+                            </li>
>+                            <li>
>+                                <label for="message">Resolution: </label>
>+                                <textarea id="resolve_message" name="message"></textarea>
>+                                <p id="helpBlock" class="help-block">Optional message to include with the notification to the reporter</p>
>+
>+                            </li>
>+                        </ol>
>+                    </fieldset>
>+                </div> 
>+                <div class="modal-footer">
>+                    <input type="hidden" name="concern_id" id="concern_id">
>+                    <button type="submit" class="btn btn-default" id="resolveConfirm">Confirm</button>
>+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
>+                </div> 
>+            </div> 
>+        </div> 
>+    </div> 
>+</div>
>+[% END %]
>+
> [% IF ( LocalCoverImages ) %]
>     <div role="tabpanel" class="tab-pane" id="images">
>         [% IF localimages.count %]
>@@ -1313,6 +1367,122 @@ Note that permanent location is a code, and location may be an authval.
>         <script>
>             /* Set a variable needed by add_catalog_concern.js */
>             var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
>+
>+            $(document).ready(function() {
>+                var table_settings = [% TablesSettings.GetTableSettings( 'cataloguing', 'concerns', 'table_concerns', 'json' ) | $raw %];
>+
>+                var concerns_url = '/api/v1/catalog/concerns';
>+                var concerns = $("#table_concerns").kohaTable({
>+                    "ajax": {
>+                        "url": concerns_url
>+                    },
>+                    "embed": [
>+                        "reporter",
>+                        "resolver",
>+                    ],
>+                    'emptyTable': '<div class="dialog message">'+_("Congradulations, there are no catalog concerns.")+'</div>',
>+                    "columnDefs": [ {
>+                        "targets": [0,1,2],
>+                        "render": function (data, type, row, meta) {
>+                            if ( type == 'display' ) {
>+                                if ( data != null ) {
>+                                    return data.escapeHtml();
>+                                }
>+                                else {
>+                                    return "";
>+                                }
>+                            }
>+                            return data;
>+                        }
>+                    } ],
>+                    "columns": [
>+                        {
>+                            "data": "reported_date:reporter.firstname",
>+                            "render": function(data, type, row, meta) {
>+                                let reported = '<span class="date clearfix">'+$datetime(row.reported_date)+'</span>';
>+                                reported += '<span class="reporter clearfix">'+$patron_to_html( row.reporter, { display_cardnumber: false, url: true } )+'</span>';
>+                                return reported;
>+                            },
>+                            "searchable": true,
>+                            "orderable": true
>+                        },
>+                        {
>+                            "data": "message:resolution_message",
>+                            "render": function(data, type, row, meta) {
>+                                let result = '<span class="clearfix">'+row.message+'</span>';
>+                                if ( row.resolution_message ) {
>+                                    result += '<span class="clearfix">'+_('Resolution: %s').format(row.resolution_message)+'</spani>';
>+                                }
>+                                return result;
>+                            },
>+                            "searchable": true,
>+                            "orderable": true
>+                        },
>+                        {
>+                            "data": "resolved_date",
>+                            "render": function(data, type, row, meta) {
>+                                let result = '';
>+                                if ( row.resolved_date ) {
>+                                    result += _("Resolved by:")+' <span>'+$patron_to_html( row.resolver, { display_cardnumber: false, url: true } )+'</span>';
>+                                    result += '<span class="clearfix">'+$datetime(row.resolved_date)+'</span>';
>+                                } else {
>+                                    result += _("Open");
>+                                }
>+                                return result;
>+                            },
>+                            "searchable": true,
>+                            "orderable": true
>+                        },
>+                        {
>+                            "data": function( row, type, val, meta ) {
>+                                let result = '';
>+                                if ( !row.resolved_date ) {
>+                                    result += '<a class="btn btn-default btn-xs" role="button" href="#" data-toggle="modal" data-target="#resolveConcernModal" data-concern="'+ encodeURIComponent(row.concern_id) +'"><i class="fa fa-check" aria-hidden="true"></i> '+_("Resolve")+'</a>';
>+                                }
>+                                return result;
>+                            },
>+                            "searchable": false,
>+                            "orderable": false
>+                        },
>+                    ]
>+                }, table_settings, 0, { biblio_id: [% biblionumber | uri %]});
>+
>+                $('#hideResolved').on( "click", function() {
>+                    // It would be great if we could pass null here but it gets stringified
>+                    concerns.DataTable().columns('3').search('special:undefined').draw();
>+                });
>+
>+                $('#showAll').on( "click", function() {
>+                    concerns.DataTable().columns('3').search('').draw();
>+                });
>+
>+                $('#resolveConcernModal').on('show.bs.modal', function (event) {
>+                      let modal = $(this);
>+                      let button = $(event.relatedTarget);
>+                      let concern = button.data('concern');
>+
>+                      modal.find('.modal-footer input').val(concern)
>+                });
>+
>+                $('#resolveConcernModal').on('click', '#resolveConfirm', function(e) {
>+                    let concern_id = $('#concern_id').val();
>+                    let params = { notify: $('#resolve_notify').is(":checked"), message: $('#resolve_message').val() };
>+
>+                    $.ajax({
>+                        url: "/api/v1/catalog/concerns/"+concern_id+"/resolve",
>+                        method: "POST",
>+                        data: JSON.stringify(params)
>+                    }).success(function() {
>+                        $("#resolveConcernModal").modal('hide');
>+                        concerns.DataTable().ajax.reload(function (data) {
>+                            $("#concern_action_result_dialog").hide();
>+                            $("#concern_delete_success").html(_("Concern #%s deleted successfully.").format(concern_id)).show();
>+                        });
>+                    }).error(function () {
>+                        $("#concern_resolve_error").html(_("Error resolving concern #%s. Check the logs.").format(concern_id)).show();
>+                    });
>+                });
>+            });
>         </script>
>         [% Asset.js("js/modals/add_catalog_concern.js") | $raw %]
>     [% END %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 31028: 137412 | 139222 | 139223 | 139224 | 139225 | 139226 | 139227 | 139228 | 139229 | 139230 | 139231 | 139232 | 139233 | 139234 | 139235 | 139236 | 139237 | 139238 | 139572 | 139573 | 139574 | 139575 | 139576 | 139577 | 139578 | 139579 | 139580 | 139581 | 139582 | 139583 | 139584 | 139585 | 139586 | 139587 | 139588 | 139589 | 139590 | 139591 | 140289 | 140290 | 140291 | 140292 | 140293 | 140294 | 140295 | 140296 | 140297 | 140298 | 140299 | 140300 | 140301 | 140302 | 140303 | 140304 | 140305 | 140306 | 140307 | 140308 | 140436 | 140437 | 140438 | 140439 | 140440 | 140441 | 140442 | 140443 | 140444 | 140445 | 140446 | 140447 | 140448 | 140449 | 140450 | 140451 | 140452 | 140453 | 140454 | 140455 | 140764 | 140765 | 140766 | 140767 | 140768 | 140769 | 140770 | 140771 | 140772 | 140773 | 140774 | 140775 | 140776 | 140777 | 140778 | 140779 | 140780 | 140781 | 140782 | 140783 | 140793 | 140929 | 140930 | 140931 | 140932 | 140933 | 140934 | 140935 | 140936 | 140937 | 140938 | 140939 | 140940 | 140941 | 140942 | 140943 | 140944 | 140945 | 140946 | 140947 | 140948 | 140949 | 140950 | 141133 | 141134 | 141135 | 141136 | 141137 | 141138 | 141139 | 141140 | 141141 | 141142 | 141143 | 141144 | 141145 | 141146 | 141147 | 141148 | 141149 | 141150 | 141151 | 141152 | 141153 | 141154 | 141440 | 141441 | 141442 | 141443 | 141444 | 141445 | 141446 | 141447 | 141448 | 141449 | 141450 | 141451 | 141452 | 141453 | 141454 | 141455 | 141456 | 141457 | 141458 | 141459 | 141460 | 142164 | 142165 | 142166 | 142167 | 142168 | 142169 | 142170 | 142171 | 142172 | 142173 | 142174 | 142175 | 142177 | 142179 | 142180 | 142181 | 142182 | 142183 | 142184 | 142185 | 142186 | 142187 | 142188 | 142189 | 142190 | 142191 | 142616 | 142617 | 142618 | 142619 | 142620 | 142621 | 142622 | 142623 | 142624 | 142625 | 142626 | 142627 | 142932 | 142933 | 142934 | 142935 | 142936 | 142937 | 142938 | 142939 | 142940 | 142941 | 142942 | 142943 | 142944 | 142945 | 142946 | 142947 | 142948 | 142949 | 143238 | 143239 | 143240 | 143241 | 143242 | 143243 | 143244 | 143245 | 143246 | 143247 | 143248 | 143249 | 143250 | 143251 | 143252 | 143253 | 143254 | 143255 | 143256 | 143257 | 143302 | 143303 | 143304 | 143305 | 143306 | 143307 | 143308 | 143309 | 143310 | 143311 | 143312 | 143313 | 143314 | 143315 | 143316 | 143317 | 143318 | 143319 | 143320 | 143321 | 143322 | 143323 | 143324 | 143325 | 143326 | 143327 | 143328 | 143329 | 143330 | 143331 | 143332 | 143333 | 143334 | 143335 | 143336 | 143337 | 143338 | 143339 | 143340 | 143341 | 143470 | 143471 | 143472 | 143473 | 143474 | 143475 | 143476 | 143477 | 143478 | 143479 | 143480 | 143481 | 143482 | 143483 | 143484 | 143485 | 143486 | 143487 | 143488 | 143489 | 143490 | 143647 | 143648 | 143649 | 143650 | 143651 | 143652 | 143653 | 143654 | 143655 | 143656 | 143657 | 143658 | 143659 | 143660 | 143661 | 143662 | 143663 | 143664 | 143665 | 143666 | 143667 | 143708 | 143709 | 143710 | 143711 | 143712 | 143713 | 143714 | 143715 | 143716 | 143717 | 143718 | 143719 | 143720 | 143721 | 143722 | 143723 | 143724 | 143725 | 143726 | 143727 | 144647 | 144648 | 144649 | 144650 | 144651 | 144652 | 144653 | 144654 | 144655 | 144656 | 144657 | 144658 | 144659 | 144660 | 144661 | 144662 | 144663 | 144664 | 144665 | 144666 | 144667 | 144668 | 145542 | 146214 | 146215 | 146216 | 146217 | 146218 | 146219 | 146220 | 146221 | 146222 | 146223 | 146224 | 146225 | 146226 | 146227 | 146228 | 146229 | 146230 | 146231 | 146232 | 146233 | 146234 | 146235 | 146236 | 146237 | 146238 | 146239 | 146240 | 146241 | 146242 | 146243 | 146244 | 146245 | 146246 | 146247 | 146248 | 146249 | 146250 | 146251 | 146252 | 146253 | 146254 | 146255 | 146256 | 146257 | 146258 | 146259 | 146260 | 146261 | 146262 | 146697 | 146870 | 146871 | 146872 | 146873 | 146874 | 146875 | 146876 | 146877 | 146878 | 146879 | 146880 | 146881 | 146882 | 146883 | 146884 | 146885 | 146886 | 146887 | 146888 | 146889 | 146890 | 146891 | 146892 | 146893 | 146894 | 146895 | 146896 | 147797 | 147840 | 147841 | 147844 | 147859 | 147860 | 147861 | 147866 | 148673 | 149931