Attachment #59480 for bug #17698

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

Lines 112-117 __PACKAGE__->table("issues"); Link Here

(-)a/Koha/Schema/Result/Issue.pm (-2 / +9 lines)
112	datetime_undef_if_invalid: 1	112	datetime_undef_if_invalid: 1
113	is_nullable: 1	113	is_nullable: 1
114		114
		115	=head2 noteseen
		116
		117	data_type: 'integer'
		118	is_nullable: 1
		119
115	=cut	120	=cut
116		121
117	__PACKAGE__->add_columns(	122	__PACKAGE__->add_columns(
Lines 170-175 __PACKAGE__->add_columns( Link Here
170	datetime_undef_if_invalid => 1,	175	datetime_undef_if_invalid => 1,
171	is_nullable => 1,	176	is_nullable => 1,
172	},	177	},
		178	"noteseen",
		179	{ data_type => "integer", is_nullable => 1 },
173	);	180	);
174		181
175	=head1 PRIMARY KEY	182	=head1 PRIMARY KEY
Lines 241-248 __PACKAGE__->belongs_to( Link Here
241	);	248	);
242		249
243		250
244	# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-12-01 02:20:55	251	# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-12-12 02:41:09
245	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:a7FCuypwxtuE6oJjEnRJRg	252	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZF/YAX9BT1WrgCLUsXSqXQ
246		253
247	__PACKAGE__->belongs_to(	254	__PACKAGE__->belongs_to(
248	"borrower",	255	"borrower",

Lines 22-27 use C4::Auth; Link Here

(-)a/circ/circulation-home.pl (+3 lines)
22	use C4::Output;	22	use C4::Output;
23	use C4::Context;	23	use C4::Context;
24	use Koha::BiblioFrameworks;	24	use Koha::BiblioFrameworks;
		25	use Koha::Checkouts;
25		26
26	my $query = new CGI;	27	my $query = new CGI;
27	my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user(	28	my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user(
Lines 41-45 $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ) Link Here
41	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );	42	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
42	$template->{'VARS'}->{'AllowOfflineCirculation'} = C4::Context->preference('AllowOfflineCirculation');	43	$template->{'VARS'}->{'AllowOfflineCirculation'} = C4::Context->preference('AllowOfflineCirculation');
43		44
		45	my $pendingissuenotes = Koha::Checkouts->search({ noteseen => 0 })->count;
		46	$template->param( pendingissuenotes => $pendingissuenotes );
44		47
45	output_html_with_http_headers $query, $cookie, $template->output;	48	output_html_with_http_headers $query, $cookie, $template->output;

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug-17698_add-noteseen-column-to-issues.sql (+2 lines)
	1	ALTER IGNORE TABLE issues ADD `noteseen` int(1) default NULL;
	2	ALTER IGNORE TABLE old_issues ADD `noteseen` int(1) default NULL;

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug-17698_add-permission-to-manage-issue-notes.sql (+1 lines)
	1	INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'manage_issue_notes', 'Mark issue notes as seen/not seen');

Lines 1778-1783 CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r Link Here

(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
1778	`onsite_checkout` int(1) NOT NULL default 0, -- in house use flag	1778	`onsite_checkout` int(1) NOT NULL default 0, -- in house use flag
1779	`note` mediumtext default NULL, -- issue note text	1779	`note` mediumtext default NULL, -- issue note text
1780	`notedate` datetime default NULL, -- datetime of issue note (yyyy-mm-dd hh:mm::ss)	1780	`notedate` datetime default NULL, -- datetime of issue note (yyyy-mm-dd hh:mm::ss)
		1781	`noteseen` int(1) default NULL, -- describes whether issue note has been seen 1, not been seen 0 or doesn't exist null
1781	PRIMARY KEY (`issue_id`),	1782	PRIMARY KEY (`issue_id`),
1782	KEY `old_issuesborridx` (`borrowernumber`),	1783	KEY `old_issuesborridx` (`borrowernumber`),
1783	KEY `old_issuesitemidx` (`itemnumber`),	1784	KEY `old_issuesitemidx` (`itemnumber`),

Lines 5-10 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/userpermissions.sql (+1 lines)
5	( 1, 'force_checkout', 'Force checkout if a limitation exists'),	5	( 1, 'force_checkout', 'Force checkout if a limitation exists'),
6	( 1, 'manage_restrictions', 'Manage restrictions for accounts'),	6	( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
7	( 1, 'self_checkout', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID'),	7	( 1, 'self_checkout', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID'),
		8	( 1, 'manage_issue_notes', 'Mark issue notes as seen/not seen'),
8	( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),	9	( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
9	( 3, 'manage_circ_rules', 'Manage circulation rules'),	10	( 3, 'manage_circ_rules', 'Manage circulation rules'),
10	( 6, 'place_holds', 'Place holds for patrons'),	11	( 6, 'place_holds', 'Place holds for patrons'),




#!/usr/bin/perl

# Copyright 2016 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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::Output;
use C4::Auth;
use Koha::Checkouts;

my $query = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "issue_notes/issue-notes.tt",
        query           => $query,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { circulation => "manage_issue_notes" },
    }
);

my $schema = Koha::Database->new()->schema();
my @notes = $schema->resultset('Issue')->search({ 'me.note' => { '!=', undef } }, { prefetch => [ 'borrower', { item => 'biblionumber' } ] });
$template->param(
    notes     => \@notes,
);

my $action;
foreach (qw( seen notseen )) {
    $action = $_ if ( $query->param("mark_selected-$_") );
}
$action ||= 'none';

my @issue_ids = $query->multi_param('issue_ids');

if ( $action eq 'seen' ) {
    foreach my $issue_id ( @issue_ids ) {
        my $issue = Koha::Checkouts->find($issue_id);
        $issue->set({ noteseen => 1 })->store;
    }
} elsif ( $action eq 'notseen' ) {
    foreach my $issue_id ( @issue_ids ) {
        my $issue = Koha::Checkouts->find($issue_id);
        $issue->set({ noteseen => 0 })->store;
    }
}

$template->param(
    selected_count => scalar(@issue_ids),
    action         => $action,
);

output_html_with_http_headers $query, $cookie, $template->output;

Lines 30-35 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+1 lines)
30	[%- CASE 'overdues_report' -%]<span>Execute overdue items report</span>	30	[%- CASE 'overdues_report' -%]<span>Execute overdue items report</span>
31	[%- CASE 'override_renewals' -%]<span>Override blocked renewals</span>	31	[%- CASE 'override_renewals' -%]<span>Override blocked renewals</span>
32	[%- CASE 'self_checkout' -%]<span>Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID</span>	32	[%- CASE 'self_checkout' -%]<span>Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID</span>
		33	[%- CASE 'manage_issue_notes' -%]<span>Mark issue notes as seen/notseen</span>
33	[%- CASE 'manage_circ_rules' -%]<span>manage circulation rules</span>	34	[%- CASE 'manage_circ_rules' -%]<span>manage circulation rules</span>
34	[%- CASE 'parameters_remaining_permissions' -%]<span>Remaining system parameters permissions</span>	35	[%- CASE 'parameters_remaining_permissions' -%]<span>Remaining system parameters permissions</span>
35	[%- CASE 'modify_holds_priority' -%]<span>Modify holds priority</span>	36	[%- CASE 'modify_holds_priority' -%]<span>Modify holds priority</span>

Lines 30-35 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (+1 lines)
30	<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>	30	<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
31	[% END %]	31	[% END %]
32	[% END %]	32	[% END %]
		33	[% IF ( Koha.Preference('AllowIssueNotes') && CAN_user_circulate_manage_issue_notes ) %]<li><a href="/cgi-bin/koha/issue_notes/issue-notes.pl">Issue notes</a> [% IF ( pendingissuenotes ) %]<span class="number_box"><a href="/cgi-bin/koha/issue_notes/issue-notes.pl">[% pendingissuenotes %]</a></span>[% END %]</li>[% END %]
33	</ul>	34	</ul>
34	</div>	35	</div>
35		36

Lines 162-167 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (+7 lines)
162	</div>	162	</div>
163	[% END %]	163	[% END %]
164		164
		165	[% IF Koha.Preference('AllowIssueNotes') && CAN_user_circulate_manage_issue_notes && pending_issue_notes %]
		166	<div class="pending-info" id="issue_notes_pending">
		167	<a href="/cgi-bin/koha/issue_notes/issue-notes.pl">Issue notes pending</a>:
		168	<span class="pending-number-link">[% pending_issue_notes %]</span>
		169	</div>
		170	[% END %]
		171
165	</div>	172	</div>
166		173
167	[% END %]	174	[% END %]




[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Home &rsaquo; Circulation &rsaquo; Issue Notes</title>
[% INCLUDE 'doc-head-close.inc' %]
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
[% INCLUDE 'datatables.inc' %]
<script type="text/javascript">
//<![CDATA[
    $(document).ready(function(){
        $("#notestable").dataTable($.extend(true, {}, dataTablesDefaults, {
            "aoColumnDefs": [
                { "aTargets": [ 0, -1 ], "bSearchable": false, "bSortable": false },
            ],
            "sPaginationType": "four_button"
        }));

        $(".SelectAll").on("click", function(){
            $("input[name='issue_ids'][type='checkbox']").prop("checked", true);
        });

        $(".ClearAll").on("click", function(){
            $("input[name='issue_ids'][type='checkbox']").prop("checked", false);
        });

        $("#error").hide();

        $(".btn-xs").click(function(event){
            event.preventDefault(); // prevent form submission
            var $action = $(this).attr("name");
            var $issue_id = $(this).data('issue_id');
            var ajaxData = {
                'action': $action,
                'issue_id': $issue_id,
            };

            $.ajax({
                url: '/cgi-bin/koha/svc/issue_notes/',
                type: 'POST',
                dataType: 'json',
                data: ajaxData,
            })

            .done(function(data){
                if (data.status == 'success'){
                    if ( $action == 'notseen' ){
                        $("#status_" + $issue_id).text("Not seen");
                        $(event.target).siblings(".seen").prop("disabled", false);
                        $(event.target).prop("disabled", true);
                    } else {
                        $("#status_" + $issue_id).text("Seen");
                        $(event.target).siblings(".notseen").prop("disabled", false);
                        $(event.target).prop("disabled", true);
                    }
                } else {
                    $("#error").text("Unable to change status of note.");
                    $("#error").show();
                }
            });
        });
    });
//]]>
</script>
[% INCLUDE 'calendar.inc' %]
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
</head>
[% INCLUDE 'header.inc' %]
[% INCLUDE 'circ-search.inc' %]
<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
    <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;
    Issue notes
</div>

<div id="doc" class="yui-t7"> <!-- <div id="doc3" class="yui-t2" -->
    <div id="bd">
        <div id="yui-main">

            <h1>Issue notes</h1>

            <div class="dialog alert" id="error"></div>

            [% IF ( selected_count ) %]
                <div class="dialog message">
                    [% IF ( action == 'seen' ) %]
                        [% selected_count %] note(s) marked as seen.
                    [% ELSIF ( action == 'notseen' ) %]
                        [% selected_count %] note(s) marked as not seen.
                    [% ELSE %]
                        Failed to change the status of [% selected_count %] item(s).
                    [% END %]
                </div>
                <a href="/cgi-bin/koha/issue_notes/issue-notes.pl" class="btn btn-small"><i class="fa fa-left"></i> Back to issue notes</a>
            [% ELSE %]

            [% IF ( notes ) %]

            <fieldset class="action">
                <a class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a class="ClearAll"><i class="fa fa-remove"></i> Clear all</a>
            </fieldset>

            <form id="mark_selected" method="post" action="/cgi-bin/koha/issue_notes/issue-notes.pl">

            <table id="notestable">
                <thead>
                    <tr>
                        <th>&nbsp;</th>
                        <th>Note</th>
                        <th>Status</th>
                        <th>Title</th>
                        <th>Date</th>
                        <th>Set by</th>
                        <th>Actions</th>
                    </tr>
                </thead>
                <tbody>
                [% FOREACH note IN notes %]
                    <tr>
                        <td><input type="checkbox" name="issue_ids" value="[% note.issue_id %]"></td>
                        <td>[% note.note %]</td>
                        <td>[% IF ( note.noteseen == 0 ) %]
                            <span id="status_[% note.issue_id %]">Not seen</span>
                        [% ELSIF ( note.noteseen == 1 ) %]
                            <span id="status_[% note.issue_id %]">Seen</span>
                        [% END %]</td>
                        <td>[% note.item.biblionumber.title %] - [% note.item.biblionumber.author %] (<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% note.item.biblionumber.biblionumber %]">[% note.item.barcode %]</a>)</td>
                        <td>[% note.notedate | $KohaDates %]</td>
                        <td>[% note.borrower.firstname %] [% note.borrower.surname %] (<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% note.borrower.borrowernumber %]">[% note.borrower.cardnumber %]</a>)</td>
                        <td class="actions">[% IF ( note.noteseen == 1 ) %]
                            <button name="seen" data-issue_id="[% note.issue_id %]" class="seen btn btn-default btn-xs" disabled="disabled"><i class="fa fa-eye"></i> Mark seen</button> <button name="notseen" data-issue_id="[% note.issue_id %]" class="notseen btn btn-default btn-xs"><i class="fa fa-eye-slash"></i> Mark not seen</button>
                        [% ELSIF ( note.noteseen == 0 ) %]
                            <button name="seen" data-issue_id="[% note.issue_id %]" class="seen btn btn-default btn-xs"><i class="fa fa-eye"></i> Mark seen</button> <button name="notseen" data-issue_id="[% note.issue_id %]" class="notseen btn btn-default btn-xs" disabled="disabled"><i class="fa fa-eye-slash"></i> Mark not seen</button>
                        [% END %]</td>
                    </tr>
                [% END %]
                </tbody>
            </table>

            <fieldset class="action">
                <button type="submit" class="btn btn-default btn-sm" name="mark_selected-seen" value="seen"><i class="fa fa-eye"></i> Mark seen</button>
                <button type="submit" class="btn btn-default btn-sm" name="mark_selected-notseen" value="notseen"><i class="fa fa-eye-slash"></i> Mark not seen</button>
            </fieldset>

            </form>

            [% END %] <!-- notes -->

            [% END %] <!-- selected_count -->

        </div> <!-- yui-main -->
    </div> <!-- bd -->
</div> <!-- doc3 -->

[% INCLUDE 'intranet-bottom.inc' %]




use Koha::Patron::Discharge;
use Koha::Reviews;
use Koha::ArticleRequests;
use Koha::Checkouts;

my $query = new CGI;


        $branch ? ( branchcode => $branch ) : (),
    }
);
my $pending_issue_notes = Koha::Checkouts->search({ noteseen => 0 })->count;

