Attachment #143478 for bug #31028

View | Details | Raw Unified | Return to bug 31028
Collapse All | Expand All

Lines 739-744 sub _parseletter_sth { Link Here

(-)a/C4/Letters.pm (+7 lines)
739	($table eq 'biblio' ) ? "SELECT * FROM $table WHERE biblionumber = ?" :	739	($table eq 'biblio' ) ? "SELECT * FROM $table WHERE biblionumber = ?" :
740	($table eq 'biblioitems' ) ? "SELECT * FROM $table WHERE biblionumber = ?" :	740	($table eq 'biblioitems' ) ? "SELECT * FROM $table WHERE biblionumber = ?" :
741	($table eq 'tickets' ) ? "SELECT * FROM $table WHERE id = ?" :	741	($table eq 'tickets' ) ? "SELECT * FROM $table WHERE id = ?" :
		742	($table eq 'ticket_updates' ) ? "SELECT * FROM $table WHERE id = ?" :
742	($table eq 'credits' ) ? "SELECT * FROM accountlines WHERE accountlines_id = ?" :	743	($table eq 'credits' ) ? "SELECT * FROM accountlines WHERE accountlines_id = ?" :
743	($table eq 'debits' ) ? "SELECT * FROM accountlines WHERE accountlines_id = ?" :	744	($table eq 'debits' ) ? "SELECT * FROM accountlines WHERE accountlines_id = ?" :
744	($table eq 'items' ) ? "SELECT * FROM $table WHERE itemnumber = ?" :	745	($table eq 'items' ) ? "SELECT * FROM $table WHERE itemnumber = ?" :
Lines 1736-1741 sub _get_tt_params { Link Here
1736	plural => 'tickets',	1737	plural => 'tickets',
1737	pk => 'id',	1738	pk => 'id',
1738	},	1739	},
		1740	ticket_updates => {
		1741	module => 'Koha::Ticket::Updates',
		1742	singular => 'ticket_update',
		1743	plural => 'ticket_updates',
		1744	pk => 'id',
		1745	},
1739	issues => {	1746	issues => {
1740	module => 'Koha::Checkouts',	1747	module => 'Koha::Checkouts',
1741	singular => 'checkout',	1748	singular => 'checkout',




    };
}

=head3 list_updates

=cut

sub list_updates {
    my $c = shift->openapi->valid_input or return;

    return try {
        my $ticket = Koha::Tickets->find( $c->validation->param('ticket_id') );
        unless ($ticket) {
            return $c->render(
                status  => 404,
                openapi => { error => "Ticket not found" }
            );
        }

        my $updates_set = $ticket->updates;
        my $updates     = $c->objects->search($updates_set);
        return $c->render( status => 200, openapi => $updates );
    }
    catch {
        $c->unhandled_exception($_);
    };
}

=head3 add_update

=cut

sub add_update {
    my $c = shift->openapi->valid_input or return;

    my $ticket_id_param = $c->validation->param('ticket_id');
    my $ticket_update   = $c->validation->param('body');
    $ticket_update->{ticket_id} //= $ticket_id_param;

    if ( $ticket_update->{ticket_id} != $ticket_id_param ) {
        return $c->render(
            status  => 400,
            openapi => { error => "Ticket Mismatch" }
        );
    }

    return try {
        my $state = delete $ticket_update->{state};

        # Store update
        my $update = Koha::Ticket::Update->new_from_api($ticket_update)->store;
        $update->discard_changes;

        # Update ticket state if needed
        if ( defined($state) && $state eq 'resolved' ) {
            my $ticket = $update->ticket;
            $ticket->set(
                {
                    resolver_id   => $update->user_id,
                    resolved_date => $update->date
                }
            )->store;
        }

        # Optionally add to message_queue here to notify reporter
        if ( $update->public ) {
            my $notice =
              ( defined($state) && $state eq 'resolved' )
              ? 'TICKET_RESOLVE'
              : 'TICKET_UPDATE';
            my $letter = C4::Letters::GetPreparedLetter(
                module      => 'catalog',
                letter_code => $notice,
                branchcode  => $update->user->branchcode,
                tables      => { ticket_updates => $update->id }
            );

            if ($letter) {
                my $message_id = C4::Letters::EnqueueLetter(
                    {
                        letter                 => $letter,
                        borrowernumber         => $update->ticket->reporter_id,
                        message_transport_type => 'email',
                    }
                );
            }
        }

        # Return
        $c->res->headers->location(
            $c->req->url->to_string . '/' . $update->id );
        return $c->render(
            status  => 201,
            openapi => $update->to_api
        );
    }
    catch {
        $c->unhandled_exception($_);
    };
}

1;





=head2 Internal methods

=head3 to_api_mapping

This method returns the mapping for representing a Koha::Ticket::Update object
on the API.

=cut

sub to_api_mapping {
    return { id => 'update_id', };
}

=head3 _type

=cut




            -
              columnname: stocknumber

    concerns:
      table_concerns:
        default_sort_order: 0
        columns:
            -
              columnname: reported
            -
              columnname: details
            -
              columnname: title
            -
              columnname: status
            -
              columnname: actions
              cannot_be_toggled: 1
              cannot_be_modified: 1

    z3950_search:
      resultst:
        default_sort_order: 1

Lines 48-51 properties: Link Here

(-)a/api/v1/swagger/definitions/ticket.yaml (+5 lines)
48	- "null"	48	- "null"
49	format: date-time	49	format: date-time
50	description: Date the ticket was resolved_date	50	description: Date the ticket was resolved_date
		51	updates_count:
		52	type:
		53	- integer
		54	- "null"
		55	description: Number of updates
51	additionalProperties: false	56	additionalProperties: false




---
type: object
properties:
  update_id:
    type: integer
    description: Internal ticket update identifier
  ticket_id:
    type: integer
    description: Internal ticket identifier
  user:
    type:
      - object
      - "null"
    description: The object representing the patron who added the update
  user_id:
    type: integer
    description: Internal identifier for the patron who added the update
  date:
    type:
      - string
      - "null"
    format: date-time
    description: Date the ticket update was reported
  message:
    type: string
    description: Ticket update details
  public:
    type: boolean
    description: Is this update intended to be sent to the patron
additionalProperties: true




            - reporter
            - resolver
            - biblio
            - updates+count
        collectionFormat: csv
    responses:
      "200":

    x-koha-authorization:
      permissions:
        editcatalogue: edit_catalogue
