Attachment #63621 for bug #17047

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

Lines 854-860 sub get_sql { Link Here

(-)a/C4/Reports/Guided.pm (-1 lines)
854	sub get_results {	854	sub get_results {
855	my ( $report_id ) = @_;	855	my ( $report_id ) = @_;
856	my $dbh = C4::Context->dbh;	856	my $dbh = C4::Context->dbh;
857	warn $report_id;
858	return $dbh->selectall_arrayref(q\|	857	return $dbh->selectall_arrayref(q\|
859	SELECT id, report, date_run	858	SELECT id, report, date_run
860	FROM saved_reports	859	FROM saved_reports




package Koha::Report;

# Copyright 2017 Biblibre Baptiste Wojtkowski
#
# 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, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;
use JSON;
use Koha::Reports;

use base qw(Koha::Object);

=head1 NAME

Koha::Report - Koha Report Object Class

=head1 Ap

=head2 Class Methods

=cut

=head3 type

=cut

sub get_search_info {
    my $self=shift;
    my $sub_mana_info = { 'query' => shift };
    return $sub_mana_info;
}

sub get_sharable_info{
    my $self=shift;
    my $shared_report_id=shift;
    my $report = Koha::Reports->find($shared_report_id);
    my $sub_mana_info = {
        'savedsql' => $report->savedsql,
        'report_name' => $report->report_name,
        'notes' => $report->notes,
        'report_group' => $report->report_group,
        'type' => $report->type,
    };
    return $sub_mana_info;
}

sub new_from_mana{
    my $self = shift;
    my $data = shift;
    delete $data->{exportemail};
    delete $data->{kohaversion};
    delete $data->{creationdate};
    delete $data->{lastimport};
    $data->{mana_id} = $data->{id};
    delete $data->{id};
    delete $data->{nbofusers};
    delete $data->{language};
    Koha::Report->new($data)->store;
}

sub _type {
    return 'SavedSql';
}

1;




package Koha::Reports;

# Copyright 2017 Biblibre Baptiste Wojtkowski
#
# 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, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Report;

use base qw(Koha::Objects);

=head1 NAME

Koha::Serial - Koha Serial Object class

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub _type {
    return 'SavedSql';
}

sub object_class {
    return 'Koha::Report';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;

Lines 22-28 use JSON; Link Here

(-)a/Koha/SharedContent.pm (-5 / +61 lines)
22	use HTTP::Request;	22	use HTTP::Request;
23	use LWP::UserAgent;	23	use LWP::UserAgent;
24		24
25	our $MANA_IP = "http://10.25.159.107:5000";	25	use Koha::Serials;
		26	use Koha::Reports;
		27
		28	our $MANA_IP = C4::Context->config('mana_config');
26		29
27	sub manaRequest {	30	sub manaRequest {
28	my $mana_request = shift;	31	my $mana_request = shift;
Lines 40-51 sub manaRequest { Link Here
40	return $result if ( $response->code =~ /^2..$/ );	43	return $result if ( $response->code =~ /^2..$/ );
41	}	44	}
42		45
43	sub manaNewUserPatchRequest {	46	sub manaIncrementRequest {
44	my $resource = shift;	47	my $resource = shift;
45	my $id = shift;	48	my $id = shift;
46		49	my $field = shift;
47	my $url = "$MANA_IP/$resource/$id.json/newUser";	50	my $step = shift;
48	my $request = HTTP::Request->new( PATCH => $url );	51	my $param;
		52	$param->{step} = $step \|\| 1;
		53	$param->{id} = $id;
		54	$param->{resource} = $resource;
		55	$param = join '&',
		56	map { defined $param->{$_} ? $_ . "=" . $param->{$_} : () }
		57	keys %$param;
		58	my $url = "$MANA_IP/$resource/$id.json/increment/$field?$param";
		59	my $request = HTTP::Request->new( POST => $url );
49		60
50	return manaRequest($request);	61	return manaRequest($request);
51	}	62	}
Lines 64-69 sub manaPostRequest { Link Here
64	return manaRequest($request);	75	return manaRequest($request);
65	}	76	}
66		77
		78	sub manaShareInfos{
		79	my ($query, $loggedinuser, $ressourceid, $ressourcetype) = @_;
		80	my $mana_language;
		81	if ( $query->param('mana_language') ) {
		82	$mana_language = $query->param('mana_language');
		83	}
		84	else {
		85	my $result = $mana_language = C4::Context->preference('language');
		86	}
		87
		88	my $mana_email;
		89	if ( $loggedinuser ne 0 ) {
		90	my $borrower = Koha::Patrons->find($loggedinuser);
		91	$mana_email = $borrower->email
		92	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
		93	$mana_email = $borrower->emailpro
		94	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
		95	$mana_email =
		96	Koha::Libraries->find( C4::Context->userenv->{'branch'} )->branchemail
		97	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
		98	}
		99	$mana_email = C4::Context->preference('KohaAdminEmailAddress')
		100	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
		101	my %versions = C4::Context::get_versions();
		102
		103	my $mana_info = {
		104	language => $mana_language,
		105	kohaversion => $versions{'kohaVersion'},
		106	exportemail => $mana_email
		107	};
		108	my ($ressource, $ressource_mana_info);
		109	my $packages = "Koha::".ucfirst($ressourcetype)."s";
		110	my $package = "Koha::".ucfirst($ressourcetype);
		111	$ressource_mana_info = $package->get_sharable_info($ressourceid);
		112	$ressource_mana_info = { %$ressource_mana_info, %$mana_info };
		113	$ressource = $packages->find($ressourceid);
		114
		115	my $result = Koha::SharedContent::manaPostRequest( $ressourcetype,
		116	$ressource_mana_info );
		117	if ( $result and ($result->{code} eq "200" or $result->{code} eq "201") ) {
		118	$ressource->set( { mana_id => $result->{id} } )->store;
		119	}
		120	return $result;
		121	}
		122
67	sub manaGetRequestWithId {	123	sub manaGetRequestWithId {
68	my $resource = shift;	124	my $resource = shift;
69	my $id = shift;	125	my $id = shift;

Lines 46-51 Koha::Subscription - Koha Subscription Object class Link Here

(-)a/Koha/Subscription.pm (+2 lines)
46	=cut	46	=cut
47		47
48	sub get_search_info {	48	sub get_search_info {
		49	my $self=shift;
49	my $searched_sub_id = shift;	50	my $searched_sub_id = shift;
50	my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );	51	my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
51	my $biblioitem =	52	my $biblioitem =
Lines 61-66 sub get_search_info { Link Here
61	}	62	}
62		63
63	sub get_sharable_info {	64	sub get_sharable_info {
		65	my $self = shift;
64	my $shared_sub_id = shift;	66	my $shared_sub_id = shift;
65	my $subscription = Koha::Subscriptions->find($shared_sub_id);	67	my $subscription = Koha::Subscriptions->find($shared_sub_id);
66	my $biblio = Koha::Biblios->find( $subscription->biblionumber );	68	my $biblio = Koha::Biblios->find( $subscription->biblionumber );

Lines 149-154 __PAZPAR2_TOGGLE_XML_POST__ Link Here

(-)a/etc/koha-conf.xml (+4 lines)
149	<!-- Path to the config file for SMS::Send -->	149	<!-- Path to the config file for SMS::Send -->
150	<sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>	150	<sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>
151		151
		152	<!-- URL of the mana KB server -->
		153	<!-- alternative value http://mana-test.koha-community.org to query the test server -->
		154	<mana_config>http://mana-kb.koha-community.org</mana_config>
		155
152	<!-- Configuration for Plack -->	156	<!-- Configuration for Plack -->
153	<plack_max_requests>50</plack_max_requests>	157	<plack_max_requests>50</plack_max_requests>
154	<plack_workers>2</plack_workers>	158	<plack_workers>2</plack_workers>

Line 1 Link Here

(-)a/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql (+1 lines)
1	ALTER TABLE subscription ADD mana_id int(11);	1	ALTER TABLE subscription ADD mana_id int(11);
		2	ALTER TABLE saved_sql ADD mana_id int(11);

(-)a/installer/data/mysql/atomicupdate/mana_02-add_Mana_syspref.sql (-1 / +1 lines)

Line 1 Link Here

INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('Mana', '1', 'request to Mana Webservice. Mana centralize commun information between other Koha to facilitate the creation of new subscriptions, vendors, report queries etc... You can search, share, import and comment the content of Mana.', NULL, 'YesNo');

INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('Mana','2', 0|1|2,'request to Mana Webservice. Mana centralize commun information between other Koha to facilitate the creation of new subscriptions, vendors, report queries etc... You can search, share, import and comment the content of Mana.','Choice');

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/mana_03-add_mana_autoshare.sql (+2 lines)
	1	INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
	2	('AutoShareWithMana','subscription','','defines datas automatically shared with mana','multiple');

Lines 60-65 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
60	('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),	60	('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
61	('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),	61	('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
62	('AutoEmailPrimaryAddress','OFF','email\|emailpro\|B_email\|cardnumber\|OFF','Defines the default email address where \'Account Details\' emails are sent.','Choice'),	62	('AutoEmailPrimaryAddress','OFF','email\|emailpro\|B_email\|cardnumber\|OFF','Defines the default email address where \'Account Details\' emails are sent.','Choice'),
		63	('AutoShareWithMana','subscription','','defines datas automatically shared with mana','multiple'),
63	('AutoLocation','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff client from unauthorized IP addresses','YesNo'),	64	('AutoLocation','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff client from unauthorized IP addresses','YesNo'),
64	('AutomaticItemReturn','1',NULL,'If ON, Koha will automatically set up a transfer of this item to its homebranch','YesNo'),	65	('AutomaticItemReturn','1',NULL,'If ON, Koha will automatically set up a transfer of this item to its homebranch','YesNo'),
65	('autoMemberNum','1','','If ON, patron number is auto-calculated','YesNo'),	66	('autoMemberNum','1','','If ON, patron number is auto-calculated','YesNo'),

Lines 291-296 table+table { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+6 lines)
291	.highlighted-row,	291	.highlighted-row,
292	.highlighted-row td { background-color: #FFD000 !important }	292	.highlighted-row td { background-color: #FFD000 !important }
293		293
		294	.warned-row,
		295	.warned-row td { background-color: #FF9000 !important }
		296
		297	.high-warned-row,
		298	.high-warned-row td { background-color: #FF0000 !important }
		299
294	tbody tr:nth-child(odd) td {	300	tbody tr:nth-child(odd) td {
295	background-color : #F3F3F3;	301	background-color : #F3F3F3;
296	border : 1px solid #BCBCBC;	302	border : 1px solid #BCBCBC;




[% USE KohaDates %]
<table id="mana_results_datatable">
    <thead>
        <tr>
            <th>ISSN</th>
            <th class="anti-the">Title</th>
            <th>Frequency</th>
            <th>Numbering pattern</th>
            <th class="NoSort">Number of users</th>
            <th class="title-string">Last Import</th>
            [% UNLESS search_only %]
              <th class="NoSort">Actions</th>
            [% END %]
        </tr>
    </thead>
    <tfoot>
        <tr>
            <td><input type="text" class="dt-filter" data-column_num="0" placeholder="Search ISSN" /></td>
            <td><input type="text" class="dt-filter" data-column_num="1" placeholder="Search title" /></td>
            <td><input type="text" class="dt-filter" data-column_num="2" placeholder="Search frequency" /></td>
            <td><input type="text" class="dt-filter" data-column_num="3" placeholder="Search numbering pattern" /></td>
            <td></td>
            <td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search last import" /></td>
            [% UNLESS search_only %]
              <td></td>
            [% END %]
        </tr>
    </tfoot>
    <tbody>
        [% FOREACH subscription IN subscriptions %]
            [% UNLESS subscription.cannotdisplay %]
                <tr id="row[% subscription.subscriptionid %]">
                    <td>[% IF ( subscription.issn ) %][% subscription.issn %][% END %]</td>
                    <td>[% subscription.title %]</a></td>
                    <td>[% IF ( subscription.sfdescription ) %][% subscription.sfdescription %][% END %]</td>
                    <td>[% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod %][% END %]</td>
                    <td>[% IF ( subscription.nbofusers ) %][% subscription.nbofusers %][% END %]</td>
                    <td><span title="[% subscription.lastimport %]">[% subscription.lastimport | $KohaDates %]</span></td>
                    [% UNLESS search_only %]
                      <td><a style="cursor:pointer" onclick="mana_use([% subscription.id %])"> <i class="fa fa-inbox"></i> Use</a></td>
                    [% END %]
                </tr>
            [% END %]
        [% END %]
    </tbody>
</table>




[% USE KohaDates %]
[% USE Koha %]
[% USE AuthorisedValues %]
[% USE Branches %]

<table id="mana_results_datatable" width=100%>
    <thead>
        <tr>
            <th>Report Name</th>
            <th class="anti-the" width=35%>Notes</th>
            <th>Type</th>
            <th title="number of libraries using this pattern"># of users</th>
            <th class="title-string" title="last time a library used this pattern">Last import</th>
            <th> Comments </th>
            [% UNLESS search_only %]
              <th class="NoSort">Actions</th>
            [% END %]
        </tr>
    </thead>
    <tbody>
        [% FOREACH report IN reports %]
            [% UNLESS report.cannotdisplay %]
                <tr id="row[% report.id %]"
                     [% IF report.nbofcomment > highWarned  %]
                        class = "high-warned-row"
                     [% ELSIF report.nbofcomment > warned  %]
                        class = "warned-row"
                     [% ELSIF report.nbofcomment > lowWarned  %]
                        class = "highlighted-row"
                     [% END %]
                >
                    <input hidden class="rowid" value="[% report.id %]">
                    <td>[% IF ( report.report_name ) %][% report.report_name %][% END %]</td>
                    <td title="[% report.savedsql %]"><div>
                        [% IF report.notes.length > 200 %]
                            [% report.notes.substr(0,200) %]<a class="showbutton">Show More</a></div><div hidden>
                        [% END %]
                            [% report.notes %]
                        [% IF report.notes.length > 200 %]
                            <a class="hidebutton">Show Less</a></div> </td>
                        [% END %]
                    <td> [% report.type %] </td>
                    <td>[% IF ( report.nbofusers ) %][% report.nbofusers %][% END %]</td>
                    <td><span title="[% report.lastimport %]">[% report.lastimport | $KohaDates %]</span></td>
		    <td>[% FOREACH comment IN report.comments %][% comment.message %] ([% comment.nb %]) <br>[% END %]</td>

                    [% UNLESS search_only %]
                      <td>
                          <button onclick="mana_use([% report.id %])"> <i class="fa fa-inbox"></i> Use</button>
                          <input hidden type="text" id="selectedcomment">
                          <select>
                              <option selected disabled>Report mistake</option>
                              [% FOREACH comment IN report.comments %]
                                  <option class="actionreport1" value="[% comment.id %]" onclick="mana_increment('[% comment.id %]', 'resource_comment', 'nb')"> [% comment.message %] ([% comment.nb %])
                              [% END %]
                                  <option data-toggle="modal" onclick="($('#selected_id').val($('.rowid').val()))" data-target="#comment_box"> other
                          </select>
                          <button hidden class="actionreport2" hidden> Cancel</button>
                      </td>
                    [% END %]
                </tr>
            [% END %]
        [% END %]
    </tbody>
</table>

<div id="comment_box" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="display: none;">
    <div class="modal-dialog modal-lg" style="width: 30%">
        <div class="modal-content" style="">
            <div class="modal-header">
                <button type="button" id="commentCloseButton" class="closebtn"  aria-hidden="true">×</button>
                <h3 id="mana_submit_comment"> Please enter a new commment (max 35 caracters)</h3>
            </div>
            <div class="modal-body">
                <form>
                    <input hidden id="selected_id" value="">
                    <input type="text" id="manamsg">
                </form>
                <button id="CommentButton"> Comment </button>
            </div>
        </div>
    </div>
</div>




[% USE KohaDates %]
[% USE Koha %]
[% USE AuthorisedValues %]
[% USE Branches %]



<table id="mana_results_datatable" width=100%>
    <thead>
        <tr>
            <th>ISSN</th>
            <th class="anti-the" width=50%>Title</th>
            <th> Published by </th>
            <th>Frequency</th>
            <th>Numbering pattern</th>
            <th title="number of libraries using this pattern"># of users</th>
            <th class="title-string" title="last time a library used this pattern">Last import</th>
            <th> Comments </th>
            [% UNLESS search_only %]
              <th class="NoSort">Actions</th>
            [% END %]
        </tr>
    </thead>
    <tbody>
        [% FOREACH subscription IN subscriptions %]
            [% UNLESS subscription.cannotdisplay %]
                <tr id="row[% subscription.subscriptionid %]"
                     [% IF subscription.nbofcomment > highWarned  %]
                        class = "high-warned-row" title="this resource has been reported more than [% highWarned %] times, take care!"
                     [% ELSIF subscription.nbofcomment > warned  %]
                        class = "warned-row" title="this resource has been reported more than [% warned %] times, take care!"
                     [% ELSIF subscription.nbofcomment > lowWarned  %]
                        class = "highlighted-row" title="this resource has been reported more than [% lowWarned %] times, take care!"
                     [% END %]
                >
                <input hidden class="rowid" value="[% subscription.id %]">
                    <td>[% IF ( subscription.issn ) %][% subscription.issn %][% END %]</td>
                    <td>[% subscription.title %]</a></td>
                    <td>[% IF ( subscription.publishercode ) %][% subscription.publishercode %][% END %]</td>
                    <td>[% IF ( subscription.sfdescription ) %][% subscription.sfdescription %][% END %]</td>
                    <td>[% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod %][% END %]</td>
                    <td>[% IF ( subscription.nbofusers ) %][% subscription.nbofusers %][% END %]</td>
                    <td><span title="[% subscription.lastimport %]">[% subscription.lastimport | $KohaDates %]</span></td>
		    <td>[% FOREACH comment IN subscription.comments %][% comment.message %] ([% comment.nb %]) <br>[% END %]</td>

                    [% UNLESS search_only %]
                      <td>
                          <button onclick="mana_use([% subscription.id %])"> <i class="fa fa-inbox"></i> Use</button>
                          <input hidden type="text" id="selectedcomment">
                          <select>
                              <option selected disabled>Report mistake</option>
                              [% FOREACH comment IN subscription.comments %]
                                  <option class="actionreport1" value="[% comment.id %]" onclick="mana_increment('[% comment.id %]', 'resource_comment', 'nb')"> [% comment.message %] ([% comment.nb %])
                              [% END %]
                                  <option data-toggle="modal" onclick="($('#selected_id').val($('.rowid').val()))" data-target="#comment_box"> other
                          </select>
                          <button hidden class="actionreport2" hidden> Cancel</button>
                      </td>
                    [% END %]
                </tr>
            [% END %]
        [% END %]
    </tbody>
</table>

<div id="comment_box" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="display: none;">
    <div class="modal-dialog modal-lg" style="width: 30%">
        <div class="modal-content" style="">
            <div class="modal-header">
                <button type="button" id="commentCloseButton" class="closebtn" aria-hidden="true">×</button>
                <h3 id="mana_submit_comment"> Please enter a new commment (max 35 caracters)</h3>
            </div>
            <div class="modal-body">
                <form>
                    <input hidden id="selected_id" value="">
                    <input type="text" id="manamsg"> Comment:
                </form>
                <button id="CommentButton"> Comment </button>
            </div>
        </div>
    </div>
</div>




            [% ELSE %]
                <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
            [% END %]
            [% IF Koha.Preference('Mana') and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %]
                [% IF one_language_enabled==0 or mana_id %]
                    <div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Share the subscription with other librairies. Your email address will be associated to your sharing." data-target="#mana_share_modal" class="btn btn-default btn-sm"><i class="fa fa-share-alt"></i> Share</a></div>
                [% ELSE %]
                    <div class="btn-group" data-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing."><a class="btn btn-default btn-sm" onclick="share()"><i class="fa fa-share-alt"></i> Share</a></div>
                [% END %]
            [% END %]
        [% END %]

            <div class="modal-body">
                [% IF (mana_id) %]
                    <div class="alert">
                        <p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>
                    </div>
                [% END %]
                [% IF ( languages_loop ) %]
                    [% UNLESS ( one_language_enabled ) %]
                        <div class="rows">
                                <li><span class="label">Frequency: </span>
                            <ol>
                                <li><span class="label">Frequency : </span>
                                        [% frequency.description %]
                                </li>
                                <li><span class="label">Number pattern: </span>
                                    [% numberpattern.label %]
                                </li>
                            </ol>

                        <div class="rows">
                            <form method="get" id="mana_share_form" action="/cgi-bin/koha/serials/subscription-detail.pl" class="validated" >
                                <fieldset>
                                    <label for="mana_language">Language:</label>
                                    <select id="mana_language" name="mana_language">
                                        [% FOREACH languages_loo IN languages_loop %]
                                            [% IF ( languages_loo.group_enabled ) %]

Lines 12-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (+8 lines)
12	<div id="doc" class="yui-t7">	12	<div id="doc" class="yui-t7">
13	<div id="bd">	13	<div id="bd">
14	<div id="yui-main" class="sysprefs">	14	<div id="yui-main" class="sysprefs">
		15	[% IF ( Koha.Preference('Mana') == 2) %]
		16	<fieldset>
		17	<p><center> You haven't decided if you want to activate Mana Knowlede Base, please let us know by clicking<center></p>
		18	<a href=/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=request+to+mana+webservice><center>Here</center></a>
		19	</fieldset>
		20	[% END %]
		21
		22
15	<div class="yui-g"><h1>Koha administration</h1></div>	23	<div class="yui-g"><h1>Koha administration</h1></div>
16	<div class="yui-g">	24	<div class="yui-g">
17		25

Lines 51-59 Web services: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref (-3 / +9 lines)
51	-	51	-
52	- pref: Mana	52	- pref: Mana
53	choices:	53	choices:
54	yes: Enable	54	0: Disable
55	no: Disable	55	1: Enable
56	- request to Mana Webservice. Mana centralize commun information between other Koha to facilitate the creation of new subscriptions, vendors, report queries etc... You can search, share, import and comment the content of Mana.	56	2: No, let me think about it
		57	- request to Mana Webservice. Mana centralize commun information between other Koha to facilitate the creation of new subscriptions, vendors, report queries etc... You can search, share, import and comment the content of Mana. The informations shared with Mana KB are shared under the CC-0 license. More infos about CC-0 license on https://creativecommons.org/choose/zero/
		58	-
		59	- 'Fields automatically shared with mana'
		60	- pref: AutoShareWithMana
		61	multiple:
		62	subscription: Subscriptions
57	Reporting:	63	Reporting:
58	-	64	-
59	- Only return	65	- Only return

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/mana/mana-report-search-result.tt (+1 lines)
	1	[% INCLUDE 'mana/mana-report-search-result.inc' %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/mana/mana-subscription-search-result.tt (+1 lines)
	1	[% INCLUDE 'mana/mana-subscription-search-result.inc' %]

Lines 67-72 function load_group_subgroups () { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-7 / +285 lines)
67	}	67	}
68	}	68	}
69		69
		70	function share() {
		71	window.location="/cgi-bin/koha/reports/guided_reports.pl?phase=Save";
		72	}
		73
70	$(document).ready(function(){	74	$(document).ready(function(){
71	$('#limit').change(function() {	75	$('#limit').change(function() {
72	$('#limitselect').submit();	76	$('#limitselect').submit();
Lines 77-82 $(".goback").on("click",function(e){ Link Here
77	window.history.back();	81	window.history.back();
78	});	82	});
79		83
		84	$(".mana_search_button").on("click",function(){
		85	mana_search($(this).prev().val());
		86	});
		87
		88	$(".ShareButton").on("click", function(){
		89	if($(this).closest("tr").find(".report_notes").text().length < 20 \|\| $(this).closest("tr").find(".report_name").text().length < 20){
		90	$("#shared_infos").hide();
		91	$("#ManaShareButton").hide();
		92	$("#noterror").show();
		93	}
		94	else{
		95	$("#shared_id").html($(this).closest("tr").find(".report_id").text());
		96	$("#shared_name").html($(this).closest("tr").find(".report_name").text());
		97	$("#shared_sql").html($(this).closest("tr").find(".report_sql").val());
		98	$("#shared_type").html($(this).closest("tr").find(".report_type").text());
		99	$("#shared_group").html($(this).closest("tr").find(".report_group").text());
		100	$("#shared_notes").html($(this).closest("tr").find(".report_notes").text());
		101	}
		102	});
		103
		104	$('#search_form').submit(function () {
		105	return false;
		106	});
		107
80	$("#addColumn").on("click",function(){	108	$("#addColumn").on("click",function(){
81	addColumn();	109	addColumn();
82	});	110	});
Lines 240-246 $("#delColumn").on("click",function(){ Link Here
240	});	268	});
241	[% END %]	269	[% END %]
242	});	270	});
243	//]]>	271
		272	function mana_increment(mana_id, resourcename, fieldvalue, stepvalue = 1){
		273	$.ajax( {
		274	type: "POST",
		275	url: "/cgi-bin/koha/svc/mana/addvaluetofield",
		276	data: {id: mana_id, field: fieldvalue, resource: resourcename, step: stepvalue},
		277	datatype: "json",
		278	}).done( function() {
		279	}).fail( function(){ });
		280	}
		281
		282	function mana_use( mana_id ){
		283	$.ajax( {
		284	type:"POST",
		285	url: "/cgi-bin/koha/svc/mana/use",
		286	data: {id:mana_id, resource: 'report', saveinbase: 1},
		287	dataType: "json",
		288	})
		289	.done( function (result){
		290	window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&phase=Show%20SQL");
		291	})
		292	.fail( function ( foo, msg, longmsg){
		293	});
		294	}
		295
		296	function mana_search( textquery ){
		297	$.ajax({
		298	type: "POST",
		299	url: "/cgi-bin/koha/svc/mana/search",
		300	data: {biblionumber: $("#biblionumber").val(), resource: 'report', id: textquery, usecomments: 1},
		301	dataType: "html",
		302	})
		303	.done( function( result ) {
		304	$("#mana_search_result .modal-body").html(result);
		305	$("#mana_search_result_label").text("Results from Mana Knowledge Base");
		306	$("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
		307	"sPaginationType":"four_button",
		308	"autoWidth": false,
		309	"columnDefs": [
		310	{ "width": "35%", "targets": 1 }
		311	],
		312	"aoColumnDefs": [
		313	{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
		314	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
		315	{ 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
		316	]
		317	}));
		318	if($("td.dataTables_empty").length == 0){
		319	$("#mana_search").show();
		320	}
		321
		322	$( "select[class='actionreport1']" ).show();
		323	$( "button[class='actionreport2']" ).hide();
		324	$("#CommentButton").on("click", function(){
		325	var resource_type = "report";
		326	var target_id = $("#selected_id").val();
		327	var manamsg = $("#manamsg").val();
		328	mana_comment(target_id, manamsg, resource_type);
		329	$("#comment_box").modal("hide");
		330	});
		331
		332	$(".showbutton").on("click", function(){
		333	$(this).parent().hide();
		334	$(this).parent().next().show();
		335	});
336
337	$("a[class='hidebutton']").on("click", function(){
338	$(this).parent().hide();
339	$(this).parent().prev().show();
340	});
341
342	$("#commentCloseButton").on("click", function(){
343	$("#comment_box").modal("hide");
344	});
345
346	$(".actionreport1").on("click", function(){
347	$("#selectedcomment").val($(this).val());
348	$(this).parent("select").hide();
349	$(this).parent("select").next().show();
350	});
351
352	$(".actionreport2").on("click", function(){
353	$(this).hide();
354	$(this).prev().show();
355	mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
356	});
357	}).fail( function( result ){
358	});
359	}
360
361	function mana_comment( target_id, manamsg, resource_type ){
362	$.ajax( {
363	type: "POST",
364	url: "/cgi-bin/koha/svc/mana/share",
365	data: {message: manamsg, resource: resource_type , resource_id: target_id},
366	datatype: "json",
367	})
368	}
369
370
371
244	</script>	372	</script>
245	</head>	373	</head>
246	<body id="rep_guided_reports_start" class="rep">	374	<body id="rep_guided_reports_start" class="rep">
Lines 306-311 canned reports and writing custom SQL reports.</p> Link Here
306	</form>	434	</form>
307	[% END %]	435	[% END %]
308		436
		437	<div id="mana_search_result" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 100%; left:0%; margin-left: auto; display: none;">
		438	<div class="modal-dialog modal-lg">
		439	<div class="modal-content">
		440	<div class="modal-header">
		441	<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
		442	<h3 id="mana_search_result_label"> Mana Search</h3>
		443	</div>
		444	<div>
		445	<form id="search_form" style="margin-left: 5%">
		446	Please enter a few key words:
		447	<input type=text id=mana_search_field>
		448	<input type=button class="mana_search_button" value="Search">
		449	</form>
		450	<div class="modal-body">
		451	</div>
		452	</div>
		453	</div>
		454	</div>
		455	</div>
		456
		457
309	[% IF ( saved1 ) %]	458	[% IF ( saved1 ) %]
310	[% IF ( savedreports ) %]<h1>Saved reports</h1>	459	[% IF ( savedreports ) %]<h1>Saved reports</h1>
311		460
Lines 323-328 canned reports and writing custom SQL reports.</p> Link Here
323	<option value="">All</option>	472	<option value="">All</option>
324	</select>	473	</select>
325	</div>	474	</div>
		475	<div style="display:inline-block">
		476	[% IF (manamsg == 'success') %]
		477	<div id="mana_search" class="dialog message">
		478	<p> Shared successfully! Thanks for your help.</p>
		479	</div>
		480	[% ELSIF (manamsg == 'fail') %]
		481	<div id="mana_search" class="dialog message">
		482	<p> An error occured while sharing, please try again later.</p>
		483	</div>
		484	[% END %]
		485
		486	[% IF (Koha.Preference('Mana') == 1) %]
		487	<div id="mana_search" class="dialog message">
		488	<p> You want more reports? Check the Mana Knowledge Base <p> <a style="cursor:pointer" data-toggle="modal" data-target="#mana_search_result">Quick Search</a></p>
		489	</div>
		490	[% END %]
		491
		492	</script>
		493	<h1> [% savedreport.sql %]</h1>
326	<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">	494	<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
327	<input type="hidden" name="phase" value="Delete Multiple" />	495	<input type="hidden" name="phase" value="Delete Multiple" />
328	<table id="table_reports">	496	<table id="table_reports">
Lines 348-370 canned reports and writing custom SQL reports.</p> Link Here
348	<tbody>	516	<tbody>
349	[% FOREACH savedreport IN savedreports %]	517	[% FOREACH savedreport IN savedreports %]
350	[% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]	518	[% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
351	<td>	519	<td class="report_checkbox">
352	[% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->	520	[% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
353	<input type="checkbox" name="ids" value="[% savedreport.id %]" />	521	<input type="checkbox" name="ids" value="[% savedreport.id %]" />
354	[% END %]	522	[% END %]
		523	<input hidden class="report_sql" value="[% savedreport.savedsql %]">
355	</td>	524	</td>
356	<td><label for="ids">[% savedreport.id %]</label></td>	525	<td class="report_id"><label for="ids">[% savedreport.id %]</label></td>
357	<td>	526	<td class="report_name">
358	[% IF ( savedreport.report_name ) %]	527	[% IF ( savedreport.report_name ) %]
359	[% savedreport.report_name %]	528	[% savedreport.report_name %]
360	[% ELSE %]	529	[% ELSE %]
361	[ no name ]	530	[ no name ]
362	[% END %]	531	[% END %]
363	</td>	532	</td>
364	<td>[% savedreport.type %]</td>	533	<td class="report_type">[% savedreport.type %]</td>
365	<td>[% savedreport.groupname %]</td>	534	<td class="report_group">[% savedreport.groupname %]</td>
366	<td>[% savedreport.subgroupname %]</td>	535	<td>[% savedreport.subgroupname %]</td>
367	<td>[% savedreport.notes %]</td>	536	<td class="report_notes">[% savedreport.notes %]</td>
368	<td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>	537	<td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
369	<td><span title="[% savedreport.date_created %]">[% savedreport.date_created \| $KohaDates %]</span></td>	538	<td><span title="[% savedreport.date_created %]">[% savedreport.date_created \| $KohaDates %]</span></td>
370	<td><span title="[% savedreport.last_modified %]">[% savedreport.last_modified \| $KohaDates with_hours => 1 %]</span></td>	539	<td><span title="[% savedreport.last_modified %]">[% savedreport.last_modified \| $KohaDates with_hours => 1 %]</span></td>
Lines 396-401 canned reports and writing custom SQL reports.</p> Link Here
396	<li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a></li>	565	<li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a></li>
397	<li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&sql=[% savedreport.savedsql \|uri %]&reportname=[% savedreport.report_name \|uri %]&notes=[% savedreport.notes \|uri %]"><i class="fa fa-copy"></i> Duplicate</a></li>	566	<li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&sql=[% savedreport.savedsql \|uri %]&reportname=[% savedreport.report_name \|uri %]&notes=[% savedreport.notes \|uri %]"><i class="fa fa-copy"></i> Duplicate</a></li>
398	[% END %]	567	[% END %]
		568	[% IF (Koha.Preference('Mana') == 1) %]
		569	<li><a class="ShareButton" data-toggle="modal" href="#mana_share_report" title="Share your report with Mana Knowledge Base"><i class="fa fa-share-alt"></i> Share</a></li>
		570	[% END %]
399	<li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li>	571	<li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
400	[% IF ( CAN_user_reports_delete_reports ) %]	572	[% IF ( CAN_user_reports_delete_reports ) %]
401	<li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li>	573	<li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li>
Lines 408-413 canned reports and writing custom SQL reports.</p> Link Here
408	[% END %]	580	[% END %]
409	</tbody>	581	</tbody>
410	</table>	582	</table>
		583	</div>
411	[% IF ( CAN_user_reports_delete_reports ) %]	584	[% IF ( CAN_user_reports_delete_reports ) %]
412	<fieldset class="action">	585	<fieldset class="action">
413	<input type="submit" value="Delete selected" />	586	<input type="submit" value="Delete selected" />
Lines 448-453 canned reports and writing custom SQL reports.</p> Link Here
448	[% END %]	621	[% END %]
449	[% END %]	622	[% END %]
450		623
		624	<div id="mana_share_report" class="modal fade" tabindex="-1" role="dialog" arialabelledby="mana_share_modal_label" style="display: none;">
		625	<div class="modal-dialog">
		626	<div class="modal-content">
		627	<div class="modal-header">
		628	<h3 id="mana_share_modal_label">Share with Mana</h3>
		629	</div>
		630	<div class="modal-body">
		631	[% IF (mana_id) %]
		632	<div class="alert">
		633	<p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>
		634	</div>
		635	[% END %]
		636	[% IF ( languages_loop ) %]
		637	[% UNLESS ( one_language_enabled ) %]
		638	<label id="noteerror" type="hidden">Please enter a report name and descriptive note before sharing (minimum 20 characters)</label>
		639	<div id="shared_infos" class="rows">
		640	<li> <span class="label">Id: </span><div id="shared_id"></div>
		641	</li>
		642	<li> <span class="label">Name: </span><div id="shared_name"></div>
		643	</li>
		644	<li> <span class="label">SQL: </span><div id="shared_sql"></div>
		645	</li>
		646	<li> <span class="label">Group: </span><div id="shared_group"></div>
		647	</li>
		648	<li> <span class="label">Type: </span><div id="shared_type"></div>
		649	</li>
		650	<li> <span class="label">Notes: </span><div id="shared_notes"></div>
		651	</li>
		652
		653	</div>
		654	<div class="rows">
		655	<form method="post" id="mana_share_form" action="/cgi-bin/koha/reports/guided_reports.pl?phase=Share" class="validated" >
		656	<input type="hidden" name="phase" value="Share">
		657
		658	<fieldset>
		659	<label for="mana_language">Language:</label>
		660	<select id="mana_language" name="mana_language">
		661	[% FOREACH languages_loo IN languages_loop %]
		662	[% IF ( languages_loo.group_enabled ) %]
		663	[% IF ( languages_loo.plural ) %]
		664	[% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
		665	[% IF ( sublanguages_loo.enabled ) %]
		666	[% IF ( sublanguages_loo.sublanguage_current ) %]
		667	<option value="[% languages_loo.rfc4646_subtag %]" selected>
		668	[% sublanguages_loo.native_description %]
		669	[% sublanguages_loo.script_description %]
		670	[% sublanguages_loo.region_description %]
		671
		672	[% sublanguages_loo.variant_description %]
		673	([% sublanguages_loo.rfc4646_subtag %])
		674	</option>
		675	[% ELSE %]
		676	<option value="[% languages_loo.rfc4646_subtag %]">
		677	[% sublanguages_loo.native_description %]
		678	[% sublanguages_loo.script_description %]
		679	[% sublanguages_loo.region_description %]
		680	[% sublanguages_loo.variant_description %]
		681	([% sublanguages_loo.rfc4646_subtag %])
		682	</option>
		683	[% END %]
		684	[% END %]
		685	[% END %]
		686	[% ELSE %]
		687	[% IF ( languages_loo.group_enabled ) %]
688	[% IF ( languages_loo.current ) %]
689	<option value="[% languages_loo.rfc4646_subtag %]" selected>
690	[% IF ( languages_loo.native_description ) %]
691	[% languages_loo.native_description %]
692	[% ELSE %]
693	[% languages_loo.rfc4646_subtag %]
694	[% END %]
695	</option>
696	[% ELSE %]
697	<option value="[% languages_loo.rfc4646_subtag %]">
698	[% IF ( languages_loo.native_description ) %]
699	[% languages_loo.native_description %]
700	[% ELSE %]
701	[% languages_loo.rfc4646_subtag %]
702	[% END %]
703	</option>
704	[% END %]
705	[% END %]
706	[% END %]
707	[% END %]
708	[% END %]
709	</select>
710	<input type="hidden" id="reportid" name="reportid" value="[% savedreport.id %]"/>
711	</fieldset>
712	</form>
713	</div>
714	[% END %]
715	[% END %]
716	</div>
717	<div class="modal-footer">
718	<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
719	[% IF one_language_enabled==0 %]
720	<button id="ManaShareButton" type="submit" form="mana_share_form" class="btn btn-primary">Share</button>
721	[% ELSE %]
722	<div id="ManaShareButton" class="btn-group"><a class="btn btn-primary"'onclick="share()">Share</a></div>
723	[% END %]
724	</div>
725	</div>
726	</div>
727	</div>
728
451		729
452	[% IF ( build1 ) %]	730	[% IF ( build1 ) %]
453	[% IF ( cache_error) %]	731	[% IF ( cache_error) %]

Line 1 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/mana-subscription-search-result.tt (-1 lines)
1	[% INCLUDE 'mana-subscription-search-result.inc' %]

Lines 409-422 function mana_search() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-10 / +76 lines)
409	$.ajax({	409	$.ajax({
410	type: "POST",	410	type: "POST",
411	url: "/cgi-bin/koha/svc/mana/search",	411	url: "/cgi-bin/koha/svc/mana/search",
412	data: {biblionumber : $("#biblionumber").val()},	412	data: {id: $("#biblionumber").val(), resource: 'subscription', usecomments: 1},
413	dataType: "html",	413	dataType: "html",
414	})	414	})
415	.done( function( result ) {	415	.done( function( result ) {
416	$("#mana_search_result .modal-body").html(result);	416	$("#mana_search_result .modal-body").html(result);
417	$("#mana_search_result_label").text("Results from Mana");	417	$("#mana_search_result_label").text("Results from Mana Knowledge Base");
418	$("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {	418	$("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
419	"sPaginationType": "four_button",	419	"sPaginationType": "four_button",
		420	"order":[[4, "desc"], [5, "desc"]],
		421	"autoWidth": false,
		422	"columnDefs": [
		423	{ "width": "35%", "targets": 1 }
		424	],
420	"aoColumnDefs": [	425	"aoColumnDefs": [
421	{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },	426	{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
422	{ "sType": "title-string", "aTargets" : [ "title-string" ] },	427	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
Lines 426-442 function mana_search() { Link Here
426	if($("td.dataTables_empty").length == 0){	431	if($("td.dataTables_empty").length == 0){
427	$("#mana_search").show();	432	$("#mana_search").show();
428	}	433	}
		434	$( "select[class='actionreport1']" ).show();
		435	$( "button[class='actionreport2']" ).hide();
		436
		437	$("#CommentButton").on("click", function(){
		438	var resource_type = "subscription";
		439	var target_id = $("#selected_id").val();
		440	var manamsg = $("#manamsg").val();
		441	mana_comment(target_id, manamsg, resource_type);
		442	$("#comment_box").modal("hide");
		443	});
		444
		445	$("#commentCloseButton").on("click", function(){
		446	$("#comment_box").modal("hide");
		447	});
		448
		449	$(".actionreport1").on("click", function(){
		450	$("#selectedcomment").val($(this).val());
		451	$(this).parent("select").hide();
		452	$(this).parent("select").next().show();
		453	});
		454
		455	$(".actionreport2").on("click", function(){
		456	$(this).hide();
		457	$(this).prev().show();
		458	mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
		459	});
		460
429	}).fail(function(result){	461	}).fail(function(result){
430	});	462	});
431	}	463	}
432		464
		465	function mana_comment( target_id, manamsg, resource_type ){
		466	$.ajax( {
		467	type: "POST",
		468	url: "/cgi-bin/koha/svc/mana/share",
		469	data: {message: manamsg, resource: resource_type , resource_id: target_id},
		470	datatype: "json",
		471	})
		472	}
		473
		474	function mana_increment(mana_id, resource, fieldvalue, stepvalue = 1){
		475	$.ajax( {
		476	type: "POST",
		477	url: "/cgi-bin/koha/svc/mana/addvaluetofield",
		478	data: {id: mana_id, resource: resource, field: fieldvalue, step: stepvalue},
		479	datatype: "json",
		480	})
		481	}
		482
433	function mana_use(mana_id){	483	function mana_use(mana_id){
434	$("tr").removeClass("selected");	484	$("tr").removeClass("selected");
435	$("#row"+mana_id).addClass("selected");	485	$("#row"+mana_id).addClass("selected");
436	$.ajax( {	486	$.ajax( {
437	type: "POST",	487	type: "POST",
438	url: "/cgi-bin/koha/svc/mana/use",	488	url: "/cgi-bin/koha/svc/mana/use",
439	data: {id : mana_id},	489	data: {id: mana_id, resource: 'subscription'},
440	dataType: "json",	490	dataType: "json",
441	})	491	})
442	.done(function(result){	492	.done(function(result){
Lines 511-516 function removeDisabledAttr() { Link Here
511		561
512		562
513	$(document).ready(function() {	563	$(document).ready(function() {
		564
		565
		566
		567
		568	mana_search();
		569	$("#myid").on("click", function(){
		570	debugger;
		571	})
514	$("#displayexample").hide();	572	$("#displayexample").hide();
515	$("#mana_search_result").modal("hide");	573	$("#mana_search_result").modal("hide");
516	$("#aqbooksellerid").on('keypress', function(e) {	574	$("#aqbooksellerid").on('keypress', function(e) {
Lines 619-625 $(document).ready(function() { Link Here
619	});	677	});
620	$("#subscription_add_next").on("click",function(){	678	$("#subscription_add_next").on("click",function(){
621	if ( Check_page1() ) {	679	if ( Check_page1() ) {
622	[% IF Koha.Preference('Mana') %]	680	[% IF Koha.Preference('Mana')== 1 %]
623	mana_search();	681	mana_search();
624	[% END %]	682	[% END %]
625	show_page_2();	683	show_page_2();
Lines 649-654 $(document).ready(function() { Link Here
649	e.preventDefault();	707	e.preventDefault();
650	testPredictionPattern();	708	testPredictionPattern();
651	});	709	});
		710
		711
652	});	712	});
653	//]]>	713	//]]>
654	</script>	714	</script>
Lines 845-852 $(document).ready(function() { Link Here
845		905
846	<div id="page_2">	906	<div id="page_2">
847	<div class="yui-u first">	907	<div class="yui-u first">
		908	[% IF ( Koha.Preference('Mana') == 2) %]
		909	<fieldset>
		910	<p><center>You haven't activated the Mana Knowledge Base, click
		911	<a href=/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=request+to+mana+webservice>here</a>
		912	to configure.</center></p>
		913	</fieldset>
		914	[% END %]
		915
848	<div id="mana_search" class="dialog message">	916	<div id="mana_search" class="dialog message">
849	<p>Frequency and Numbering pattern have been already proposed for this subscription on Mana. To show results, click <a style="cursor:pointer" data-toggle="modal" data-target="#mana_search_result">Here</a></p>	917	<p>Subscription found on Mana Knowledge Base:</p><p> <a style="cursor:pointer" data-toggle="modal" data-target="#mana_search_result">Quick fill</a></p>
850	</div>	918	</div>
851	<div id="subscription_form_planning">	919	<div id="subscription_form_planning">
852	<fieldset class="rows">	920	<fieldset class="rows">
Lines 1134-1150 $(document).ready(function() { Link Here
1134	</div>	1202	</div>
1135	</div>	1203	</div>
1136		1204
1137	<div id="mana_search_result" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 90%; left:5%; margin-left: auto; display: none;">	1205	<div id="mana_search_result" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 100%; left:0%; margin-left: auto; display: none;">
1138	<div class="modal-dialog modal-lg">	1206	<div class="modal-dialog modal-lg">
1139	<div class="modal-content">	1207	<div class="modal-content">
1140	<div class="modal-header">	1208	<div class="modal-header">
		1209	<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
1141	<h3 id="mana_search_result_label"></h3>	1210	<h3 id="mana_search_result_label"></h3>
1142	</div>	1211	</div>
1143	<div class="modal-body">	1212	<div class="modal-body">
1144	</div>	1213	</div>
1145	<div class="modal-footer">
1146	<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
1147	</div>
1148	</div>	1214	</div>
1149	</div>	1215	</div>
1150	</div>	1216	</div>




use Koha::BiblioFrameworks;
use Koha::Libraries;
use Koha::Patron::Categories;
use Koha::SharedContent;

=head1 NAME


        $report->{results} = C4::Reports::Guided::get_results( $report->{id} );
    }
    $template->param(
        'manamsg' => $input->param('manamsg')||'',
        'saved1' => 1,
        'savedreports' => $reports,
        'usecache' => $usecache,


elsif ( $phase eq 'Save' ) {
    # Save the report that has just been built
    my $area = $input->param('area');
    my $sql  = $input->param('sql');
    my $type = $input->param('type');
    $template->param(

                    cache_expiry   => $cache_expiry,
                    public         => $public,
                } );

                logaction( "REPORTS", "ADD", $id, "$name | $sql" ) if C4::Context->preference("ReportsLog");
            $template->param(
                'save_successful' => 1,

    }
}

elsif ($phase eq 'Share'){
    my $result = Koha::SharedContent::manaShareInfos($input, $borrowernumber, $input->param('reportid'), 'report');
    if ( $result and ($result->{code} eq "200" or $result->{code} eq "201") ) {
        print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=success");
    }else{
        print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=fail");
    }
}
elsif ($phase eq 'Run this report'){
    # execute a saved report
    my $limit      = $input->param('limit') || 20;

Lines 375-381 sub redirect_add_subscription { Link Here

(-)a/serials/subscription-add.pl (-3 / +6 lines)
375	my $mana_id;	375	my $mana_id;
376	if ( $query->param('mana_id') ne "" ) {	376	if ( $query->param('mana_id') ne "" ) {
377	$mana_id = $query->param('mana_id');	377	$mana_id = $query->param('mana_id');
378	Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);	378	Koha::SharedContent::manaIncrementRequest("subscription",$mana_id, "nbofusers");
379	}	379	}
380	else {	380	else {
381	$mana_id = undef;	381	$mana_id = undef;
Lines 402-408 sub redirect_add_subscription { Link Here
402	$staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,	402	$staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
403	$skip_serialseq, $mana_id	403	$skip_serialseq, $mana_id
404	);	404	);
405		405	if ( grep { $_ eq "subscription" } split(/,/, C4::Context->preference('AutoShareWithMana')) ){
		406	my $result = Koha::SharedContent::manaShareInfos( $query, $loggedinuser, $subscriptionid, 'subscription');
		407	$template->param( mana_code => $result->{code} );
		408	}
406	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );	409	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
407	insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );	410	insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );
408		411
Lines 462-468 sub redirect_mod_subscription { Link Here
462	my $mana_id;	465	my $mana_id;
463	if ( defined( $query->param('mana_id') ) ) {	466	if ( defined( $query->param('mana_id') ) ) {
464	$mana_id = $query->param('mana_id');	467	$mana_id = $query->param('mana_id');
465	Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);	468	Koha::SharedContent::manaIncrementRequest("subscription",$mana_id, "nbofusers");
466	}	469	}
467	else {	470	else {
468	$mana_id = undef;	471	$mana_id = undef;




    }
}
elsif ( $op and $op eq "share" ) {
    my $result = Koha::SharedContent::manaShareInfos($query, $loggedinuser, $subscriptionid, 'subscription');
    if ( $query->param('mana_language') ) {
        $mana_language = $query->param('mana_language');
    }
    else {
        $mana_language = C4::Context->preference('language');
    }

    my $mana_email;
    if ( $loggedinuser ne 0 ) {
        my $borrower = Koha::Patrons->find($loggedinuser);
        $mana_email = $borrower->email
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
        $mana_email = $borrower->emailpro
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
        $mana_email =
          Koha::Libraries->find( C4::Context->userenv->{'branch'} )->branchemail
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
    }
    $mana_email = C4::Context->preference('KohaAdminEmailAddress')
      if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
    my %versions = C4::Context::get_versions();

    my $mana_info = {
        language    => $mana_language,
        kohaversion => $versions{'kohaVersion'},
        exportemail => $mana_email
    };
    my $sub_mana_info = Koha::Subscription::get_sharable_info($subscriptionid);
    $sub_mana_info = { %$sub_mana_info, %$mana_info };
    my $result = Koha::SharedContent::manaPostRequest( "subscription",
        $sub_mana_info );
    if ( $result->{code} eq "200" and $result->{code} eq "201" ) {
        my $subscription = Koha::Subscriptions->find($subscriptionid);
        $subscription->set( { mana_id => $result->{id} } )->store;
        $subs->{mana_id} = $result->{id};
    }
    $template->param( mana_code => $result->{code} );
    $subs->{mana_id} = $result->{id};
}

my $hasRouting = check_routing($subscriptionid);




#!/usr/bin/perl

# Copyright 2017 BibLibre Baptiste Wojtkowski
#
# 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 Koha::SharedContent;
use C4::Auth qw(check_cookie_auth);

use CGI;
use JSON;


my $input = new CGI;
binmode STDOUT, ":encoding(UTF-8)";
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $input->cookie('CGISESSID'),
    { serials => 'create_subscription' } );

if ( $auth_status ne "ok" ) {
    exit 0;
}
my $result = Koha::SharedContent::manaIncrementRequest($input->param('resource'), $input->param('id'), $input->param('field'), $input->param('step') );
return $result;




# along with Koha; if not, see <http://www.gnu.org/licenses>.
#

use Modern::Perl;
use warnings;

use Koha::SharedContent;
use Koha::Subscription;

    exit 0;
}

my $templatename;
$templatename = "mana/mana-".$input->param( "resource" )."-search-result.tt";

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => $templatename,
        query           => $input,
        type            => "intranet",
        authnotrequired => 0,

    }
);

my ($identifier, $sub_mana_info);
$identifier = $input->param('id');
$template->param( lowWarned => 5, warned => 10, highWarned => 20);
my $package = "Koha::".ucfirst($input->param( 'resource' ));
$sub_mana_info = $package->get_search_info($identifier);

$sub_mana_info->{ usecomments } = $input->param('usecomments');
my $resourcename = $input->param('resource');
my $result = Koha::SharedContent::manaGetRequest( $resourcename, $sub_mana_info);
my $nbofcomment;
foreach my $resource (@{ $result->{data} }){
    $nbofcomment = 0;
    foreach my $comment (@{ $resource->{comments} }){
        $nbofcomment += $comment->{nb};
    }
    $resource->{nbofcomment} = $nbofcomment;
}

$template->param( $input->param('resource')."s" => $result->{data} );
my $result =
  Koha::SharedContent::manaGetRequest( "subscription", $sub_mana_info );
$template->param( subscriptions => $result->{data} );

output_with_http_headers $input, $cookie, $template->output, 'json';




#!/usr/bin/perl

# Copyright 2017 BibLibre Baptiste Wojtkowski
#
# 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 Koha::SharedContent;
use C4::Auth qw(check_cookie_auth);

use CGI;
use JSON;


my $input = new CGI;
binmode STDOUT, ":encoding(UTF-8)";
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $input->cookie('CGISESSID'),
    { serials => 'create_subscription' } );

if ( $auth_status ne "ok" ) {
    exit 0;
}


my $content;
$content->{resource_id} = $input->param("resource_id");
$content->{resource_type} = $input->param("resource");
$content->{message} = $input->param("message");
Koha::SharedContent::manaPostRequest('resource_comment', $content);

Lines 18-28 Link Here

(-)a/svc/mana/use (-8 / +12 lines)
18	# along with Koha; if not, see <http://www.gnu.org/licenses>.	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
19	#	19	#
20		20
21	use strict;	21	use Modern::Perl;
22	use warnings;
23		22
24	use Koha::SharedContent;	23	use Koha::SharedContent;
25	use C4::Auth qw(check_cookie_auth);	24	use C4::Auth qw(check_cookie_auth);
		25	use Koha::Report;
26		26
27	use CGI;	27	use CGI;
28	use JSON;	28	use JSON;
Lines 40-48 if ( $auth_status ne "ok" ) { Link Here
40	exit 0;	40	exit 0;
41	}	41	}
42		42
43	my $result = Koha::SharedContent::manaGetRequestWithId("subscription", $input->param('id') );	43	my $result = Koha::SharedContent::manaGetRequestWithId($input->param('resource'), $input->param('id') );
		44	my $package = "Koha::".ucfirst($input->param('resource'));
		45	my $resource;
44		46
45	my $subscription;	47	if ( $input->param( 'saveinbase' )) {
46	$subscription = $result->{data};	48	$resource = { id => $package->new_from_mana($result->{data})->id };
47		49	}
48	print(to_json($subscription));	50	else{
		51	$resource = $result->{data};
		52	}
		53	print(to_json($resource));
49	-

Return to bug 17047

Line 0 Link Here

(-)a/Koha/Report.pm (+82 lines)
		1	package Koha::Report;
		2
		3	# Copyright 2017 Biblibre Baptiste Wojtkowski
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 3 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License along
		17	# with Koha; if not, write to the Free Software Foundation, Inc.,
		18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		19
		20	use Modern::Perl;
		21
		22	use Carp;
		23
		24	use Koha::Database;
		25	use JSON;
		26	use Koha::Reports;
		27
		28	use base qw(Koha::Object);
		29
		30	=head1 NAME
		31
		32	Koha::Report - Koha Report Object Class
		33
		34	=head1 Ap
		35
		36	=head2 Class Methods
		37
		38	=cut
		39
		40	=head3 type
		41
		42	=cut
		43
		44	sub get_search_info {
		45	my $self=shift;
		46	my $sub_mana_info = { 'query' => shift };
		47	return $sub_mana_info;
		48	}
		49
		50	sub get_sharable_info{
		51	my $self=shift;
		52	my $shared_report_id=shift;
		53	my $report = Koha::Reports->find($shared_report_id);
		54	my $sub_mana_info = {
		55	'savedsql' => $report->savedsql,
		56	'report_name' => $report->report_name,
		57	'notes' => $report->notes,
		58	'report_group' => $report->report_group,
		59	'type' => $report->type,
		60	};
		61	return $sub_mana_info;
		62	}
		63
		64	sub new_from_mana{
65	my $self = shift;
66	my $data = shift;
67	delete $data->{exportemail};
68	delete $data->{kohaversion};
69	delete $data->{creationdate};
70	delete $data->{lastimport};
71	$data->{mana_id} = $data->{id};
72	delete $data->{id};
73	delete $data->{nbofusers};
74	delete $data->{language};
75	Koha::Report->new($data)->store;
76	}
77
78	sub _type {
79	return 'SavedSql';
80	}
81
82	1;

Line 0 Link Here

(-)a/Koha/Reports.pm (+58 lines)
	1	package Koha::Reports;
	2
	3	# Copyright 2017 Biblibre Baptiste Wojtkowski
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 3 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21
	22	use Carp;
	23
	24	use Koha::Database;
	25
	26	use Koha::Report;
	27
	28	use base qw(Koha::Objects);
	29
	30	=head1 NAME
	31
	32	Koha::Serial - Koha Serial Object class
	33
	34	=head1 API
	35
	36	=head2 Class Methods
	37
	38	=cut
	39
	40	=head3 type
	41
	42	=cut
	43
	44	sub _type {
	45	return 'SavedSql';
	46	}
	47
	48	sub object_class {
	49	return 'Koha::Report';
	50	}
	51
	52	=head1 AUTHOR
	53
	54	Kyle M Hall <kyle@bywatersolutions.com>
	55
	56	=cut
	57
	58	1;

Lines 1-46 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana-subscription-search-result.inc (-46 lines)
1	[% USE KohaDates %]
2	<table id="mana_results_datatable">
3	<thead>
4	<tr>
5	<th>ISSN</th>
6	<th class="anti-the">Title</th>
7	<th>Frequency</th>
8	<th>Numbering pattern</th>
9	<th class="NoSort">Number of users</th>
10	<th class="title-string">Last Import</th>
11	[% UNLESS search_only %]
12	<th class="NoSort">Actions</th>
13	[% END %]
14	</tr>
15	</thead>
16	<tfoot>
17	<tr>
18	<td><input type="text" class="dt-filter" data-column_num="0" placeholder="Search ISSN" /></td>
19	<td><input type="text" class="dt-filter" data-column_num="1" placeholder="Search title" /></td>
20	<td><input type="text" class="dt-filter" data-column_num="2" placeholder="Search frequency" /></td>
21	<td><input type="text" class="dt-filter" data-column_num="3" placeholder="Search numbering pattern" /></td>
22	<td></td>
23	<td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search last import" /></td>
24	[% UNLESS search_only %]
25	<td></td>
26	[% END %]
27	</tr>
28	</tfoot>
29	<tbody>
30	[% FOREACH subscription IN subscriptions %]
31	[% UNLESS subscription.cannotdisplay %]
32	<tr id="row[% subscription.subscriptionid %]">
33	<td>[% IF ( subscription.issn ) %][% subscription.issn %][% END %]</td>
34	<td>[% subscription.title %]</a></td>
35	<td>[% IF ( subscription.sfdescription ) %][% subscription.sfdescription %][% END %]</td>
36	<td>[% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod %][% END %]</td>
37	<td>[% IF ( subscription.nbofusers ) %][% subscription.nbofusers %][% END %]</td>
38	<td><span title="[% subscription.lastimport %]">[% subscription.lastimport \| $KohaDates %]</span></td>
39	[% UNLESS search_only %]
40	<td><a style="cursor:pointer" onclick="mana_use([% subscription.id %])"> <i class="fa fa-inbox"></i> Use</a></td>
41	[% END %]
42	</tr>
43	[% END %]
44	[% END %]
45	</tbody>
46	</table>

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc (+83 lines)
		1	[% USE KohaDates %]
		2	[% USE Koha %]
		3	[% USE AuthorisedValues %]
		4	[% USE Branches %]
		5
		6	<table id="mana_results_datatable" width=100%>
		7	<thead>
		8	<tr>
		9	<th>Report Name</th>
		10	<th class="anti-the" width=35%>Notes</th>
		11	<th>Type</th>
		12	<th title="number of libraries using this pattern"># of users</th>
		13	<th class="title-string" title="last time a library used this pattern">Last import</th>
		14	<th> Comments </th>
		15	[% UNLESS search_only %]
		16	<th class="NoSort">Actions</th>
		17	[% END %]
		18	</tr>
		19	</thead>
		20	<tbody>
		21	[% FOREACH report IN reports %]
		22	[% UNLESS report.cannotdisplay %]
		23	<tr id="row[% report.id %]"
		24	[% IF report.nbofcomment > highWarned %]
		25	class = "high-warned-row"
		26	[% ELSIF report.nbofcomment > warned %]
		27	class = "warned-row"
		28	[% ELSIF report.nbofcomment > lowWarned %]
		29	class = "highlighted-row"
		30	[% END %]
		31	>
		32	<input hidden class="rowid" value="[% report.id %]">
		33	<td>[% IF ( report.report_name ) %][% report.report_name %][% END %]</td>
		34	<td title="[% report.savedsql %]"><div>
		35	[% IF report.notes.length > 200 %]
		36	[% report.notes.substr(0,200) %]<a class="showbutton">Show More</a></div><div hidden>
		37	[% END %]
		38	[% report.notes %]
		39	[% IF report.notes.length > 200 %]
		40	<a class="hidebutton">Show Less</a></div> </td>
		41	[% END %]
		42	<td> [% report.type %] </td>
		43	<td>[% IF ( report.nbofusers ) %][% report.nbofusers %][% END %]</td>
		44	<td><span title="[% report.lastimport %]">[% report.lastimport \| $KohaDates %]</span></td>
		45	<td>[% FOREACH comment IN report.comments %][% comment.message %] ([% comment.nb %]) <br>[% END %]</td>
		46
		47	[% UNLESS search_only %]
		48	<td>
		49	<button onclick="mana_use([% report.id %])"> <i class="fa fa-inbox"></i> Use</button>
		50	<input hidden type="text" id="selectedcomment">
		51	<select>
		52	<option selected disabled>Report mistake</option>
		53	[% FOREACH comment IN report.comments %]
		54	<option class="actionreport1" value="[% comment.id %]" onclick="mana_increment('[% comment.id %]', 'resource_comment', 'nb')"> [% comment.message %] ([% comment.nb %])
		55	[% END %]
		56	<option data-toggle="modal" onclick="($('#selected_id').val($('.rowid').val()))" data-target="#comment_box"> other
		57	</select>
		58	<button hidden class="actionreport2" hidden> Cancel</button>
		59	</td>
		60	[% END %]
		61	</tr>
		62	[% END %]
		63	[% END %]
		64	</tbody>
65	</table>
66
67	<div id="comment_box" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="display: none;">
68	<div class="modal-dialog modal-lg" style="width: 30%">
69	<div class="modal-content" style="">
70	<div class="modal-header">
71	<button type="button" id="commentCloseButton" class="closebtn" aria-hidden="true">×</button>
72	<h3 id="mana_submit_comment"> Please enter a new commment (max 35 caracters)</h3>
73	</div>
74	<div class="modal-body">
75	<form>
76	<input hidden id="selected_id" value="">
77	<input type="text" id="manamsg">
78	</form>
79	<button id="CommentButton"> Comment </button>
80	</div>
81	</div>
82	</div>
83	</div>

Lines 37-42 use Koha::AuthorisedValues; Link Here

(-)a/reports/guided_reports.pl (-1 / +12 lines)
37	use Koha::BiblioFrameworks;	37	use Koha::BiblioFrameworks;
38	use Koha::Libraries;	38	use Koha::Libraries;
39	use Koha::Patron::Categories;	39	use Koha::Patron::Categories;
		40	use Koha::SharedContent;
40		41
41	=head1 NAME	42	=head1 NAME
42		43
Lines 117-122 elsif ( $phase eq 'Build new' ) { Link Here
117	$report->{results} = C4::Reports::Guided::get_results( $report->{id} );	118	$report->{results} = C4::Reports::Guided::get_results( $report->{id} );
118	}	119	}
119	$template->param(	120	$template->param(
		121	'manamsg' => $input->param('manamsg')\|\|'',
120	'saved1' => 1,	122	'saved1' => 1,
121	'savedreports' => $reports,	123	'savedreports' => $reports,
122	'usecache' => $usecache,	124	'usecache' => $usecache,
Lines 511-517 elsif ( $phase eq 'Build report' ) { Link Here
511		513
512	elsif ( $phase eq 'Save' ) {	514	elsif ( $phase eq 'Save' ) {
513	# Save the report that has just been built	515	# Save the report that has just been built
514	my $area = $input->param('area');	516	my $area = $input->param('area');
515	my $sql = $input->param('sql');	517	my $sql = $input->param('sql');
516	my $type = $input->param('type');	518	my $type = $input->param('type');
517	$template->param(	519	$template->param(
Lines 615-620 elsif ( $phase eq 'Save Report' ) { Link Here
615	cache_expiry => $cache_expiry,	617	cache_expiry => $cache_expiry,
616	public => $public,	618	public => $public,
617	} );	619	} );
		620
618	logaction( "REPORTS", "ADD", $id, "$name \| $sql" ) if C4::Context->preference("ReportsLog");	621	logaction( "REPORTS", "ADD", $id, "$name \| $sql" ) if C4::Context->preference("ReportsLog");
619	$template->param(	622	$template->param(
620	'save_successful' => 1,	623	'save_successful' => 1,
Lines 625-630 elsif ( $phase eq 'Save Report' ) { Link Here
625	}	628	}
626	}	629	}
627		630
		631	elsif ($phase eq 'Share'){
		632	my $result = Koha::SharedContent::manaShareInfos($input, $borrowernumber, $input->param('reportid'), 'report');
		633	if ( $result and ($result->{code} eq "200" or $result->{code} eq "201") ) {
		634	print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=success");
		635	}else{
		636	print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=fail");
		637	}
		638	}
628	elsif ($phase eq 'Run this report'){	639	elsif ($phase eq 'Run this report'){
629	# execute a saved report	640	# execute a saved report
630	my $limit = $input->param('limit') \|\| 20;	641	my $limit = $input->param('limit') \|\| 20;

Lines 100-143 if ($op eq 'del') { Link Here

(-)a/serials/subscription-detail.pl (-37 / +2 lines)
100	}	100	}
101	}	101	}
102	elsif ( $op and $op eq "share" ) {	102	elsif ( $op and $op eq "share" ) {
103	my $mana_language;	103	my $result = Koha::SharedContent::manaShareInfos($query, $loggedinuser, $subscriptionid, 'subscription');
104	if ( $query->param('mana_language') ) {
105	$mana_language = $query->param('mana_language');
106	}
107	else {
108	$mana_language = C4::Context->preference('language');
109	}
110
111	my $mana_email;
112	if ( $loggedinuser ne 0 ) {
113	my $borrower = Koha::Patrons->find($loggedinuser);
114	$mana_email = $borrower->email
115	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
116	$mana_email = $borrower->emailpro
117	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
118	$mana_email =
119	Koha::Libraries->find( C4::Context->userenv->{'branch'} )->branchemail
120	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
121	}
122	$mana_email = C4::Context->preference('KohaAdminEmailAddress')
123	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
124	my %versions = C4::Context::get_versions();
125
126	my $mana_info = {
127	language => $mana_language,
128	kohaversion => $versions{'kohaVersion'},
129	exportemail => $mana_email
130	};
131	my $sub_mana_info = Koha::Subscription::get_sharable_info($subscriptionid);
132	$sub_mana_info = { %$sub_mana_info, %$mana_info };
133	my $result = Koha::SharedContent::manaPostRequest( "subscription",
134	$sub_mana_info );
135	if ( $result->{code} eq "200" and $result->{code} eq "201" ) {
136	my $subscription = Koha::Subscriptions->find($subscriptionid);
137	$subscription->set( { mana_id => $result->{id} } )->store;
138	$subs->{mana_id} = $result->{id};
139	}
140	$template->param( mana_code => $result->{code} );	104	$template->param( mana_code => $result->{code} );
		105	$subs->{mana_id} = $result->{id};
141	}	106	}
142		107
143	my $hasRouting = check_routing($subscriptionid);	108	my $hasRouting = check_routing($subscriptionid);

Line 0 Link Here

(-)a/svc/mana/addvaluetofield (+42 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2017 BibLibre Baptiste Wojtkowski
	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
	21	use Modern::Perl;
	22
	23	use Koha::SharedContent;
	24	use C4::Auth qw(check_cookie_auth);
	25
	26	use CGI;
	27	use JSON;
	28
	29
	30	my $input = new CGI;
	31	binmode STDOUT, ":encoding(UTF-8)";
	32	print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
	33
	34	my ( $auth_status, $sessionID ) =
	35	check_cookie_auth( $input->cookie('CGISESSID'),
	36	{ serials => 'create_subscription' } );
	37
	38	if ( $auth_status ne "ok" ) {
	39	exit 0;
	40	}
	41	my $result = Koha::SharedContent::manaIncrementRequest($input->param('resource'), $input->param('id'), $input->param('field'), $input->param('step') );
	42	return $result;

Lines 18-25 Link Here

(-)a/svc/mana/search (-8 / +23 lines)
18	# along with Koha; if not, see <http://www.gnu.org/licenses>.	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
19	#	19	#
20		20
21	use strict;	21	use Modern::Perl;
22	use warnings;
23		22
24	use Koha::SharedContent;	23	use Koha::SharedContent;
25	use Koha::Subscription;	24	use Koha::Subscription;
Lines 39-47 if ( $auth_status ne "ok" ) { Link Here
39	exit 0;	38	exit 0;
40	}	39	}
41		40
		41	my $templatename;
		42	$templatename = "mana/mana-".$input->param( "resource" )."-search-result.tt";
		43
42	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	44	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
43	{	45	{
44	template_name => "serials/mana-subscription-search-result.tt",	46	template_name => $templatename,
45	query => $input,	47	query => $input,
46	type => "intranet",	48	type => "intranet",
47	authnotrequired => 0,	49	authnotrequired => 0,
Lines 52-62 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
52	}	54	}
53	);	55	);
54		56
55	my $biblionumber = $input->param('biblionumber');	57	my ($identifier, $sub_mana_info);
		58	$identifier = $input->param('id');
		59	$template->param( lowWarned => 5, warned => 10, highWarned => 20);
		60	my $package = "Koha::".ucfirst($input->param( 'resource' ));
		61	$sub_mana_info = $package->get_search_info($identifier);
		62
		63	$sub_mana_info->{ usecomments } = $input->param('usecomments');
		64	my $resourcename = $input->param('resource');
		65	my $result = Koha::SharedContent::manaGetRequest( $resourcename, $sub_mana_info);
		66	my $nbofcomment;
		67	foreach my $resource (@{ $result->{data} }){
		68	$nbofcomment = 0;
		69	foreach my $comment (@{ $resource->{comments} }){
		70	$nbofcomment += $comment->{nb};
		71	}
		72	$resource->{nbofcomment} = $nbofcomment;
		73	}
56		74
57	my $sub_mana_info = Koha::Subscription::get_search_info($biblionumber);	75	$template->param( $input->param('resource')."s" => $result->{data} );
58	my $result =
59	Koha::SharedContent::manaGetRequest( "subscription", $sub_mana_info );
60	$template->param( subscriptions => $result->{data} );
61		76
62	output_with_http_headers $input, $cookie, $template->output, 'json';	77	output_with_http_headers $input, $cookie, $template->output, 'json';

Line 0 Link Here

(-)a/svc/mana/share (+47 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2017 BibLibre Baptiste Wojtkowski
	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
	21	use Modern::Perl;
	22
	23	use Koha::SharedContent;
	24	use C4::Auth qw(check_cookie_auth);
	25
	26	use CGI;
	27	use JSON;
	28
	29
	30	my $input = new CGI;
	31	binmode STDOUT, ":encoding(UTF-8)";
	32	print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
	33
	34	my ( $auth_status, $sessionID ) =
	35	check_cookie_auth( $input->cookie('CGISESSID'),
	36	{ serials => 'create_subscription' } );
	37
	38	if ( $auth_status ne "ok" ) {
	39	exit 0;
	40	}
	41
	42
	43	my $content;
	44	$content->{resource_id} = $input->param("resource_id");
	45	$content->{resource_type} = $input->param("resource");
	46	$content->{message} = $input->param("message");
	47	Koha::SharedContent::manaPostRequest('resource_comment', $content);