Attachment #80909 for bug #17047

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

Lines 20-25 use Modern::Perl; Link Here

(-)a/Koha/Report.pm (+54 lines)
20	use Carp;	20	use Carp;
21		21
22	use Koha::Database;	22	use Koha::Database;
		23	use JSON;
		24	use Koha::Reports;
23		25
24	use base qw(Koha::Object);	26	use base qw(Koha::Object);
25		27
Lines 33-38 Koha::Report - Koha Report Object class Link Here
33		35
34	=cut	36	=cut
35		37
		38	=head3 get_search_info
		39
		40	Return search info
		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	=head3 get_sharable_info
		51
		52	Return properties that can be shared.
		53
		54	=cut
		55
		56	sub get_sharable_info {
		57	my $self=shift;
		58	my $shared_report_id=shift;
		59	my $report = Koha::Reports->find($shared_report_id);
		60	my $sub_mana_info = {
		61	'savedsql' => $report->savedsql,
		62	'report_name' => $report->report_name,
		63	'notes' => $report->notes,
		64	'report_group' => $report->report_group,
		65	'type' => $report->type,
		66	};
		67	return $sub_mana_info;
		68	}
		69
		70	=head3 new_from_mana
		71
		72	Clear a Mana report to be imported in Koha?
		73
		74	=cut
		75
		76	sub new_from_mana{
		77	my $self = shift;
		78	my $data = shift;
		79	delete $data->{exportemail};
		80	delete $data->{kohaversion};
		81	delete $data->{creationdate};
		82	delete $data->{lastimport};
		83	$data->{mana_id} = $data->{id};
		84	delete $data->{id};
		85	delete $data->{nbofusers};
		86	delete $data->{language};
		87	Koha::Report->new($data)->store;
		88	}
		89
36	=head3 _type	90	=head3 _type
37		91
38	Returns name of corresponding DBIC resultset	92	Returns name of corresponding DBIC resultset

Lines 55-58 sub object_class { Link Here

(-)a/Koha/Reports.pm (+6 lines)
55	return 'Koha::Report';	55	return 'Koha::Report';
56	}	56	}
57		57
		58	=head1 AUTHOR
		59
		60	Kyle M Hall <kyle@bywatersolutions.com>
		61
		62	=cut
		63