"/tickets/{ticket_id}/updates":
  get:
    x-mojo-to: Tickets#list_updates
    operationId: listTicketUpdates
    tags:
      - tickets
    summary: List ticket updates
    produces:
      - application/json
    parameters:
      - $ref: "../swagger.yaml#/parameters/ticket_id_pp"
      - $ref: "../swagger.yaml#/parameters/match"
      - $ref: "../swagger.yaml#/parameters/order_by"
      - $ref: "../swagger.yaml#/parameters/page"
      - $ref: "../swagger.yaml#/parameters/per_page"
      - $ref: "../swagger.yaml#/parameters/q_param"
      - $ref: "../swagger.yaml#/parameters/q_body"
      - $ref: "../swagger.yaml#/parameters/q_header"
      - $ref: "../swagger.yaml#/parameters/request_id_header"
      - name: x-koha-embed
        in: header
        required: false
        description: Embed list sent as a request header
        type: array
        items:
          type: string
          enum:
            - user
        collectionFormat: csv
    responses:
      "200":
        description: A list of ticket updates
        schema:
          type: array
          items:
            $ref: "../swagger.yaml#/definitions/ticket_update"
      "403":
        description: Access forbidden
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "404":
        description: Ticket not found
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "500":
        description: |
          Internal server error. Possible `error_code` attribute values:

          * `internal_server_error`
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "503":
        description: Under maintenance
        schema:
          $ref: "../swagger.yaml#/definitions/error"
    x-koha-authorization:
      permissions:
        catalogue: "1"
  post:
    x-mojo-to: Tickets#add_update
    operationId: addTicketUpdate
    tags:
      - tickets
    summary: Add an update to the ticket
    parameters:
      - $ref: "../swagger.yaml#/parameters/ticket_id_pp"
      - name: body
        in: body
        description: A ticket update object
        required: true
        schema:
          $ref: "../swagger.yaml#/definitions/ticket_update"
    produces:
      - application/json
    responses:
      "201":
        description: Ticket added
        schema:
          $ref: "../swagger.yaml#/definitions/ticket_update"
      "401":
        description: Authentication required
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "403":
        description: Access forbidden
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "404":
        description: Ticket not found
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "500":
        description: Internal error
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "503":
        description: Under maintenance
        schema:
          $ref: "../swagger.yaml#/definitions/error"
    x-koha-authorization:
      permissions:
        editcatalogue: edit_catalogue
/public/tickets:
  post:
    x-mojo-to: Tickets#add

Lines 90-95 definitions: Link Here

(-)a/api/v1/swagger/swagger.yaml (+4 lines)
90	$ref: ./definitions/suggestion.yaml	90	$ref: ./definitions/suggestion.yaml
91	ticket:	91	ticket:
92	$ref: ./definitions/ticket.yaml	92	$ref: ./definitions/ticket.yaml
		93	ticket_update:
		94	$ref: ./definitions/ticket_update.yaml
93	transfer_limit:	95	transfer_limit:
94	$ref: ./definitions/transfer_limit.yaml	96	$ref: ./definitions/transfer_limit.yaml
95	vendor:	97	vendor:
Lines 319-324 paths: Link Here
319	$ref: "./paths/tickets.yaml#/~1tickets"	321	$ref: "./paths/tickets.yaml#/~1tickets"
320	"/tickets/{ticket_id}":	322	"/tickets/{ticket_id}":
321	$ref: "./paths/tickets.yaml#/~1tickets~1{ticket_id}"	323	$ref: "./paths/tickets.yaml#/~1tickets~1{ticket_id}"
		324	"/tickets/{ticket_id}/updates":
		325	$ref: "./paths/tickets.yaml#/~1tickets~1{ticket_id}~1updates"
322	/transfer_limits:	326	/transfer_limits:
323	$ref: ./paths/transfer_limits.yaml#/~1transfer_limits	327	$ref: ./paths/transfer_limits.yaml#/~1transfer_limits
324	/transfer_limits/batch:	328	/transfer_limits/batch:




#!/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;




            }
        );
        say $out "Added new notice 'TICKET_ACKNOWLEDGEMENT'";

        $dbh->do(
            q{
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
                VALUES ( 'catalog', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],\r\n\r\nThe library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %].\r\n\r\nThe following comment was left: \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' );
            }
        );
        say $out "Added new notice 'TICKET_UPDATE'";

        $dbh->do(
            q{
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
                VALUES ( 'catalog', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],\r\n\r\nThe library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved.\r\n\r\nThe following comment was left:   \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' );
            }
        );
        say $out "Added new notice 'TICKET_RESOLVE'";
    }
}




            - ""
            - "Thankyou"

        - module: catalog
          code: TICKET_RESOLVE
          branchcode: ""
          name: "Concern resolved"
          is_html: 1
          title: "Catalog concern resolved"
          message_transport_type: email
          lang: default
          content:
            - "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],"
            - ""
            - "The library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved."
            - ""
            - "The following comment was left: "
            - "[% ticket_update.message %]"
            - ""
            - "Thankyou"

        - module: catalog
          code: TICKET_UPDATE
          branchcode: ""
          name: "Concern updated"
          is_html: 1
          title: "Catalog concern updated"
          message_transport_type: email
          lang: default
          content:
            - "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],"
            - ""
            - "The library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %]."
            - ""
            - "The following comment was left: "
            - "[% ticket_update.message %]"
            - ""
            - "Thankyou"

        - module: circulation
          code: ACCOUNT_CREDIT
          branchcode: ""

Lines 3372-3377 label { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+4 lines)
3372	white-space: pre-wrap;	3372	white-space: pre-wrap;
3373	}	3373	}
3374		3374
		3375	.wrapfix {
		3376	white-space: pre-wrap;
		3377	}
		3378
