Owen Leonard
679fdaebb1
This patch makes many changes to templates and JavaScript related to the integration of Mana with serials reports: - Many incorrect uses of the raw filter with html - Corrections to Bootstrap modal markup - Untranslatable strings moved out of JavaScript - Removed markup and JavaScript related to reports comments, a feature which doesn't exist in this version. New include file: mana/mana-comment-status.inc This file contains hidden-by-default messages which are shown during the process of submitting a comment on a subscription. New include file: mana/mana-share-report.inc This file contains the "Share report" modal markup formerly in guided_reports_start.tt New JavaScript file: mana.js Previously mana.inc, an include file containing only JavaScript which didn't include any template processing. Changed: mana/mana-report-search-result.inc This include file is now a full template so that jQuery's load() function can be used to pull its contents into the reports search modal. Changed: svc/mana/search This script was returning json-encoded HTML. Now it returns regular HTML. To test you must have Mana configured and enabled. Apply the patch and go to Reports -> Saved reports. - Choose New report -> New SQL from Mana. A "Mana search" modal should appear. - Perform a search which will return results, e.g. "circulation." - A "Loading" indicator should appear while the results are being retrieved. It should disappear when results appear. - Results should appear in the DataTable with sorting, paging, and search options. - In the "Notes" column, notes longer than 200 characters should be truncated with a "Show more" link. Clicking it should expand the comment and reveal a "Show less" link in its place. - Click the "Import" button (previously "Use"). The button icon should change to a loading indicator. - When the import is complete you should be redirected to a view of your new report. Go to Serials and click the "Search on Mana" link in the sidebar. - Perform a search for a serial - Results should appear in a DataTable with sorting, paging, and search options. - Sorting by title should ignore articles "a," "an," and "the." Create a new subscription or edit an existing subscription which will match a record in Mana. - On the second step of adding/editing the subscription a message should appear at the top of the form, "Searching for subscription in Mana Knowledge Base," with a loading icon. - When searching has completed a "Show Mana results" link should appear. - Clicking the link should trigger a modal showing search results which match your subscription, displayed in a DataTable with sorting, paging, and search options. - The last column of the table should contain "Import" and "Report" buttons. - Clicking the "Report" button should trigger a menu. Any existing comments will be listed as well as a "New comment" item. - Clicking an existing comment should cause the menu to close and a "Submitting comment" message to appear. It should be shortly replaced with a "Your comment has been submitted" message. - Clicking "New comment" should reveal a comment form. - It should not be possible to submit an empty comment. - Clicking the "cancel" link should redisplay the search results. - Submitting a new comment should trigger a "Submitting comment" message followed by a "Your comment has been submitted" message. - In the table of search results, click the "Import" button (previously "Use"). The button icon should change to a loading indicator. - The modal should close and the data from Mana should be loaded into the subscription entry form. View the detail page of a subscription which has saved with Mana data. - There should be a "Report mistake" button in the toolbar. Clicking it should reveal a menu of comments like the one you saw previously. - Clicking an existing comment should cause the menu to close and a "Submitting comment" message to appear. It should be shortly replaced with a "Your comment has been submitted" message. - Clicking "New comment" should reveal a comment form modal. - It should not be possible to submit an empty comment. - Clicking the "cancel" link should hide the modal. - Submitting a new comment should trigger a "Submitting comment" message followed by a "Your comment has been submitted" message. Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
128 lines
No EOL
6.5 KiB
HTML
128 lines
No EOL
6.5 KiB
HTML
[% USE Asset %]
|
|
[% USE KohaDates %]
|
|
[% USE Koha %]
|
|
[% USE AuthorisedValues %]
|
|
[% USE Branches %]
|
|
[% USE raw %]
|
|
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Reports › Mana Knowledge Base reports search</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% Asset.css("css/reports.css") | $raw %]
|
|
[% Asset.css("css/datatables.css") | $raw %]
|
|
</head>
|
|
|
|
<body id="rep_mana_search" class="rep">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'circ-search.inc' %]
|
|
|
|
<div id="breadcrumbs">
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
|
|
› <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
|
|
› <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a>
|
|
› Mana Knowledge Base report search results
|
|
</div>
|
|
|
|
<div class="main container-fluid">
|
|
<div class="row">
|
|
<div class="col-sm-10 col-sm-push-2">
|
|
<main>
|
|
<h2>Mana Knowledge Base report search results</h2>
|
|
|
|
<div id="mana_results">
|
|
[% IF statuscode == "200" AND reports %]
|
|
|
|
<table id="mana_results_datatable">
|
|
<thead>
|
|
<tr>
|
|
<th>Report name</th>
|
|
<th class="anti-the">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 %]
|
|
[% IF report.nbofcomment > highWarned %]
|
|
<tr id="row[% report.id | html %]" class="high-warned-row">
|
|
[% ELSIF report.nbofcomment > warned %]
|
|
<tr id="row[% report.id | html %]" class="warned-row">
|
|
[% ELSIF report.nbofcomment > lowWarned %]
|
|
<tr id="row[% report.id | html %]" class="highlighted-row">
|
|
[% ELSE %]
|
|
<tr id="row[% report.id | html %]">
|
|
[% END %]
|
|
<td>
|
|
<input type="hidden" class="rowid" value="[% report.id | $raw %]" />
|
|
[% IF ( report.report_name ) %]
|
|
[% report.report_name | html %]
|
|
[% END %]
|
|
</td>
|
|
<td title="[% report.savedsql | html %]">
|
|
[% IF report.notes.length > 200 %]
|
|
<div>
|
|
[% report.notes.substr(0,200) | html %]... <a href="#" class="btn btn-link btn-sm showbutton"><i class="fa fa-plus-square-o"></i> Show more</a>
|
|
</div>
|
|
<div style="display:none">
|
|
[% report.notes | html %]
|
|
<a href="#" class="btn btn-link btn-sm hidebutton"><i class="fa fa-minus-square-o"></i> Show less</a>
|
|
</div>
|
|
[% ELSE %]
|
|
[% report.notes | html %]
|
|
[% END %]
|
|
</td>
|
|
<td> [% report.type | html %] </td>
|
|
<td>
|
|
[% IF ( report.nbofusers ) %]
|
|
[% report.nbofusers | html %]
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
<span title="[% report.lastimport | html %]">
|
|
[% report.lastimport | $KohaDates %]
|
|
</span>
|
|
</td>
|
|
<td>
|
|
[% FOREACH comment IN report.comments %]
|
|
[% comment.message | html %] ([% comment.nb | html %])<br>
|
|
[% END %]
|
|
</td>
|
|
|
|
[% UNLESS search_only %]
|
|
<td>
|
|
<button type="button" class="btn btn-default btn-xs mana-use" id="mana-use-[% report.id | html %]" data-report_id="[% report.id | html %]"><i class="fa fa-download"></i> Import</button>
|
|
</td>
|
|
[% END %]
|
|
</tr>
|
|
[% END %]
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% ELSE %]
|
|
<h4>
|
|
[% IF ( msg ) %]
|
|
[% msg | html %] (Statuscode: [% statuscode | html %])
|
|
[% ELSE %]
|
|
No results found
|
|
[% END %]
|
|
</h4>
|
|
[% END %]
|
|
</div>
|
|
|
|
</main>
|
|
</div> <!-- /.col-sm-10.col-sm-push-2 -->
|
|
|
|
<div class="col-sm-2 col-sm-pull-10">
|
|
<aside>
|
|
[% INCLUDE 'guided-reports-view.inc' %]
|
|
</aside>
|
|
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
|
|
</div> <!-- /.row -->
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %] |