58	1;	64	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 116-121 sub remove_subscriber { Link Here

(-)a/Koha/Subscription.pm (+2 lines)
116	=cut	116	=cut
117		117
118	sub get_search_info {	118	sub get_search_info {
		119	my $self=shift;
119	my $searched_sub_id = shift;	120	my $searched_sub_id = shift;
120	my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );	121	my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
121	my $biblioitem =	122	my $biblioitem =
Lines 131-136 sub get_search_info { Link Here
131	}	132	}
132		133
133	sub get_sharable_info {	134	sub get_sharable_info {
		135	my $self = shift;
134	my $shared_sub_id = shift;	136	my $shared_sub_id = shift;
135	my $subscription = Koha::Subscriptions->find($shared_sub_id);	137	my $subscription = Koha::Subscriptions->find($shared_sub_id);
136	my $biblio = Koha::Biblios->find( $subscription->biblionumber );	138	my $biblio = Koha::Biblios->find( $subscription->biblionumber );

Lines 153-158 __PAZPAR2_TOGGLE_XML_POST__ Link Here

(-)a/etc/koha-conf.xml (+4 lines)
153	<!-- Path to the config file for SMS::Send -->	153	<!-- Path to the config file for SMS::Send -->
154	<sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>	154	<sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>
155		155
		156	<!-- URL of the mana KB server -->
		157	<!-- alternative value http://mana-test.koha-community.org to query the test server -->
		158	<mana_config>http://mana-kb.koha-community.org</mana_config>
		159
156	<!-- Configuration for Plack -->	160	<!-- Configuration for Plack -->
157	<plack_max_requests>50</plack_max_requests>	161	<plack_max_requests>50</plack_max_requests>
158	<plack_workers>2</plack_workers>	162	<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 63-68 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

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

Lines 714-719 ol { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+6 lines)
714	background-color: #FFD000 !important;	714	background-color: #FFD000 !important;
715	}	715	}
716		716
		717	.warned-row,
		718	.warned-row td { background-color: #FF9000 !important }
		719
		720	.high-warned-row,
		721	.high-warned-row td { background-color: #FF0000 !important }
		722
717	tbody {	723	tbody {
718	tr {	724	tr {
719	&:nth-child(odd) {	725	&:nth-child(odd) {




[% 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 ) %]




<div class="main container-fluid">
    <div class="row">
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
            [% IF ( Koha.Preference('Mana') == 2) %]
                <fieldset>
                    <p><center> You haven't decided if you want to activate Mana Knowlede Base, please let us know by clicking<center></p>
                    <a href=/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=request+to+mana+webservice><center>Here</center></a>
                </fieldset>
           [% END %]
        <h1>Koha administration</h1>
        <div class="row">
            <div class="col-md-6 sysprefs">

                <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
                <fieldset>
                    <h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>

Lines 63-71 Web services: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref (-3 / +9 lines)
63	-	63	-
64	- pref: Mana	64	- pref: Mana
65	choices:	65	choices:
66	yes: Enable	66	0: Disable
67	no: Disable	67	1: Enable
68	- 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.	68	2: No, let me think about it
		69	- 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/
		70	-
		71	- 'Fields automatically shared with mana'
		72	- pref: AutoShareWithMana
		73	multiple:
		74	subscription: Subscriptions
69	Reporting:	75	Reporting:
70	-	76	-
71	- Only return	77	- 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' %]




    </div>
[% END %]

<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;">
    <div class="modal-dialog modal-lg">
        <div class="modal-content">
            <div class="modal-header">
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
                <h3 id="mana_search_result_label"> Mana Search</h3>
            </div>
            <div>
                <form id="search_form" style="margin-left: 5%">
                    Please enter a few key words:
                    <input type=text id=mana_search_field>
                    <input type=button class="mana_search_button" value="Search">
                </form>
                <div class="modal-body">
                </div>
            </div>
        </div>
    </div>
</div>

[% IF ( saved1 ) %]
[% IF ( savedreports ) %]<h1>Saved reports</h1>


                <option value="">All</option>
            </select>
        </div>
<div style="display:inline-block">
    [% IF (manamsg == 'success') %]
     <div id="mana_search" class="dialog message">
        <p> Shared successfully! Thanks for your help.</p>
    </div>
    [% ELSIF (manamsg == 'fail') %]
     <div id="mana_search" class="dialog message">
        <p> An error occured while sharing, please try again later.</p>
    </div>
    [% END %]

   [% IF (Koha.Preference('Mana') == 1) %]
    <div id="mana_search" class="dialog message">
        <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>
    </div>
    [% END %]

</script>
<h1> [% savedreport.sql %]</h1>
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
<input type="hidden" name="phase" value="Delete Multiple" />
        <table id="table_reports">

            <tbody>
                [% FOREACH savedreport IN savedreports %]
                    [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
                        <td class="report_checkbox">
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
                                <input type="checkbox" name="ids" value="[% savedreport.id | html %]" />
                            [% END %]
                        <input hidden class="report_sql" value="[% savedreport.savedsql %]">
                        </td>
                        <td class="report_id"><label for="ids">[% savedreport.id | html %]</label></td>
                        <td class="report_name">
                            [% IF ( savedreport.report_name ) %]
                                [% savedreport.report_name | html %]
                            [% ELSE %]
                                [ no name ]
                            [% END %]
                        </td>
                        <td class="report_type">[% savedreport.type | html %]</td>
                        <td class="report_group">[% savedreport.groupname | html %]</td>
                        <td>[% savedreport.subgroupname | html %]</td>
                        <td class="report_notes">[% savedreport.notes | html %]</td>
                        <td>[% savedreport.borrowersurname | html %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname | html %][% END %] ([% savedreport.borrowernumber | html %])</td>
                        <td><span title="[% savedreport.date_created | html %]">[% savedreport.date_created | $KohaDates %]</span></td>
                        <td><span title="[% savedreport.last_modified | html %]">[% savedreport.last_modified | $KohaDates with_hours => 1 | html %]</span></td>

                                            <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&amp;phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a></li>
                                            <li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]"><i class="fa fa-copy"></i> Duplicate</a></li>
                                        [% END %]
                                        [% IF (Koha.Preference('Mana') == 1) %]
                                            <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>
                                        [% END %]
                                        <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id | html %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
                                        [% IF ( CAN_user_reports_delete_reports ) %]
                                            <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&amp;phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li>

                [% END %]
            </tbody>
        </table>
</div>
        [% IF ( CAN_user_reports_delete_reports ) %]
        <fieldset class="action">
            <input type="submit" value="Delete selected" />

[% END %]
[% END %]

<div id="mana_share_report" class="modal fade" tabindex="-1" role="dialog" arialabelledby="mana_share_modal_label" style="display: none;">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
                <h3 id="mana_share_modal_label">Share with Mana</h3>
            </div>
            <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 ) %]
                        <label id="noteerror" type="hidden">Please enter a report name and descriptive note before sharing (minimum 20 characters)</label>
                        <div id="shared_infos" class="rows">
                                <li> <span class="label">Id: </span><div id="shared_id"></div>
                                </li>
                                <li> <span class="label">Name: </span><div id="shared_name"></div>
                                </li>
                                <li> <span class="label">SQL: </span><div id="shared_sql"></div>
                                </li>
                                <li> <span class="label">Group: </span><div id="shared_group"></div>
                                </li>
                                <li> <span class="label">Type: </span><div id="shared_type"></div>
                                </li>
                                <li> <span class="label">Notes: </span><div id="shared_notes"></div>
                                </li>

                        </div>
                        <div class="rows">
                            <form method="post" id="mana_share_form" action="/cgi-bin/koha/reports/guided_reports.pl?phase=Share" class="validated" >
                                <input type="hidden" name="phase" value="Share">

                                <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 ) %]
                                                [% IF ( languages_loo.plural ) %]
                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
                                                        [% IF ( sublanguages_loo.enabled ) %]
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
                                                                <option value="[% languages_loo.rfc4646_subtag %]" selected>
                                                                    [% sublanguages_loo.native_description %]
                                                                    [% sublanguages_loo.script_description %]
                                                                    [% sublanguages_loo.region_description %]

                                                                    [% sublanguages_loo.variant_description %]
                                                                    ([% sublanguages_loo.rfc4646_subtag %])
                                                                </option>
                                                            [% ELSE %]
                                                                <option value="[% languages_loo.rfc4646_subtag %]">
                                                                    [% sublanguages_loo.native_description %]
                                                                    [% sublanguages_loo.script_description %]
                                                                    [% sublanguages_loo.region_description %]
                                                                    [% sublanguages_loo.variant_description %]
                                                                    ([% sublanguages_loo.rfc4646_subtag %])
                                                                </option>
                                                            [% END %]
                                                        [% END %]
                                                    [% END %]
                                                [% ELSE %]
                                                    [% IF ( languages_loo.group_enabled ) %]
                                                        [% IF ( languages_loo.current ) %]
                                                            <option value="[% languages_loo.rfc4646_subtag %]" selected>
                                                                [% IF ( languages_loo.native_description ) %]
                                                                    [% languages_loo.native_description %]
                                                                [% ELSE %]
                                                                    [% languages_loo.rfc4646_subtag %]
                                                                [% END %]
                                                            </option>
                                                        [% ELSE %]
                                                            <option value="[% languages_loo.rfc4646_subtag %]">
                                                                [% IF ( languages_loo.native_description ) %]
                                                                    [% languages_loo.native_description %]
                                                                [% ELSE %]
                                                                    [% languages_loo.rfc4646_subtag %]
                                                                [% END %]
                                                            </option>
                                                        [% END %]
                                                    [% END %]
                                                [% END %]
                                            [% END %]
                                        [% END %]
                                    </select>
                                    <input type="hidden" id="reportid" name="reportid" value="[% savedreport.id %]"/>
                                </fieldset>
                            </form>
                        </div>
                    [% END %]
                [% END %]
            </div>
            <div class="modal-footer">
                <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
                [% IF one_language_enabled==0 %]
                    <button id="ManaShareButton" type="submit" form="mana_share_form" class="btn btn-primary">Share</button>
                [% ELSE %]
                    <div id="ManaShareButton" class="btn-group"><a class="btn btn-primary"'onclick="share()">Share</a></div>
                [% END %]
            </div>
        </div>
    </div>
</div>


[% IF ( build1 ) %]
[% IF ( cache_error) %]

            }
        }

        function share() {
            window.location="/cgi-bin/koha/reports/guided_reports.pl?phase=Save";
        }

        $(document).ready(function(){

            hide_bar_element();

                window.history.back();
            });

            $(".mana_search_button").on("click",function(){
                mana_search($(this).prev().val());
            });

            $(".ShareButton").on("click", function(){
                if($(this).closest("tr").find(".report_notes").text().length < 20 || $(this).closest("tr").find(".report_name").text().length < 20){
                    $("#shared_infos").hide();
                    $("#ManaShareButton").hide();
                    $("#noterror").show();
                }
                else{
                    $("#shared_id").html($(this).closest("tr").find(".report_id").text());
                    $("#shared_name").html($(this).closest("tr").find(".report_name").text());
                    $("#shared_sql").html($(this).closest("tr").find(".report_sql").val());
                    $("#shared_type").html($(this).closest("tr").find(".report_type").text());
                    $("#shared_group").html($(this).closest("tr").find(".report_group").text());
                    $("#shared_notes").html($(this).closest("tr").find(".report_notes").text());
                }
            });

            $('#search_form').submit(function () {
                return false;
            });

            $("#addColumn").on("click",function(){
                addColumn();
            });

                return confirmDelete(MSG_CONFIRM_DELETE);
            });
        });
        function mana_increment(mana_id, resourcename, fieldvalue, stepvalue = 1){
            $.ajax( {
                type: "POST",
                url: "/cgi-bin/koha/svc/mana/addvaluetofield",
                data: {id: mana_id, field: fieldvalue, resource: resourcename, step: stepvalue},
                datatype: "json",
            }).done( function() {
            }).fail( function(){ });
        }

        function mana_use( mana_id ){
            $.ajax( {
                type:"POST",
                url: "/cgi-bin/koha/svc/mana/use",
                data: {id:mana_id, resource: 'report', saveinbase: 1},
                dataType: "json",
            })
            .done( function (result){
                window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&amp;phase=Show%20SQL");
            })
            .fail( function ( foo, msg, longmsg){
            });
        }

        function mana_search( textquery ){
            $.ajax({
                type: "POST",
                url: "/cgi-bin/koha/svc/mana/search",
                data: {biblionumber: $("#biblionumber").val(), resource: 'report', id: textquery, usecomments: 1},
                dataType: "html",
            })
            .done( function( result ) {
                $("#mana_search_result .modal-body").html(result);
                $("#mana_search_result_label").text("Results from Mana Knowledge Base");
                $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
                    "sPaginationType":"four_button",
                    "autoWidth": false,
                    "columnDefs": [
                        { "width": "35%", "targets": 1 }
                    ],
                    "aoColumnDefs": [
                        { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
                        { "sType": "title-string", "aTargets" : [ "title-string" ] },
                        { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
                    ]
                }));
                if($("td.dataTables_empty").length == 0){
                     $("#mana_search").show();
                }

                $( "select[class='actionreport1']" ).show();
                $( "button[class='actionreport2']" ).hide();
                $("#CommentButton").on("click", function(){
                    var resource_type = "report";
                    var target_id = $("#selected_id").val();
                    var manamsg = $("#manamsg").val();
                    mana_comment(target_id, manamsg, resource_type);
                    $("#comment_box").modal("hide");
                });

                $(".showbutton").on("click", function(){
                    $(this).parent().hide();
                    $(this).parent().next().show();
                });

                $("a[class='hidebutton']").on("click", function(){
                    $(this).parent().hide();
                    $(this).parent().prev().show();
                });

                $("#commentCloseButton").on("click", function(){
                    $("#comment_box").modal("hide");
                });

                $(".actionreport1").on("click", function(){
                    $("#selectedcomment").val($(this).val());
                    $(this).parent("select").hide();
                    $(this).parent("select").next().show();
                });

                $(".actionreport2").on("click", function(){
                    $(this).hide();
                    $(this).prev().show();
                    mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
                });
            }).fail( function( result ){
            });
        }

        function mana_comment( target_id, manamsg, resource_type ){
            $.ajax( {
                type: "POST",
                url: "/cgi-bin/koha/svc/mana/share",
                data: {message: manamsg, resource: resource_type , resource_id: target_id},
                datatype: "json",
            })
        }

        function addColumn() {
            $("#availableColumns option:selected").clone().appendTo("#selectedColumns").attr("selected", "selected");
        }

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 10-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-8 / +12 lines)
10	<style type="text/css">	10	<style type="text/css">
11	fieldset.rows li.radio { width: 100%; } /* override staff-global.css */	11	fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
12	.yui-u li p label.widelabel {	12	.yui-u li p label.widelabel {
13	width: 300px; /* not enough for IE7 apparently */	13	width: 300px; /* not enough for IE7 apparently */
14	}	14	}
15	</style>	15	</style>
16	</head>	16	</head>
Lines 214-221 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here
214		214
215	<div id="page_2">	215	<div id="page_2">
216	<div class="col-md-6">	216	<div class="col-md-6">
		217	[% IF ( Koha.Preference('Mana') == 2) %]
		218	<fieldset>
		219	<p><center>You haven't activated the Mana Knowledge Base, click
		220	<a href=/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=request+to+mana+webservice>here</a>
		221	to configure.</center></p>
		222	</fieldset>
		223	[% END %]
		224