3375	pre {	3379	pre {
3376	background-color: transparent;	3380	background-color: transparent;
3377	border: 0;	3381	border: 0;

Lines 29-35 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc (-1 / +6 lines)
29	</ul>	29	</ul>
30	[% END %]	30	[% END %]
31		31
32	[% IF ( CAN_user_tools_inventory ) %]	32	[% IF ( CAN_user_tools_inventory \|\| ( Koha.Preference('OpacCatalogConcerns') && CAN_user_editcatalogue_edit_catalogue ) ) %]
33	<h5>Reports</h5>	33	<h5>Reports</h5>
34	<ul>	34	<ul>
35	[% IF ( CAN_user_tools_inventory ) %]	35	[% IF ( CAN_user_tools_inventory ) %]
Lines 37-42 Link Here
37	<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a>	37	<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a>
38	</li>	38	</li>
39	[% END %]	39	[% END %]
		40	[% IF Koha.Preference('OpacCatalogConcerns') && CAN_user_editcatalogue_edit_catalogue %]
		41	<li>
		42	<a href="/cgi-bin/koha/cataloguing/concerns.pl">Catalog concerns</a>
		43	</li>
		44	[% END %]
40	</ul>	45	</ul>
41	[% END %]	46	[% END %]
42		47

Lines 91-97 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt (-1 / +7 lines)
91	</ul>	91	</ul>
92	[% END %]	92	[% END %]
93		93
94	[% IF ( CAN_user_tools_inventory ) %]	94	[% IF ( CAN_user_tools_inventory \|\| ( Koha.Preference('OpacCatalogConcerns') && CAN_user_editcatalogue_edit_catalogue ) ) %]
95	<h3>Reports</h3>	95	<h3>Reports</h3>
96	<ul class="buttons-list">	96	<ul class="buttons-list">
97	[% IF ( CAN_user_tools_inventory ) %]	97	[% IF ( CAN_user_tools_inventory ) %]
Lines 99-104 Link Here
99	<a class="circ-button" href="/cgi-bin/koha/tools/inventory.pl"><i class="fa fa-line-chart"></i> Inventory</a>	99	<a class="circ-button" href="/cgi-bin/koha/tools/inventory.pl"><i class="fa fa-line-chart"></i> Inventory</a>
100	</li>	100	</li>
101	[% END %]	101	[% END %]
		102
		103	[% IF ( Koha.Preference('OpacCatalogConcerns') && CAN_user_editcatalogue_edit_catalogue ) %]
		104	<li>
		105	<a class="circ-button" href="/cgi-bin/koha/cataloguing/concerns.pl"><i class="fa fa-list-ul"></i> Catalog concerns</a>
		106	</li>
		107	[% END %]
102	</ul>	108	</ul>
103	[% END %]	109	[% END %]
104		110




[% USE raw %]
[% USE Asset %]
[% SET footerjs = 1 %]
[% USE TablesSettings %]
[% INCLUDE 'doc-head-open.inc' %]
<title>
    Catalog concerns &rsaquo; Tools &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/cataloging-home.pl">Cataloging</a>
            </li>
            <li>
                <a href="#" aria-current="page">
                    Catalog concerns
                </a>
            </li>
        </ol>
    </nav>

    <div class="main container-fluid">
        <div class="row">
            <div class="col-sm-10 col-sm-push-2">
                <main>
                    <h1>Concerns</h1>

                    <div class="page-section">
                        <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">
                            <thead>
                                <tr>
                                    <th>Reported</th>
                                    <th>Details</th>
                                    <th>Title</th>
                                    <th>Status</th>
                                    <th data-class-name="actions noExport">Actions</th>
                                </tr>
                            </thead>
                        </table>
                    </div>
                </main>
            </div> <!-- /.col-sm-10.col-sm-push-2 -->

            <div class="col-sm-2 col-sm-pull-10">
                <aside>
                    [% INCLUDE 'cat-menu.inc' %]
                </aside>
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
        </div> <!-- /.row -->

        <!-- Display updates concern modal -->
        <div class="modal" id="ticketDetailsModal" tabindex="-1" role="dialog" aria-labelledby="ticketDetailsLabel">
            <div class="modal-dialog modal-lg" 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="displayUpdateLabel">Ticket details</h4>
                    </div>
                    <div class="modal-body">
                        <div id="concern-details"></div>
                        <fieldset class="rows">
                            <ol>
                                <li>
                                    <label for="message">Update: </label>
                                    <textarea id="update_message" name="message"></textarea>
                                </li>
                                <li>
                                    <label for="public">Notify: </label>
                                    <input type="checkbox" name="public" id="public">
                                </li>
                            </ol>
                        </fieldset>
                    </div> <!-- /.modal-body -->
                    <div class="modal-footer">
                        <input type="hidden" name="ticket_id" id="ticket_id">
                        <button type="button" class="btn btn-default" id="resolveTicket">Resolve</button>
                        <button type="submit" class="btn btn-primary" id="updateTicket">Comment</button>
                    </div> <!-- /.modal-footer -->
                </div> <!-- /.modal-content -->
            </div> <!-- /.modal-dialog -->
        </div> <!-- /#displayUpdateModal -->

[% 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 table_settings = [% TablesSettings.GetTableSettings('cataloguing', 'concerns', 'table_concerns', 'json') | $raw %];

            var tickets_url = '/api/v1/tickets';
            var tickets = $("#table_concerns").kohaTable({
                "ajax": {
                    "url": tickets_url
                },
                "embed": [
                    "reporter",
                    "resolver",
                    "biblio",
                    "updates+count",
                ],
                '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": "title:body",
                        "render": function(data, type, row, meta) {
                            let result = '<a role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '">' + row.title + '</a>';
                            if (row.updates_count) {
                                result += '<span class="pull-right"><a role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>';
                            }
                            result += '<div id="detail_' + row.ticket_id + '" class="hidden">' + row.body + '</div>';
                            return result;
                        },
                        "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",
                        "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 = '<a class="btn btn-default btn-xs" role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '"><i class="fa fa-eye" aria-hidden="true"></i> ' + _("Details") + '</a>';
                            return result;
                        },
                        "searchable": false,
                        "orderable": false
                    },
                ]
            }, table_settings, 1);

            $('#hideResolved').on("click", function() {
                // It would be great if we could pass null here but it gets stringified
                tickets.DataTable().columns('3').search('special:undefined').draw();
            });

            $('#showAll').on("click", function() {
                tickets.DataTable().columns('3').search('').draw();
            });

            $('#ticketDetailsModal').on('show.bs.modal', function(event) {
                let modal = $(this);
                let button = $(event.relatedTarget);
                let ticket_id = button.data('concern');
                modal.find('.modal-footer input').val(ticket_id);

                let detail = $('#detail_' + ticket_id).text();

                let display = '<div class="list-group">';
                display += '<div class="list-group-item">';
                display += '<span class="wrapfix">' + detail + '</span>';
                display += '</div>';
                display += '<div id="concern-updates" class="list-group-item">';
                display += '<span>Loading updates . . .</span>';
                display += '</div>';
                display += '</div>';

                let details = modal.find('#concern-details');
                details.html(display);

                $.ajax({
                    url: "/api/v1/tickets/" + ticket_id + "/updates",
                    method: "GET",
                    headers: {
                        "x-koha-embed": "user"
                    },
                }).success(function(data) {
                    let updates_display = $('#concern-updates');
                    let updates = '';
                    data.forEach(function(item, index) {
                        updates += '<div class="list-group-item">';
                        updates += '<span class="wrapfix">' + item.message + '</span>';
                        updates += '<span class="clearfix">' + $patron_to_html(item.user, {
                            display_cardnumber: false,
                            url: true
                        }) + ' (' + $datetime(item.date) + ')</span>';
                        updates += '</div>';
                    });
                    updates_display.html(updates);
                }).error(function() {

                });
            });

            $('#ticketDetailsModal').on('click', '#updateTicket', function(e) {
                let ticket_id = $('#ticket_id').val();
                let params = {
                    'public': $('#public').is(":checked"),
                    message: $('#update_message').val(),
                    user_id: logged_in_user_borrowernumber
                };

                $.ajax({
                    url: "/api/v1/tickets/" + ticket_id + "/updates",
                    method: "POST",
                    data: JSON.stringify(params),
                    ontentType: "application/json; charset=utf-8"
                }).success(function() {
                    $("#ticketDetailsModal").modal('hide');
                    tickets.DataTable().ajax.reload(function(data) {
                        $("#concern_action_result_dialog").hide();
                        $("#concern_delete_success").html(_("Concern #%s updated successfully.").format(ticket_id)).show();
                    });
                }).error(function() {
                    $("#concern_update_error").html(_("Error resolving concern #%s. Check the logs.").format(ticket_id)).show();
                });
            });

            $('#ticketDetailsModal').on('click', '#resolveTicket', function(e) {
                let ticket_id = $('#ticket_id').val();
                let params = {
                    'public': $('#public').is(":checked"),
                    message: $('#update_message').val(),
                    user_id: logged_in_user_borrowernumber,
                    state: 'resolved'
                };

                $.ajax({
                    url: "/api/v1/tickets/" + ticket_id + "/updates",
                    method: "POST",
                    data: JSON.stringify(params),
                    ontentType: "application/json; charset=utf-8"
                }).success(function() {
                    $("#ticketDetailsModal").modal('hide');
                    tickets.DataTable().ajax.reload(function(data) {
                        $("#concern_action_result_dialog").hide();
                        $("#concern_delete_success").html(_("Concern #%s updated successfully.").format(ticket_id)).show();
                    });
                }).error(function() {
                    $("#concern_update_error").html(_("Error resolving concern #%s. Check the logs.").format(ticket_id)).show();
                });
            });

        });
    </script>
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]

