Attachment 139231 Details for Bug 31028 – Bug 31028: Add a catalog concerns management page

[patch] Bug 31028: Add a catalog concerns management page

Bug-31028-Add-a-catalog-concerns-management-page.patch (text/plain), 16.53 KB, created by Martin Renvoize (ashimema) on 2022-08-17 08:13:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-08-17 08:13:35 UTC

Size: 16.53 KB

patch

obsolete

>From 4d9858a540c8e65e2c427173c640c7d3debb5936 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 7 Jul 2022 14:58:22 +0100
>Subject: [PATCH] Bug 31028: Add a catalog concerns management page
>
>This patch adds a new cataloguing concerns page to the staff client for
>managing reported catalog concerns.
>---
> cataloguing/concerns.pl                       |  37 +++
> .../prog/en/includes/cat-menu.inc             |  17 +-
> .../prog/en/modules/cataloguing/concerns.tt   | 229 ++++++++++++++++++
> .../prog/en/modules/intranet-main.tt          |   7 +
> .../prog/en/modules/tools/tools-home.tt       |   5 +
> mainpage.pl                                   |   6 +
> 6 files changed, 298 insertions(+), 3 deletions(-)
> create mode 100755 cataloguing/concerns.pl
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
>
>diff --git a/cataloguing/concerns.pl b/cataloguing/concerns.pl
>new file mode 100755
>index 0000000000..4e3d1ff55e
>--- /dev/null
>+++ b/cataloguing/concerns.pl
>@@ -0,0 +1,37 @@
>+#!/usr/bin/perl
>+
>+# This file is part of Koha.
>+#
>+# Koha is free software; you can redistribute it and/or modify it
>+# under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 3 of the License, or
>+# (at your option) any later version.
>+#
>+# Koha is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with Koha; if not, see <http://www.gnu.org/licenses>.
>+
>+use Modern::Perl;
>+
>+use CGI qw ( -utf8 );
>+use C4::Context;
>+use C4::Auth qw( get_template_and_user );
>+use C4::Output qw( output_html_with_http_headers );
>+
>+my $query = CGI->new;
>+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>+    {
>+        template_name   => "cataloguing/concerns.tt",
>+        query           => $query,
>+        type            => "intranet",
>+        flagsrequired   => { cataloguing => '*' },
>+    }
>+);
>+
>+output_html_with_http_headers $query, $cookie, $template->output;
>+
>+1;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>index 817552ecd8..98e338afcf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>@@ -1,3 +1,14 @@
>-<ul>
>-	<li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
>-</ul>
>+[% USE Koha %]
>+
>+<div id="navmenu">
>+    <div id="navmenulist">
>+        <h5>Tools</h5>
>+        <ul>
>+            <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
>+        </ul>
>+        <h5>Reports</h5>
>+        <ul>
>+            <li><a href="/cgi-bin/koha/cataloguing/concerns.pl">Concerns</a></li>
>+        </ul>
>+    </div>
>+</div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
>new file mode 100644
>index 0000000000..cc23ea4c3d
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
>@@ -0,0 +1,229 @@
>+[% USE raw %]
>+[% USE Asset %]
>+[% SET footerjs = 1 %]
>+[% USE TablesSettings %]
>+[% INCLUDE 'doc-head-open.inc' %]
>+<title>
>+    Concerns &rsaquo; Cataloging &rsaquo; Koha
>+</title>
>+[% INCLUDE 'doc-head-close.inc' %]
>+</head>
>+
>+<body id="cat_concerns" class="cat">
>+    [% INCLUDE 'header.inc' %]
>+    [% INCLUDE 'cataloging-search.inc' %]
>+
>+    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Concerns
>+                </a>
>+            </li>
>+        </ol>
>+    </nav>
>+
>+    <div class="main container-fluid">
>+        <div class="row">
>+            <div class="col-sm-10 col-sm-push-2">
>+                <main>
>+                    <div id="toolbar" class="btn-toolbar">
>+                        <a class="btn btn-default" id="newconcern" role="button" href="#" data-toggle="modal" data-target="#addConcernModal"><i class="fa fa-plus"></i> New concern</a>
>+                    </div>
>+
>+                    <h1>Concerns</h1>
>+
>+                    <div class="table_concerns_table_controls"></div>
>+                    <table id="table_concerns">
>+                        <thead>
>+                            <tr>
>+                                <th>Reported</th>
>+                                <th>Concern</th>
>+                                <th>Title</th>
>+                                <th>Status</th>
>+                                <th data-class-name="actions noExport">Actions</th>
>+                            </tr>
>+                        </thead>
>+                    </table>
>+                </main>
>+            </div> 
>+
>+            <div class="col-sm-2 col-sm-pull-10">
>+                <aside>
>+                    [% INCLUDE 'cat-menu.inc' %]
>+                </aside>
>+            </div> 
>+        </div> 
>+
>+        
>+        <div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernLabel">
>+            <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="addConcernLabel">Add concern</h4>
>+                    </div>
>+                    <div class="modal-body">
>+                        <fieldset class="rows">
>+                            <ol>
>+                                <li>
>+                                    <label class="required" for="biblio_id">Biblio: </label>
>+                                    <input type="text" name="biblio_id" id="biblio_add">
>+                                    <span class="required">Required</span>
>+                                </li>
>+                                <li>
>+                                    <label class="required" for="message">Please describe your concern: </label>
>+                                    <textarea id="message_add" name="message" required="required"></textarea>
>+                                    <span class="required">Required</span>
>+                                    <p id="helpBlock" class="help-block">A short summary of what the library policy is for dealing with such concerns and what constitutes a valid concern</p>
>+                                </li>
>+                            </ol>
>+                        </fieldset>
>+                    </div> 
>+                    <div class="modal-footer">
>+                        <button type="submit" class="btn btn-default" id="addConfirm">Confirm</button>
>+                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
>+                    </div> 
>+                </div> 
>+            </div> 
>+        </div> 
>+
>+[% MACRO jsinclude BLOCK %]
>+    [% INCLUDE 'datatables.inc' %]
>+    [% INCLUDE 'columns_settings.inc' %]
>+    [% INCLUDE 'js-date-format.inc' %]
>+    [% INCLUDE 'js-patron-format.inc' %]
>+    [% INCLUDE 'js-biblio-format.inc' %]
>+    <script>
>+        $(document).ready(function() {
>+
>+            var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
>+
>+            var concerns_url = '/api/v1/catalog/concerns';
>+            var concerns = $("#table_concerns").kohaTable({
>+                "ajax": {
>+                    "url": concerns_url
>+                },
>+                "embed": [
>+                    "reporter",
>+                    "resolver",
>+                    "biblio"
>+                ],
>+                'emptyTable': '<div class="dialog message">'+_("Congradulations, there are no catalog concerns.")+'</div>',
>+                "columnDefs": [ {
>+                    "targets": [0,1,2,3],
>+                    "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",
>+                        "searchable": true,
>+                        "orderable": true
>+                    },
>+                    {
>+                        "data": "biblio.title",
>+                        "render": function(data, type, row, meta) {
>+                            return $biblio_to_html(row.biblio, { link: 1 });
>+                        },
>+                        "searchable": true,
>+                        "orderable": true
>+                    },
>+                    {
>+                        "data": "resolved_date:resolver.firstname",
>+                        "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 ) {
>+                            var result = '<a class="btn btn-default btn-xs" role="button" class="resolve_concern" data-concern-id="'+ encodeURIComponent(row.concern_id) +'"><i class="fa fa-check" aria-hidden="true"></i> '+_("Resolve")+'</a>';
>+                            return result;
>+                        },
>+                        "searchable": false,
>+                        "orderable": false
>+                    },
>+                ]
>+            });
>+
>+            $('#table_concerns').on( "click", '.resolve_concern', function () {
>+                var concern_id   = decodeURIComponent($(this).data('concern-id'));
>+
>+                $("#delete_confirm_modal_button").unbind("click").on( "click", function () {
>+                    $.ajax({
>+                        method: "PUT",
>+                        url: "/api/v1/catalog/concerns/"+concern_id
>+                    }).success(function() {
>+                        $("#delete_confirm_modal").modal('hide');
>+                        concerns.api().ajax.reload(function (data) {
>+                            $("#concern_action_result_dialog").hide();
>+                            $("#concern_delete_success").html(_("Concern #%s deleted successfully.").format(concern_id)).show();
>+                        });
>+                    }).error(function () {
>+                        $("#concern_delete_error").html(_("Error deleting concern #%s. Check the logs.").format(concern_id)).show();
>+                    });
>+                });
>+            });
>+
>+            $('#addConcernModal').on('click', '#addConfirm', function(e) {
>+                let biblio_id = $('#biblio_add').val();
>+                let message = $('#message_add').val();
>+
>+                params = {
>+                    message: message,
>+                    biblio_id: biblio_id,
>+                    reporter_id: logged_in_user_borrowernumber,
>+                };
>+
>+                $.ajax({
>+                    url: '/api/v1/catalog/concerns',
>+                    type: 'POST',
>+                    data: JSON.stringify(params),
>+                    success: function(data) {
>+                        $('#AddConcernModal').modal('hide');
>+
>+                        if ( $.fn.dataTable.isDataTable("#table_concerns") ) {
>+                            $("#table_concerns").DataTable().ajax.reload();
>+                        }
>+                    },
>+                    contentType: "json"
>+                });
>+            });
>+        });
>+    </script>
>+[% END %]
>+[% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>index 67a51f7f5e..c6947acede 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>@@ -221,6 +221,13 @@
>                                 </div>
>                                 [% END %]
> 
>+                                [% IF ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue %]
>+                                <div class="pending-info" id="catalog_concerns_pending">
>+                                    <a href="/cgi-bin/koha/cataloguing/concerns.pl">Catalog concerns pending</a>:
>+                                    <span class="pending-number-link">[% pending_catalog_concerns | html %]</span>
>+                                </div>
>+                                [% END %]
>+
>                                 [% IF Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count %]
>                                     <div class="pending-info" id="checkout_notes_pending">
>                                         <a href="/cgi-bin/koha/circ/checkout-notes.pl">Checkout notes pending</a>:
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>index 7efa6aba1c..38e29cfbd5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>@@ -221,6 +221,11 @@
>     <dd>Perform inventory of your catalog</dd>
>     [% END %]
> 
>+    [% IF ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue %]
>+    <dt><a href="/cgi-bin/koha/cataloguing/concerns.pl">Catalog concerns</a></dt>
>+    <dd>Manage catalog concern reports</dd>
>+    [% END %]
>+
>     [% IF ( CAN_user_tools_label_creator ) %]
>     <dt><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></dt>
>     <dd>Create printable labels and barcodes from catalog data</dd>
>diff --git a/mainpage.pl b/mainpage.pl
>index f5872e65bb..86558d63bb 100755
>--- a/mainpage.pl
>+++ b/mainpage.pl
>@@ -31,6 +31,7 @@ use Koha::Patron::Discharge;
> use Koha::Reviews;
> use Koha::ArticleRequests;
> use Koha::ProblemReports;
>+use Koha::Catalog::Concerns;
> use Koha::Quotes;
> use Koha::Suggestions;
> use Koha::BackgroundJobs;
>@@ -103,6 +104,11 @@ my $pending_article_requests = Koha::ArticleRequests->search_limited(
> )->count;
> my $pending_problem_reports = Koha::ProblemReports->search({ status => 'New' });
> 
>+if ( C4::Context->preference('CatalogConcerns') || C4::Context->preference('OpacCatalogConcerns') ) {
>+    my $concerns = Koha::Catalog::Concerns->search({ resolved_date => undef });
>+    $template->param( pending_catalog_concerns => $concerns->count );
>+}
>+
> unless ( $logged_in_user->has_permission( { parameters => 'manage_background_jobs' } ) ) {
>     my $already_ran_jobs = Koha::BackgroundJobs->search(
>         { borrowernumber => $logged_in_user->borrowernumber } )->count ? 1 : 0;
>-- 
>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