217	<div id="mana_search" class="dialog message">	225	<div id="mana_search" class="dialog message">
218	<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>	226	<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>
219	</div>	227	</div>
220	<div id="subscription_form_planning">	228	<div id="subscription_form_planning">
221	<fieldset class="rows">	229	<fieldset class="rows">
Lines 500-517 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here
500	</div>	508	</div>
501	</form>	509	</form>
502	</div>	510	</div>
503	<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;">	511	<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;">
504	<div class="modal-dialog modal-lg">	512	<div class="modal-dialog modal-lg">
505	<div class="modal-content">	513	<div class="modal-content">
506	<div class="modal-header">	514	<div class="modal-header">
		515	<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
507	<h3 id="mana_search_result_label"></h3>	516	<h3 id="mana_search_result_label"></h3>
508	</div>	517	</div>
509	<div class="modal-body">	518	<div class="modal-body">
510	</div>
511	<div class="modal-footer">
512	<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
513	</div>
514	</div>
515	</div>	519	</div>
516	</div>	520	</div>
517		521

Lines 396-409 function mana_search() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js (-5 / +59 lines)
396	$.ajax({	396	$.ajax({
397	type: "POST",	397	type: "POST",
398	url: "/cgi-bin/koha/svc/mana/search",	398	url: "/cgi-bin/koha/svc/mana/search",
399	data: {biblionumber : $("#biblionumber").val()},	399	data: {id: $("#biblionumber").val(), resource: 'subscription', usecomments: 1},
400	dataType: "html",	400	dataType: "html",
401	})	401	})
402	.done( function( result ) {	402	.done( function( result ) {
403	$("#mana_search_result .modal-body").html(result);	403	$("#mana_search_result .modal-body").html(result);
404	$("#mana_search_result_label").text("Results from Mana");	404	$("#mana_search_result_label").text("Results from Mana Knowledge Base");
405	$("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {	405	$("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
406	"sPaginationType": "four_button",	406	"sPaginationType": "four_button",
		407	"order":[[4, "desc"], [5, "desc"]],
		408	"autoWidth": false,
		409	"columnDefs": [
		410	{ "width": "35%", "targets": 1 }
		411	],
407	"aoColumnDefs": [	412	"aoColumnDefs": [
408	{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },	413	{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
409	{ "sType": "title-string", "aTargets" : [ "title-string" ] },	414	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
Lines 413-429 function mana_search() { Link Here
413	if($("td.dataTables_empty").length == 0){	418	if($("td.dataTables_empty").length == 0){
414	$("#mana_search").show();	419	$("#mana_search").show();
415	}	420	}
		421	$( "select[class='actionreport1']" ).show();
		422	$( "button[class='actionreport2']" ).hide();
		423
		424	$("#CommentButton").on("click", function(){
		425	var resource_type = "subscription";
		426	var target_id = $("#selected_id").val();
		427	var manamsg = $("#manamsg").val();
		428	mana_comment(target_id, manamsg, resource_type);
		429	$("#comment_box").modal("hide");
		430	});
		431
		432	$("#commentCloseButton").on("click", function(){
		433	$("#comment_box").modal("hide");
		434	});
		435
		436	$(".actionreport1").on("click", function(){
		437	$("#selectedcomment").val($(this).val());
		438	$(this).parent("select").hide();
		439	$(this).parent("select").next().show();
		440	});
		441
		442	$(".actionreport2").on("click", function(){
		443	$(this).hide();
		444	$(this).prev().show();
		445	mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
		446	});
		447
416	}).fail(function(result){	448	}).fail(function(result){
417	});	449	});
418	}	450	}
419		451
		452	function mana_comment( target_id, manamsg, resource_type ){
		453	$.ajax( {
		454	type: "POST",
		455	url: "/cgi-bin/koha/svc/mana/share",
		456	data: {message: manamsg, resource: resource_type , resource_id: target_id},
		457	datatype: "json",
		458	})
		459	}
		460
		461	function mana_increment(mana_id, resource, fieldvalue, stepvalue = 1){
		462	$.ajax( {
		463	type: "POST",
		464	url: "/cgi-bin/koha/svc/mana/addvaluetofield",
		465	data: {id: mana_id, resource: resource, field: fieldvalue, step: stepvalue},
		466	datatype: "json",
		467	})
		468	}
		469
420	function mana_use(mana_id){	470	function mana_use(mana_id){
421	$("tr").removeClass("selected");	471	$("tr").removeClass("selected");
422	$("#row"+mana_id).addClass("selected");	472	$("#row"+mana_id).addClass("selected");
423	$.ajax( {	473	$.ajax( {
424	type: "POST",	474	type: "POST",
425	url: "/cgi-bin/koha/svc/mana/use",	475	url: "/cgi-bin/koha/svc/mana/use",
426	data: {id : mana_id},	476	data: {id: mana_id, resource: 'subscription'},
427	dataType: "json",	477	dataType: "json",
428	})	478	})
429	.done(function(result){	479	.done(function(result){
Lines 497-502 function removeDisabledAttr() { Link Here
497	}	547	}
498		548
499	$(document).ready(function() {	549	$(document).ready(function() {
		550	mana_search();
		551	$("#myid").on("click", function(){
		552	debugger;
		553	})
500	$("#displayexample").hide();	554	$("#displayexample").hide();
501	$("#mana_search_result").modal("hide");	555	$("#mana_search_result").modal("hide");
502	$("#aqbooksellerid").on('keypress', function(e) {	556	$("#aqbooksellerid").on('keypress', function(e) {
Lines 606-612 $(document).ready(function() { Link Here
606	});	660	});
607	$("#subscription_add_next").on("click",function(){	661	$("#subscription_add_next").on("click",function(){
608	if ( Check_page1() ){	662	if ( Check_page1() ){
609	[% IF Koha.Preference('Mana') %]	663	[% IF Koha.Preference('Mana') == 1 %]
610	mana_search();	664	mana_search();
611	[% END %]	665	[% END %]
612	show_page_2();	666	show_page_2();




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

=head1 NAME


        }
    }
    $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 379-385 sub redirect_add_subscription { Link Here

(-)a/serials/subscription-add.pl (-3 / +6 lines)
379	my $mana_id;	379	my $mana_id;
380	if ( $query->param('mana_id') ne "" ) {	380	if ( $query->param('mana_id') ne "" ) {
381	$mana_id = $query->param('mana_id');	381	$mana_id = $query->param('mana_id');
382	Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);	382	Koha::SharedContent::manaIncrementRequest("subscription",$mana_id, "nbofusers");
383	}	383	}
384	else {	384	else {
385	$mana_id = undef;	385	$mana_id = undef;
Lines 406-412 sub redirect_add_subscription { Link Here
406	$staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,	406	$staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
407	$skip_serialseq, $itemtype, $previousitemtype, $mana_id	407	$skip_serialseq, $itemtype, $previousitemtype, $mana_id
408	);	408	);
409		409	if ( grep { $_ eq "subscription" } split(/,/, C4::Context->preference('AutoShareWithMana')) ){
		410	my $result = Koha::SharedContent::manaShareInfos( $query, $loggedinuser, $subscriptionid, 'subscription');
		411	$template->param( mana_code => $result->{code} );
		412	}
410	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );	413	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
411	insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );	414	insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );
412		415
Lines 466-472 sub redirect_mod_subscription { Link Here
466	my $mana_id;	469	my $mana_id;
467	if ( defined( $query->param('mana_id') ) ) {	470	if ( defined( $query->param('mana_id') ) ) {
468	$mana_id = $query->param('mana_id');	471	$mana_id = $query->param('mana_id');
469	Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);	472	Koha::SharedContent::manaIncrementRequest("subscription",$mana_id, "nbofusers");
470	}	473	}
471	else {	474	else {
472	$mana_id = undef;	475	$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

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 7-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (-9 / +7 lines)
7	[% ELSE %]	7	[% ELSE %]
8	<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>	8	<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>
9	[% END %]	9	[% END %]
10	[% IF Koha.Preference('Mana') %]	10	[% IF Koha.Preference('Mana') and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %]
11	[% IF one_language_enabled==0 or mana_id %]	11	[% IF one_language_enabled==0 or mana_id %]
12	<div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Your email address will be associated to your sharing." data-target="#mana_share_modal" class="btn btn-small"><i class="fa fa-share-alt"></i> Share</a></div>	12	<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>
13	[% ELSE %]	13	[% ELSE %]
14	<div class="btn-group" data-toggle="tooltip" title="Your email address will be associated to your sharing."><a class="btn btn-small" onclick="share()"><i class="fa fa-share-alt"></i> Share</a></div>	14	<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>
15	[% END %]	15	[% END %]
16	[% END %]	16	[% END %]
17	[% END %]	17	[% END %]
Lines 80-97 Link Here
80	<div class="modal-body">	80	<div class="modal-body">
81	[% IF (mana_id) %]	81	[% IF (mana_id) %]
82	<div class="alert">	82	<div class="alert">
83	<p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwide it will do nothing.</p>	83	<p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>
84	</div>	84	</div>
85	[% END %]	85	[% END %]
86	[% IF ( languages_loop ) %]	86	[% IF ( languages_loop ) %]
87	[% UNLESS ( one_language_enabled ) %]	87	[% UNLESS ( one_language_enabled ) %]
88	<div class="rows">	88	<div class="rows">
89	<p>The frequency and the numberpattern of [% bibliotitle %] are :</p>	89	<li><span class="label">Frequency: </span>
90	<ol>
91	<li><span class="label">Frequency : </span>
92	[% frequency.description %]	90	[% frequency.description %]
93	</li>	91	</li>
94	<li><span class="label">Number pattern : </span>	92	<li><span class="label">Number pattern: </span>
95	[% numberpattern.label %]	93	[% numberpattern.label %]
96	</li>	94	</li>
97	</ol>	95	</ol>
Lines 99-105 Link Here
99	<div class="rows">	97	<div class="rows">
100	<form method="get" id="mana_share_form" action="/cgi-bin/koha/serials/subscription-detail.pl" class="validated" >	98	<form method="get" id="mana_share_form" action="/cgi-bin/koha/serials/subscription-detail.pl" class="validated" >
101	<fieldset>	99	<fieldset>
102	<label for="mana_language">Language of your sharing :</label>	100	<label for="mana_language">Language:</label>
103	<select id="mana_language" name="mana_language">	101	<select id="mana_language" name="mana_language">
104	[% FOREACH languages_loo IN languages_loop %]	102	[% FOREACH languages_loo IN languages_loop %]
105	[% IF ( languages_loo.group_enabled ) %]	103	[% IF ( languages_loo.group_enabled ) %]

Lines 13-23 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-2 / +6 lines)
13	<div class="main container-fluid">	13	<div class="main container-fluid">
14	<div class="row">	14	<div class="row">
15	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	15	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
16		16	[% IF ( Koha.Preference('Mana') == 2) %]
		17	<fieldset>
		18	<p><center> You haven't decided if you want to activate Mana Knowlede Base, please let us know by clicking<center></p>
		19	<a href=/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=request+to+mana+webservice><center>Here</center></a>
		20	</fieldset>
		21	[% END %]
17	<h1>Koha administration</h1>	22	<h1>Koha administration</h1>
18	<div class="row">	23	<div class="row">
19	<div class="col-md-6 sysprefs">	24	<div class="col-md-6 sysprefs">
20
21	<form action="/cgi-bin/koha/admin/preferences.pl" method="post">	25	<form action="/cgi-bin/koha/admin/preferences.pl" method="post">
22	<fieldset>	26	<fieldset>
23	<h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>	27	<h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>

Lines 38-43 use Koha::AuthorisedValues; Link Here

(-)a/reports/guided_reports.pl (-1 / +12 lines)
38	use Koha::BiblioFrameworks;	38	use Koha::BiblioFrameworks;
39	use Koha::Libraries;	39	use Koha::Libraries;
40	use Koha::Patron::Categories;	40	use Koha::Patron::Categories;
		41	use Koha::SharedContent;
41		42
42	=head1 NAME	43	=head1 NAME
43		44
Lines 145-150 elsif ( $phase eq 'Build new' ) { Link Here
145	}	146	}
146	}	147	}
147	$template->param(	148	$template->param(
		149	'manamsg' => $input->param('manamsg') \|\| '',
148	'saved1' => 1,	150	'saved1' => 1,
149	'savedreports' => $reports,	151	'savedreports' => $reports,
150	'usecache' => $usecache,	152	'usecache' => $usecache,
Lines 547-553 elsif ( $phase eq 'Build report' ) { Link Here
547		549
548	elsif ( $phase eq 'Save' ) {	550	elsif ( $phase eq 'Save' ) {
549	# Save the report that has just been built	551	# Save the report that has just been built
550	my $area = $input->param('area');	552	my $area = $input->param('area');
551	my $sql = $input->param('sql');	553	my $sql = $input->param('sql');
552	my $type = $input->param('type');	554	my $type = $input->param('type');
553	$template->param(	555	$template->param(
Lines 651-656 elsif ( $phase eq 'Save Report' ) { Link Here
651	cache_expiry => $cache_expiry,	653	cache_expiry => $cache_expiry,
652	public => $public,	654	public => $public,
653	} );	655	} );
		656
654	logaction( "REPORTS", "ADD", $id, "$name \| $sql" ) if C4::Context->preference("ReportsLog");	657	logaction( "REPORTS", "ADD", $id, "$name \| $sql" ) if C4::Context->preference("ReportsLog");
655	$template->param(	658	$template->param(
656	'save_successful' => 1,	659	'save_successful' => 1,
Lines 668-673 elsif ( $phase eq 'Save Report' ) { Link Here
668	}	671	}
669	}	672	}
670		673
		674	elsif ($phase eq 'Share'){
		675	my $result = Koha::SharedContent::manaShareInfos($input, $borrowernumber, $input->param('reportid'), 'report');
		676	if ( $result and ($result->{code} eq "200" or $result->{code} eq "201") ) {
		677	print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=success");
		678	}else{
		679	print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=fail");
		680	}
		681	}
671	elsif ($phase eq 'Run this report'){	682	elsif ($phase eq 'Run this report'){
672	# execute a saved report	683	# execute a saved report
673	my $limit = $input->param('limit') \|\| 20;	684	my $limit = $input->param('limit') \|\| 20;

Lines 104-147 if ($op eq 'del') { Link Here

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