Lines 177-183 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-1 / +8 lines)
177	<div class="row">	177	<div class="row">
178	<div class="col-sm-12">	178	<div class="col-sm-12">
179	[%# Following statement must be in one line for translatability %]	179	[%# Following statement must be in one line for translatability %]
180	[% IF ( CAN_user_tools_moderate_comments && pendingcomments ) \|\| ( CAN_user_tools_moderate_tags && pendingtags ) \|\| ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) \|\| ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions \|\| all_pendingsuggestions )) \|\| ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) \|\| pending_article_requests \|\| ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) \|\| ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) \|\| already_ran_jobs \|\| new_curbside_pickups.count %]	180	[% IF ( CAN_user_tools_moderate_comments && pendingcomments ) \|\| ( CAN_user_tools_moderate_tags && pendingtags ) \|\| ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) \|\| ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions \|\| all_pendingsuggestions )) \|\| ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) \|\| pending_article_requests \|\| ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) \|\| ( Koha.preference('OpacCatalogConcerns') && pending_biblio_tickets && CAN_user_editcatalogue_edit_catalogue ) \|\| ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) \|\| already_ran_jobs \|\| new_curbside_pickups.count %]
181	<div id="area-pending" class="page-section">	181	<div id="area-pending" class="page-section">
182	[% IF pending_article_requests %]	182	[% IF pending_article_requests %]
183	<div class="pending-info" id="article_requests_pending">	183	<div class="pending-info" id="article_requests_pending">
Lines 232-237 Link Here
232	</div>	232	</div>
233	[% END %]	233	[% END %]
234		234
		235	[% IF ( Koha.Preference('OpacCatalogConcerns') && CAN_user_editcatalogue_edit_catalogue ) %]
		236	<div class="pending-info" id="catalog_concerns_pending">
		237	<a href="/cgi-bin/koha/cataloguing/concerns.pl">Catalog concerns pending</a>:
		238	<span class="pending-number-link">[% pending_biblio_tickets \| html %]</span>
		239	</div>
		240	[% END %]
		241
235	[% IF Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count %]	242	[% IF Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count %]
236	<div class="pending-info" id="checkout_notes_pending">	243	<div class="pending-info" id="checkout_notes_pending">
237	<a href="/cgi-bin/koha/circ/checkout-notes.pl">Checkout notes pending</a>:	244	<a href="/cgi-bin/koha/circ/checkout-notes.pl">Checkout notes pending</a>:




                                        var part = {};
                                        var attr = attributes[i];
                                        let criteria = options.criteria;
                                        if ( value === 'special:undefined' ) {
                                            value = null;
                                            criteria = "exact";
                                        }
                                        if ( value !== null ) {
                                            if ( value.match(/^\^(.*)\$$/) ) {
                                                value = value.replace(/^\^/, '').replace(/\$$/, '');
                                                criteria = "exact";
                                            } else {
                                                // escape SQL LIKE special characters %
                                                value = value.replace(/(\%|\\)/g, "\\$1");
                                            }
                                        }
                                        part[!attr.includes('.')?'me.'+attr:attr] = criteria === 'exact'
                                            ? value




use Koha::Suggestions;
use Koha::BackgroundJobs;
use Koha::CurbsidePickups;
use Koha::Tickets;

my $query = CGI->new;


)->count;
my $pending_problem_reports = Koha::ProblemReports->search({ status => 'New' });