$template->param(
    pendingcomments                => $pendingcomments,

    pending_borrower_modifications => $pending_borrower_modifications,
    pending_discharge_requests     => $pending_discharge_requests,
    pending_article_requests       => $pending_article_requests,
    pending_issue_notes            => $pending_issue_notes,
);

#

Lines 67-73 if ( $action eq 'issuenote' && C4::Context->preference('AllowIssueNotes') ) { Link Here

(-)a/opac/opac-issue-note.pl (-1 / +1 lines)
67	my $note = $query->param('note');	67	my $note = $query->param('note');
68	my $scrubber = C4::Scrubber->new();	68	my $scrubber = C4::Scrubber->new();
69	my $clean_note = $scrubber->scrub($note);	69	my $clean_note = $scrubber->scrub($note);
70	if ( $issue->set({ notedate => dt_from_string(), note => $clean_note })->store ) {	70	if ( $issue->set({ notedate => dt_from_string(), note => $clean_note, noteseen => 0 })->store ) {
71	if ($clean_note) { # only send email if note not empty	71	if ($clean_note) { # only send email if note not empty
72	my $branch = Koha::Libraries->find( $issue->branchcode );	72	my $branch = Koha::Libraries->find( $issue->branchcode );
73	my $letter = C4::Letters::GetPreparedLetter (	73	my $letter = C4::Letters::GetPreparedLetter (

Lines 79-85 if ($is_ajax) { Link Here

(-)a/opac/svc/patron_notes (-1 / +1 lines)
79	$error = "Invalid issue id!";	79	$error = "Invalid issue id!";
80	}	80	}
81		81
82	if ( (not $error) && $issue->set({ notedate => dt_from_string(), note => $clean_note })->store ) {	82	if ( (not $error) && $issue->set({ notedate => dt_from_string(), note => $clean_note, noteseen => 0 })->store ) {
83	if($clean_note) { # only send email if note not empty	83	if($clean_note) { # only send email if note not empty
84	my $branch = Koha::Libraries->find( $issue->branchcode );	84	my $branch = Koha::Libraries->find( $issue->branchcode );
85	my $biblio = GetBiblioFromItemNumber($issue->itemnumber);	85	my $biblio = GetBiblioFromItemNumber($issue->itemnumber);




#!/usr/bin/perl

# This file is part of Koha.
#
# Copyright 2017 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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;
use C4::Service;
use C4::Auth qw /check_cookie_auth/;
use C4::Output qw(:DEFAULT :ajax);
use Koha::Checkouts;

=head1 NAME

svc/issue_notes - Web service for managing patron notes set on issues

=head1 DESCRIPTION

=cut

# AJAX requests
my $is_ajax = is_ajax();
my $query = new CGI;
my ( $auth_status, $sessionID ) = check_cookie_auth( $query->cookie('CGISESSID'), {} );
if ( $auth_status ne "ok" ) {
    exit 0;
}
if ($is_ajax) {
    my $issue_id = $query->param('issue_id');
    my $issue = Koha::Checkouts->find($issue_id);
    my $action = $query->param('action');
    my $status = 'success';
    if ($action eq 'seen'){
        $issue->set({ noteseen => 1 })->store;
        if ( $issue->noteseen != 1 ) {
            $status = 'failure';
        }
    } elsif ($action eq 'notseen'){
        $issue->set({ noteseen => 0 })->store;
        if ( $issue->noteseen != 0 ) {
            $status = 'failure';
        }
    }
    my $response = "{\"status\": \"$status\"}";
    output_with_http_headers $query, undef, $response, 'js';
    exit;
}

Return to bug 17698

Line 0 Link Here

(-)a/issue_notes/issue-notes.pl (+71 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2016 Aleisha Amohia <aleisha@catalyst.net.nz>
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it
		8	# under the terms of the GNU General Public License as published by
		9	# the Free Software Foundation; either version 3 of the License, or
		10	# (at your option) any later version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but
		13	# WITHOUT ANY WARRANTY; without even the implied warranty of
		14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	# GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License
		18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		19
		20	use Modern::Perl;
		21
		22	use CGI qw ( -utf8 );
		23	use C4::Context;
		24	use C4::Output;
		25	use C4::Auth;
		26	use Koha::Checkouts;
		27
		28	my $query = new CGI;
		29
		30	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		31	{
		32	template_name => "issue_notes/issue-notes.tt",
		33	query => $query,
		34	type => "intranet",
		35	authnotrequired => 0,
		36	flagsrequired => { circulation => "manage_issue_notes" },
		37	}
		38	);
		39
		40	my $schema = Koha::Database->new()->schema();
		41	my @notes = $schema->resultset('Issue')->search({ 'me.note' => { '!=', undef } }, { prefetch => [ 'borrower', { item => 'biblionumber' } ] });
		42	$template->param(
		43	notes => \@notes,
		44	);
		45
		46	my $action;
		47	foreach (qw( seen notseen )) {
		48	$action = $_ if ( $query->param("mark_selected-$_") );
		49	}
		50	$action \|\|= 'none';
		51
		52	my @issue_ids = $query->multi_param('issue_ids');
		53
		54	if ( $action eq 'seen' ) {
		55	foreach my $issue_id ( @issue_ids ) {
		56	my $issue = Koha::Checkouts->find($issue_id);
		57	$issue->set({ noteseen => 1 })->store;
		58	}
		59	} elsif ( $action eq 'notseen' ) {
		60	foreach my $issue_id ( @issue_ids ) {
		61	my $issue = Koha::Checkouts->find($issue_id);
		62	$issue->set({ noteseen => 0 })->store;
		63	}
		64	}
65
66	$template->param(
67	selected_count => scalar(@issue_ids),
68	action => $action,
69	);
70
71	output_html_with_http_headers $query, $cookie, $template->output;

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/issue_notes/issue-notes.tt (+155 lines)
		1	[% USE Koha %]
		2	[% USE KohaDates %]
		3	[% USE Branches %]
		4	[% INCLUDE 'doc-head-open.inc' %]
		5	<title>Home &rsaquo; Circulation &rsaquo; Issue Notes</title>
		6	[% INCLUDE 'doc-head-close.inc' %]
		7	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
		8	[% INCLUDE 'datatables.inc' %]
		9	<script type="text/javascript">
		10	//<![CDATA[
		11	$(document).ready(function(){
		12	$("#notestable").dataTable($.extend(true, {}, dataTablesDefaults, {
		13	"aoColumnDefs": [
		14	{ "aTargets": [ 0, -1 ], "bSearchable": false, "bSortable": false },
		15	],
		16	"sPaginationType": "four_button"
		17	}));
		18
		19	$(".SelectAll").on("click", function(){
		20	$("input[name='issue_ids'][type='checkbox']").prop("checked", true);
		21	});
		22
		23	$(".ClearAll").on("click", function(){
		24	$("input[name='issue_ids'][type='checkbox']").prop("checked", false);
		25	});
		26
		27	$("#error").hide();
		28
		29	$(".btn-xs").click(function(event){
		30	event.preventDefault(); // prevent form submission
		31	var $action = $(this).attr("name");
		32	var $issue_id = $(this).data('issue_id');
		33	var ajaxData = {
		34	'action': $action,
		35	'issue_id': $issue_id,
		36	};
		37
		38	$.ajax({
		39	url: '/cgi-bin/koha/svc/issue_notes/',
		40	type: 'POST',
		41	dataType: 'json',
		42	data: ajaxData,
		43	})
		44
		45	.done(function(data){
		46	if (data.status == 'success'){
		47	if ( $action == 'notseen' ){
		48	$("#status_" + $issue_id).text("Not seen");
		49	$(event.target).siblings(".seen").prop("disabled", false);
		50	$(event.target).prop("disabled", true);
		51	} else {
		52	$("#status_" + $issue_id).text("Seen");
		53	$(event.target).siblings(".notseen").prop("disabled", false);
		54	$(event.target).prop("disabled", true);
		55	}
		56	} else {
		57	$("#error").text("Unable to change status of note.");
		58	$("#error").show();
		59	}
		60	});
		61	});
		62	});
		63	//]]>
		64	</script>
65	[% INCLUDE 'calendar.inc' %]
66	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
67	</head>
68	[% INCLUDE 'header.inc' %]
69	[% INCLUDE 'circ-search.inc' %]
70	<div id="breadcrumbs">
71	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
72	<a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;
73	Issue notes
74	</div>
75
76	<div id="doc" class="yui-t7"> <!-- <div id="doc3" class="yui-t2" -->
77	<div id="bd">
78	<div id="yui-main">
79
80	<h1>Issue notes</h1>
81
82	<div class="dialog alert" id="error"></div>
83
84	[% IF ( selected_count ) %]
85	<div class="dialog message">
86	[% IF ( action == 'seen' ) %]
87	[% selected_count %] note(s) marked as seen.
88	[% ELSIF ( action == 'notseen' ) %]
89	[% selected_count %] note(s) marked as not seen.
90	[% ELSE %]
91	Failed to change the status of [% selected_count %] item(s).
92	[% END %]
93	</div>
94	<a href="/cgi-bin/koha/issue_notes/issue-notes.pl" class="btn btn-small"><i class="fa fa-left"></i> Back to issue notes</a>
95	[% ELSE %]
96
97	[% IF ( notes ) %]
98
99	<fieldset class="action">
100	<a class="SelectAll"><i class="fa fa-check"></i> Select all</a> \| <a class="ClearAll"><i class="fa fa-remove"></i> Clear all</a>
101	</fieldset>
102
103	<form id="mark_selected" method="post" action="/cgi-bin/koha/issue_notes/issue-notes.pl">
104
105	<table id="notestable">
106	<thead>
107	<tr>
108	<th> </th>
109	<th>Note</th>
110	<th>Status</th>
111	<th>Title</th>
112	<th>Date</th>
113	<th>Set by</th>
114	<th>Actions</th>
115	</tr>
116	</thead>
117	<tbody>
118	[% FOREACH note IN notes %]
119	<tr>
120	<td><input type="checkbox" name="issue_ids" value="[% note.issue_id %]"></td>
121	<td>[% note.note %]</td>
122	<td>[% IF ( note.noteseen == 0 ) %]
123	<span id="status_[% note.issue_id %]">Not seen</span>
124	[% ELSIF ( note.noteseen == 1 ) %]
125	<span id="status_[% note.issue_id %]">Seen</span>
126	[% END %]</td>
127	<td>[% note.item.biblionumber.title %] - [% note.item.biblionumber.author %] (<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% note.item.biblionumber.biblionumber %]">[% note.item.barcode %]</a>)</td>
128	<td>[% note.notedate \| $KohaDates %]</td>
129	<td>[% note.borrower.firstname %] [% note.borrower.surname %] (<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% note.borrower.borrowernumber %]">[% note.borrower.cardnumber %]</a>)</td>
130	<td class="actions">[% IF ( note.noteseen == 1 ) %]
131	<button name="seen" data-issue_id="[% note.issue_id %]" class="seen btn btn-default btn-xs" disabled="disabled"><i class="fa fa-eye"></i> Mark seen</button> <button name="notseen" data-issue_id="[% note.issue_id %]" class="notseen btn btn-default btn-xs"><i class="fa fa-eye-slash"></i> Mark not seen</button>
132	[% ELSIF ( note.noteseen == 0 ) %]
133	<button name="seen" data-issue_id="[% note.issue_id %]" class="seen btn btn-default btn-xs"><i class="fa fa-eye"></i> Mark seen</button> <button name="notseen" data-issue_id="[% note.issue_id %]" class="notseen btn btn-default btn-xs" disabled="disabled"><i class="fa fa-eye-slash"></i> Mark not seen</button>
134	[% END %]</td>
135	</tr>
136	[% END %]
137	</tbody>
138	</table>
139
140	<fieldset class="action">
141	<button type="submit" class="btn btn-default btn-sm" name="mark_selected-seen" value="seen"><i class="fa fa-eye"></i> Mark seen</button>
142	<button type="submit" class="btn btn-default btn-sm" name="mark_selected-notseen" value="notseen"><i class="fa fa-eye-slash"></i> Mark not seen</button>
143	</fieldset>
144
145	</form>
146
147	[% END %] <!-- notes -->
148
149	[% END %] <!-- selected_count -->
150
151	</div> <!-- yui-main -->
152	</div> <!-- bd -->
153	</div> <!-- doc3 -->
154
155	[% INCLUDE 'intranet-bottom.inc' %]

Lines 31-36 use Koha::Patron::Modifications; Link Here

(-)a/mainpage.pl (+3 lines)
31	use Koha::Patron::Discharge;	31	use Koha::Patron::Discharge;
32	use Koha::Reviews;	32	use Koha::Reviews;
33	use Koha::ArticleRequests;	33	use Koha::ArticleRequests;
		34	use Koha::Checkouts;
34		35
35	my $query = new CGI;	36	my $query = new CGI;
36		37
Lines 74-79 my $pending_article_requests = Koha::ArticleRequests->count( Link Here
74	$branch ? ( branchcode => $branch ) : (),	75	$branch ? ( branchcode => $branch ) : (),
75	}	76	}
76	);	77	);
		78	my $pending_issue_notes = Koha::Checkouts->search({ noteseen => 0 })->count;
77		79
78	$template->param(	80	$template->param(
79	pendingcomments => $pendingcomments,	81	pendingcomments => $pendingcomments,
Lines 82-87 $template->param( Link Here
82	pending_borrower_modifications => $pending_borrower_modifications,	84	pending_borrower_modifications => $pending_borrower_modifications,
83	pending_discharge_requests => $pending_discharge_requests,	85	pending_discharge_requests => $pending_discharge_requests,
84	pending_article_requests => $pending_article_requests,	86	pending_article_requests => $pending_article_requests,
		87	pending_issue_notes => $pending_issue_notes,
85	);	88	);
86		89
87	#	90	#

Line 0 Link Here

(-)a/svc/issue_notes (-1 / +62 lines)
0	-	1	#!/usr/bin/perl
		2
		3	# This file is part of Koha.
		4	#
		5	# Copyright 2017 Aleisha Amohia <aleisha@catalyst.net.nz>
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it
		8	# under the terms of the GNU General Public License as published by
		9	# the Free Software Foundation; either version 3 of the License, or
		10	# (at your option) any later version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but
		13	# WITHOUT ANY WARRANTY; without even the implied warranty of
		14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	# GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License
		18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		19
		20	use Modern::Perl;
		21
		22	use CGI;
		23	use C4::Service;
		24	use C4::Auth qw /check_cookie_auth/;
		25	use C4::Output qw(:DEFAULT :ajax);
		26	use Koha::Checkouts;
		27
		28	=head1 NAME
		29
		30	svc/issue_notes - Web service for managing patron notes set on issues
		31
		32	=head1 DESCRIPTION
		33
		34	=cut
		35
		36	# AJAX requests
		37	my $is_ajax = is_ajax();
		38	my $query = new CGI;
		39	my ( $auth_status, $sessionID ) = check_cookie_auth( $query->cookie('CGISESSID'), {} );
		40	if ( $auth_status ne "ok" ) {
		41	exit 0;
		42	}
		43	if ($is_ajax) {
		44	my $issue_id = $query->param('issue_id');
		45	my $issue = Koha::Checkouts->find($issue_id);
		46	my $action = $query->param('action');
		47	my $status = 'success';
		48	if ($action eq 'seen'){
		49	$issue->set({ noteseen => 1 })->store;
		50	if ( $issue->noteseen != 1 ) {
		51	$status = 'failure';
		52	}
		53	} elsif ($action eq 'notseen'){
		54	$issue->set({ noteseen => 0 })->store;
		55	if ( $issue->noteseen != 0 ) {
		56	$status = 'failure';
		57	}
		58	}
		59	my $response = "{\"status\": \"$status\"}";
		60	output_with_http_headers $query, undef, $response, 'js';
		61	exit;
		62	}