if ( C4::Context->preference('OpacCatalogConcerns') ) {
    my $pending_biblio_tickets = Koha::Tickets->search(
        {
            resolved_date => undef,
            biblio_id     => { '!=' => undef }
        }
    );
    $template->param(
        pending_biblio_tickets => $pending_biblio_tickets->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;
- 

Return to bug 31028

Lines 57-62 sub user { Link Here

(-)a/Koha/Ticket/Update.pm (+11 lines)
57		57
58	=head2 Internal methods	58	=head2 Internal methods
59		59
		60	=head3 to_api_mapping
		61
		62	This method returns the mapping for representing a Koha::Ticket::Update object
		63	on the API.
		64
		65	=cut
		66
		67	sub to_api_mapping {
		68	return { id => 'update_id', };
		69	}
		70
60	=head3 _type	71	=head3 _type
61		72
62	=cut	73	=cut

Lines 633-638 modules: Link Here

(-)a/admin/columns_settings.yml (+17 lines)
633	-	633	-
634	columnname: stocknumber	634	columnname: stocknumber
635		635
		636	concerns:
		637	table_concerns:
		638	default_sort_order: 0
		639	columns:
		640	-
		641	columnname: reported
		642	-
		643	columnname: details
		644	-
		645	columnname: title
		646	-
		647	columnname: status
		648	-
		649	columnname: actions
		650	cannot_be_toggled: 1
		651	cannot_be_modified: 1
		652
636	z3950_search:	653	z3950_search:
637	resultst:	654	resultst:
638	default_sort_order: 1	655	default_sort_order: 1

Lines 590-601 jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-5 / +11 lines)
590	var part = {};	590	var part = {};
591	var attr = attributes[i];	591	var attr = attributes[i];
592	let criteria = options.criteria;	592	let criteria = options.criteria;
593	if ( value.match(/^\^(.*)\$$/) ) {	593	if ( value === 'special:undefined' ) {
594	value = value.replace(/^\^/, '').replace(/\$$/, '');	594	value = null;
595	criteria = "exact";	595	criteria = "exact";
596	} else {	596	}
597	// escape SQL LIKE special characters % and _	597	if ( value !== null ) {
598	value = value.replace(/(\%\|\\)/g, "\\$1");	598	if ( value.match(/^\^(.*)\$$/) ) {
		599	value = value.replace(/^\^/, '').replace(/\$$/, '');
		600	criteria = "exact";
		601	} else {
		602	// escape SQL LIKE special characters %
		603	value = value.replace(/(\%\|\\)/g, "\\$1");
		604	}
599	}	605	}
600	part[!attr.includes('.')?'me.'+attr:attr] = criteria === 'exact'	606	part[!attr.includes('.')?'me.'+attr:attr] = criteria === 'exact'
601	? value	607	? value

Lines 147-150 sub delete { Link Here

(-)a/Koha/REST/V1/Tickets.pm (+98 lines)
147	};	147	};
148	}	148	}
149		149
		150	=head3 list_updates
		151
		152	=cut
		153
		154	sub list_updates {
		155	my $c = shift->openapi->valid_input or return;
		156
		157	return try {
		158	my $ticket = Koha::Tickets->find( $c->validation->param('ticket_id') );
		159	unless ($ticket) {
		160	return $c->render(
		161	status => 404,
		162	openapi => { error => "Ticket not found" }
		163	);
		164	}
		165
		166	my $updates_set = $ticket->updates;
		167	my $updates = $c->objects->search($updates_set);
		168	return $c->render( status => 200, openapi => $updates );
		169	}
		170	catch {
		171	$c->unhandled_exception($_);
		172	};
		173	}
		174
		175	=head3 add_update
		176
		177	=cut
		178
		179	sub add_update {
		180	my $c = shift->openapi->valid_input or return;
		181
		182	my $ticket_id_param = $c->validation->param('ticket_id');
		183	my $ticket_update = $c->validation->param('body');
		184	$ticket_update->{ticket_id} //= $ticket_id_param;
		185
		186	if ( $ticket_update->{ticket_id} != $ticket_id_param ) {
		187	return $c->render(
		188	status => 400,
		189	openapi => { error => "Ticket Mismatch" }
		190	);
		191	}
		192
		193	return try {
		194	my $state = delete $ticket_update->{state};
		195
		196	# Store update
		197	my $update = Koha::Ticket::Update->new_from_api($ticket_update)->store;
		198	$update->discard_changes;
		199
		200	# Update ticket state if needed
		201	if ( defined($state) && $state eq 'resolved' ) {
		202	my $ticket = $update->ticket;
		203	$ticket->set(
		204	{
		205	resolver_id => $update->user_id,
		206	resolved_date => $update->date
		207	}
		208	)->store;
		209	}
		210
		211	# Optionally add to message_queue here to notify reporter
		212	if ( $update->public ) {
		213	my $notice =
214	( defined($state) && $state eq 'resolved' )
215	? 'TICKET_RESOLVE'
216	: 'TICKET_UPDATE';
217	my $letter = C4::Letters::GetPreparedLetter(
218	module => 'catalog',
219	letter_code => $notice,
220	branchcode => $update->user->branchcode,
221	tables => { ticket_updates => $update->id }
222	);
223
224	if ($letter) {
225	my $message_id = C4::Letters::EnqueueLetter(
226	{
227	letter => $letter,
228	borrowernumber => $update->ticket->reporter_id,
229	message_transport_type => 'email',
230	}
231	);
232	}
233	}
234
235	# Return
236	$c->res->headers->location(
237	$c->req->url->to_string . '/' . $update->id );
238	return $c->render(
239	status => 201,
240	openapi => $update->to_api
241	);
242	}
243	catch {
244	$c->unhandled_exception($_);
245	};
246	}
247
150	1;	248	1;

Line 0 Link Here

(-)a/api/v1/swagger/definitions/ticket_update.yaml (+30 lines)
	1	---
	2	type: object
	3	properties:
	4	update_id:
	5	type: integer
	6	description: Internal ticket update identifier
	7	ticket_id:
	8	type: integer
	9	description: Internal ticket identifier
	10	user:
	11	type:
	12	- object
	13	- "null"
	14	description: The object representing the patron who added the update
	15	user_id:
	16	type: integer
	17	description: Internal identifier for the patron who added the update
	18	date:
	19	type:
	20	- string
	21	- "null"
	22	format: date-time
	23	description: Date the ticket update was reported
	24	message:
	25	type: string
	26	description: Ticket update details
	27	public:
	28	type: boolean
	29	description: Is this update intended to be sent to the patron
	30	additionalProperties: true

Lines 28-33 Link Here

(-)a/api/v1/swagger/paths/tickets.yaml (+103 lines)
28	- reporter	28	- reporter
29	- resolver	29	- resolver
30	- biblio	30	- biblio
		31	- updates+count
31	collectionFormat: csv	32	collectionFormat: csv
32	responses:	33	responses:
33	"200":	34	"200":
Lines 210-215 Link Here
210	x-koha-authorization:	211	x-koha-authorization:
211	permissions:	212	permissions:
212	editcatalogue: edit_catalogue	213	editcatalogue: edit_catalogue
		214	"/tickets/{ticket_id}/updates":
		215	get:
		216	x-mojo-to: Tickets#list_updates
		217	operationId: listTicketUpdates
		218	tags:
		219	- tickets
		220	summary: List ticket updates
		221	produces:
		222	- application/json
		223	parameters:
		224	- $ref: "../swagger.yaml#/parameters/ticket_id_pp"
		225	- $ref: "../swagger.yaml#/parameters/match"
		226	- $ref: "../swagger.yaml#/parameters/order_by"
		227	- $ref: "../swagger.yaml#/parameters/page"
		228	- $ref: "../swagger.yaml#/parameters/per_page"
		229	- $ref: "../swagger.yaml#/parameters/q_param"
		230	- $ref: "../swagger.yaml#/parameters/q_body"
		231	- $ref: "../swagger.yaml#/parameters/q_header"
		232	- $ref: "../swagger.yaml#/parameters/request_id_header"
		233	- name: x-koha-embed
		234	in: header
		235	required: false
		236	description: Embed list sent as a request header
		237	type: array
		238	items:
		239	type: string
		240	enum:
		241	- user
		242	collectionFormat: csv
		243	responses:
		244	"200":
		245	description: A list of ticket updates
		246	schema:
		247	type: array
		248	items:
		249	$ref: "../swagger.yaml#/definitions/ticket_update"
		250	"403":
		251	description: Access forbidden
		252	schema:
		253	$ref: "../swagger.yaml#/definitions/error"
		254	"404":
		255	description: Ticket not found
		256	schema:
		257	$ref: "../swagger.yaml#/definitions/error"
		258	"500":
		259	description: \|
		260	Internal server error. Possible `error_code` attribute values:
		261
		262	* `internal_server_error`
		263	schema:
		264	$ref: "../swagger.yaml#/definitions/error"
		265	"503":
		266	description: Under maintenance
		267	schema:
		268	$ref: "../swagger.yaml#/definitions/error"
		269	x-koha-authorization:
		270	permissions:
		271	catalogue: "1"
		272	post:
		273	x-mojo-to: Tickets#add_update
		274	operationId: addTicketUpdate
		275	tags:
		276	- tickets
		277	summary: Add an update to the ticket
278	parameters:
279	- $ref: "../swagger.yaml#/parameters/ticket_id_pp"
280	- name: body
281	in: body
282	description: A ticket update object
283	required: true
284	schema:
285	$ref: "../swagger.yaml#/definitions/ticket_update"
286	produces:
287	- application/json
288	responses:
289	"201":
290	description: Ticket added
291	schema:
292	$ref: "../swagger.yaml#/definitions/ticket_update"
293	"401":
294	description: Authentication required
295	schema:
296	$ref: "../swagger.yaml#/definitions/error"
297	"403":
298	description: Access forbidden
299	schema:
300	$ref: "../swagger.yaml#/definitions/error"
301	"404":
302	description: Ticket not found
303	schema:
304	$ref: "../swagger.yaml#/definitions/error"
305	"500":
306	description: Internal error
307	schema:
308	$ref: "../swagger.yaml#/definitions/error"
309	"503":
310	description: Under maintenance
311	schema:
312	$ref: "../swagger.yaml#/definitions/error"
313	x-koha-authorization:
314	permissions:
315	editcatalogue: edit_catalogue
213	/public/tickets:	316	/public/tickets:
214	post:	317	post:
215	x-mojo-to: Tickets#add	318	x-mojo-to: Tickets#add

Line 0 Link Here

(-)a/cataloguing/concerns.pl (+37 lines)
	1	#!/usr/bin/perl
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it
	6	# under the terms of the GNU General Public License as published by
	7	# the Free Software Foundation; either version 3 of the License, or
	8	# (at your option) any later version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but
	11	# WITHOUT ANY WARRANTY; without even the implied warranty of
	12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	# GNU General Public License for more details.
	14	#
	15	# You should have received a copy of the GNU General Public License
	16	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	17
	18	use Modern::Perl;
	19
	20	use CGI qw ( -utf8 );
	21	use C4::Context;
	22	use C4::Auth qw( get_template_and_user );
	23	use C4::Output qw( output_html_with_http_headers );
	24
	25	my $query = CGI->new;
	26	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
	27	{
	28	template_name => "cataloguing/concerns.tt",
	29	query => $query,
	30	type => "intranet",
	31	flagsrequired => { cataloguing => '*' },
	32	}
	33	);
	34
	35	output_html_with_http_headers $query, $cookie, $template->output;
	36
	37	1;

Lines 93-97 return { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_31028.pl (+16 lines)
93	}	93	}
94	);	94	);
95	say $out "Added new notice 'TICKET_ACKNOWLEDGEMENT'";	95	say $out "Added new notice 'TICKET_ACKNOWLEDGEMENT'";
		96
		97	$dbh->do(
		98	q{
		99	INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
		100	VALUES ( 'catalog', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],\r\n\r\nThe library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %].\r\n\r\nThe following comment was left: \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' );
		101	}
		102	);
		103	say $out "Added new notice 'TICKET_UPDATE'";
		104
		105	$dbh->do(
		106	q{
		107	INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
		108	VALUES ( 'catalog', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],\r\n\r\nThe library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved.\r\n\r\nThe following comment was left: \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' );
		109	}
		110	);
		111	say $out "Added new notice 'TICKET_RESOLVE'";
96	}	112	}
97	}	113	}

Lines 61-66 tables: Link Here

(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (+36 lines)
61	- ""	61	- ""
62	- "Thankyou"	62	- "Thankyou"
63		63
		64	- module: catalog
		65	code: TICKET_RESOLVE
		66	branchcode: ""
		67	name: "Concern resolved"
		68	is_html: 1
		69	title: "Catalog concern resolved"
		70	message_transport_type: email
		71	lang: default
		72	content:
		73	- "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],"
		74	- ""
		75	- "The library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved."
		76	- ""
		77	- "The following comment was left: "
		78	- "[% ticket_update.message %]"
		79	- ""
		80	- "Thankyou"
		81
		82	- module: catalog
		83	code: TICKET_UPDATE
		84	branchcode: ""
		85	name: "Concern updated"
		86	is_html: 1
		87	title: "Catalog concern updated"
		88	message_transport_type: email
		89	lang: default
		90	content:
		91	- "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],"
		92	- ""
		93	- "The library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %]."
		94	- ""
		95	- "The following comment was left: "
		96	- "[% ticket_update.message %]"
		97	- ""
		98	- "Thankyou"
		99
64	- module: circulation	100	- module: circulation
65	code: ACCOUNT_CREDIT	101	code: ACCOUNT_CREDIT
66	branchcode: ""	102	branchcode: ""

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt (+306 lines)
		1	[% USE raw %]
		2	[% USE Asset %]
		3	[% SET footerjs = 1 %]
		4	[% USE TablesSettings %]
		5	[% INCLUDE 'doc-head-open.inc' %]
		6	<title>
		7	Catalog concerns &rsaquo; Tools &rsaquo; Koha
		8	</title>
		9	[% INCLUDE 'doc-head-close.inc' %]
		10	</head>
		11
		12	<body id="cat_concerns" class="cat">
		13	[% INCLUDE 'header.inc' %]
		14	[% INCLUDE 'cataloging-search.inc' %]
		15
		16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
		17	<ol>
		18	<li>
		19	<a href="/cgi-bin/koha/mainpage.pl">Home</a>
		20	</li>
		21	<li>
		22	<a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a>
		23	</li>
		24	<li>
		25	<a href="#" aria-current="page">
		26	Catalog concerns
		27	</a>
		28	</li>
		29	</ol>
		30	</nav>
		31
		32	<div class="main container-fluid">
		33	<div class="row">
		34	<div class="col-sm-10 col-sm-push-2">
		35	<main>
		36	<h1>Concerns</h1>
		37
		38	<div class="page-section">
		39	<fieldset class="action" style="cursor:pointer;">
		40	<a id="hideResolved"><i class="fa fa-minus-square"></i> Hide resolved</a>
		41	\| <a id="showAll"><i class="fa fa-bars"></i> Show all</a>
		42	</fieldset>
		43
		44	<table id="table_concerns">
		45	<thead>
		46	<tr>
		47	<th>Reported</th>
		48	<th>Details</th>
		49	<th>Title</th>
		50	<th>Status</th>
		51	<th data-class-name="actions noExport">Actions</th>
		52	</tr>
		53	</thead>
		54	</table>
		55	</div>
		56	</main>
		57	</div> <!-- /.col-sm-10.col-sm-push-2 -->
		58
		59	<div class="col-sm-2 col-sm-pull-10">
		60	<aside>
		61	[% INCLUDE 'cat-menu.inc' %]
		62	</aside>
		63	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
		64	</div> <!-- /.row -->
65
66	<!-- Display updates concern modal -->
67	<div class="modal" id="ticketDetailsModal" tabindex="-1" role="dialog" aria-labelledby="ticketDetailsLabel">
68	<div class="modal-dialog modal-lg" role="document">
69	<div class="modal-content">
70	<div class="modal-header">
71	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
72	<h4 class="modal-title" id="displayUpdateLabel">Ticket details</h4>
73	</div>
74	<div class="modal-body">
75	<div id="concern-details"></div>
76	<fieldset class="rows">
77	<ol>
78	<li>
79	<label for="message">Update: </label>
80	<textarea id="update_message" name="message"></textarea>
81	</li>
82	<li>
83	<label for="public">Notify: </label>
84	<input type="checkbox" name="public" id="public">
85	</li>
86	</ol>
87	</fieldset>
88	</div> <!-- /.modal-body -->
89	<div class="modal-footer">
90	<input type="hidden" name="ticket_id" id="ticket_id">
91	<button type="button" class="btn btn-default" id="resolveTicket">Resolve</button>
92	<button type="submit" class="btn btn-primary" id="updateTicket">Comment</button>
93	</div> <!-- /.modal-footer -->
94	</div> <!-- /.modal-content -->
95	</div> <!-- /.modal-dialog -->
96	</div> <!-- /#displayUpdateModal -->
97
98	[% MACRO jsinclude BLOCK %]
99	[% INCLUDE 'datatables.inc' %]
100	[% INCLUDE 'columns_settings.inc' %]
101	[% INCLUDE 'js-date-format.inc' %]
102	[% INCLUDE 'js-patron-format.inc' %]
103	[% INCLUDE 'js-biblio-format.inc' %]
104	<script>
105	$(document).ready(function() {
106
107	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
108
109	var table_settings = [% TablesSettings.GetTableSettings('cataloguing', 'concerns', 'table_concerns', 'json') \| $raw %];
110
111	var tickets_url = '/api/v1/tickets';
112	var tickets = $("#table_concerns").kohaTable({
113	"ajax": {
114	"url": tickets_url
115	},
116	"embed": [
117	"reporter",
118	"resolver",
119	"biblio",
120	"updates+count",
121	],
122	'emptyTable': '<div class="dialog message">' + _("Congradulations, there are no catalog concerns.") + '</div>',
123	"columnDefs": [{
124	"targets": [0, 1, 2, 3],
125	"render": function(data, type, row, meta) {
126	if (type == 'display') {
127	if (data != null) {
128	return data.escapeHtml();
129	} else {
130	return "";
131	}
132	}
133	return data;
134	}
135	}],
136	"columns": [{
137	"data": "reported_date:reporter.firstname",
138	"render": function(data, type, row, meta) {
139	let reported = '<span class="date clearfix">' + $datetime(row.reported_date) + '</span>';
140	reported += '<span class="reporter clearfix">' + $patron_to_html(row.reporter, {
141	display_cardnumber: false,
142	url: true
143	}) + '</span>';
144	return reported;
145	},
146	"searchable": true,
147	"orderable": true
148	},
149	{
150	"data": "title:body",
151	"render": function(data, type, row, meta) {
152	let result = '<a role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '">' + row.title + '</a>';
153	if (row.updates_count) {
154	result += '<span class="pull-right"><a role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>';
155	}
156	result += '<div id="detail_' + row.ticket_id + '" class="hidden">' + row.body + '</div>';
157	return result;
158	},
159	"searchable": true,
160	"orderable": true
161	},
162	{
163	"data": "biblio.title",
164	"render": function(data, type, row, meta) {
165	return $biblio_to_html(row.biblio, {
166	link: 1
167	});
168	},
169	"searchable": true,
170	"orderable": true
171	},
172	{
173	"data": "resolved_date",
174	"render": function(data, type, row, meta) {
175	let result = '';
176	if (row.resolved_date) {
177	result += _("Resolved by:") + ' <span>' + $patron_to_html(row.resolver, {
178	display_cardnumber: false,
179	url: true
180	}) + '</span>';
181	result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>';
182	} else {
183	result += _("Open");
184	}
185	return result;
186	},
187	"searchable": true,
188	"orderable": true
189	},
190	{
191	"data": function(row, type, val, meta) {
192	let result = '<a class="btn btn-default btn-xs" role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '"><i class="fa fa-eye" aria-hidden="true"></i> ' + _("Details") + '</a>';
193	return result;
194	},
195	"searchable": false,
196	"orderable": false
197	},
198	]
199	}, table_settings, 1);
200
201	$('#hideResolved').on("click", function() {
202	// It would be great if we could pass null here but it gets stringified
203	tickets.DataTable().columns('3').search('special:undefined').draw();
204	});
205
206	$('#showAll').on("click", function() {
207	tickets.DataTable().columns('3').search('').draw();
208	});
209
210	$('#ticketDetailsModal').on('show.bs.modal', function(event) {
211	let modal = $(this);
212	let button = $(event.relatedTarget);
213	let ticket_id = button.data('concern');
214	modal.find('.modal-footer input').val(ticket_id);
215
216	let detail = $('#detail_' + ticket_id).text();
217
218	let display = '<div class="list-group">';
219	display += '<div class="list-group-item">';
220	display += '<span class="wrapfix">' + detail + '</span>';
221	display += '</div>';
222	display += '<div id="concern-updates" class="list-group-item">';
223	display += '<span>Loading updates . . .</span>';
224	display += '</div>';
225	display += '</div>';
226
227	let details = modal.find('#concern-details');
228	details.html(display);
229
230	$.ajax({
231	url: "/api/v1/tickets/" + ticket_id + "/updates",
232	method: "GET",
233	headers: {
234	"x-koha-embed": "user"
235	},
236	}).success(function(data) {
237	let updates_display = $('#concern-updates');
238	let updates = '';
239	data.forEach(function(item, index) {
240	updates += '<div class="list-group-item">';
241	updates += '<span class="wrapfix">' + item.message + '</span>';
242	updates += '<span class="clearfix">' + $patron_to_html(item.user, {
243	display_cardnumber: false,
244	url: true
245	}) + ' (' + $datetime(item.date) + ')</span>';
246	updates += '</div>';
247	});
248	updates_display.html(updates);
249	}).error(function() {
250
251	});
252	});
253
254	$('#ticketDetailsModal').on('click', '#updateTicket', function(e) {
255	let ticket_id = $('#ticket_id').val();
256	let params = {
257	'public': $('#public').is(":checked"),
258	message: $('#update_message').val(),
259	user_id: logged_in_user_borrowernumber
260	};
261
262	$.ajax({
263	url: "/api/v1/tickets/" + ticket_id + "/updates",
264	method: "POST",
265	data: JSON.stringify(params),
266	ontentType: "application/json; charset=utf-8"
267	}).success(function() {
268	$("#ticketDetailsModal").modal('hide');
269	tickets.DataTable().ajax.reload(function(data) {
270	$("#concern_action_result_dialog").hide();
271	$("#concern_delete_success").html(_("Concern #%s updated successfully.").format(ticket_id)).show();
272	});
273	}).error(function() {
274	$("#concern_update_error").html(_("Error resolving concern #%s. Check the logs.").format(ticket_id)).show();
275	});
276	});
277
278	$('#ticketDetailsModal').on('click', '#resolveTicket', function(e) {
279	let ticket_id = $('#ticket_id').val();
280	let params = {
281	'public': $('#public').is(":checked"),
282	message: $('#update_message').val(),
283	user_id: logged_in_user_borrowernumber,
284	state: 'resolved'
285	};
286
287	$.ajax({
288	url: "/api/v1/tickets/" + ticket_id + "/updates",
289	method: "POST",
290	data: JSON.stringify(params),
291	ontentType: "application/json; charset=utf-8"
292	}).success(function() {
293	$("#ticketDetailsModal").modal('hide');
294	tickets.DataTable().ajax.reload(function(data) {
295	$("#concern_action_result_dialog").hide();
296	$("#concern_delete_success").html(_("Concern #%s updated successfully.").format(ticket_id)).show();
297	});
298	}).error(function() {
299	$("#concern_update_error").html(_("Error resolving concern #%s. Check the logs.").format(ticket_id)).show();
300	});
301	});
302
303	});
304	</script>
305	[% END %]
306	[% INCLUDE 'intranet-bottom.inc' %]

Lines 35-40 use Koha::Quotes; Link Here

(-)a/mainpage.pl (-1 / +12 lines)
35	use Koha::Suggestions;	35	use Koha::Suggestions;
36	use Koha::BackgroundJobs;	36	use Koha::BackgroundJobs;
37	use Koha::CurbsidePickups;	37	use Koha::CurbsidePickups;
		38	use Koha::Tickets;
38		39
39	my $query = CGI->new;	40	my $query = CGI->new;
40		41
Lines 103-108 my $pending_article_requests = Koha::ArticleRequests->search_limited( Link Here
103	)->count;	104	)->count;
104	my $pending_problem_reports = Koha::ProblemReports->search({ status => 'New' });	105	my $pending_problem_reports = Koha::ProblemReports->search({ status => 'New' });
105		106
		107	if ( C4::Context->preference('OpacCatalogConcerns') ) {
		108	my $pending_biblio_tickets = Koha::Tickets->search(
		109	{
		110	resolved_date => undef,
		111	biblio_id => { '!=' => undef }
		112	}
		113	);
		114	$template->param(
		115	pending_biblio_tickets => $pending_biblio_tickets->count );
		116	}
		117
106	unless ( $logged_in_user->has_permission( { parameters => 'manage_background_jobs' } ) ) {	118	unless ( $logged_in_user->has_permission( { parameters => 'manage_background_jobs' } ) ) {
107	my $already_ran_jobs = Koha::BackgroundJobs->search(	119	my $already_ran_jobs = Koha::BackgroundJobs->search(
108	{ borrowernumber => $logged_in_user->borrowernumber } )->count ? 1 : 0;	120	{ borrowernumber => $logged_in_user->borrowernumber } )->count ? 1 : 0;
109	-