Owen Leonard
8e1efe8f10
This patch updates a number of aspects of the reports chart creation interface: Chart creation form is now shown in a modal window, and a separate link has been added to show or hide the chart itself. Also changed: Minor markup and JavaScript cleanup. To test, apply the patch and go to Reports -> Saved reports. - Run a report which returns more than one column. - On the report results page, click the "Create chart" button. The chart settings form should appear in a modal window. - Confirm that the form controls work correctly: Each label should give focus to the correct input. Changing the chart type should show or hide the appropriate form fields. - Click the "Draw" button. The modal should disappear and the chart should be shown. - Above the chart should be a "Hide chart" link which works to hide (and then show) the chart. Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
222 lines
11 KiB
HTML
222 lines
11 KiB
HTML
[% INCLUDE 'blocking_errors.inc' %]
|
||
<div id="toolbar" class="btn-toolbar">
|
||
[% IF ( CAN_user_reports_create_reports ) %]
|
||
<div class="btn-group">
|
||
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button>
|
||
<ul class="dropdown-menu">
|
||
<li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li>
|
||
<li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li>
|
||
[% IF Koha.Preference('Mana')==1 %]
|
||
<li id="newsql"><a href="" data-toggle="modal" data-target="#mana_search_result">New SQL from Mana</a> </li>
|
||
[% END %]
|
||
</ul>
|
||
</div>
|
||
[% END %]
|
||
|
||
[% IF ( showsql || execute || editsql || save_successful ) %]
|
||
[% IF ( CAN_user_reports_create_reports ) %]
|
||
[% UNLESS ( editsql ) # Do not show edit button on edit page %]
|
||
<div class="btn-group">
|
||
<a id="editreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Edit%20SQL">
|
||
<i class="fa fa-pencil"></i> Edit
|
||
</a>
|
||
</div>
|
||
[% END %]
|
||
<div class="btn-group">
|
||
<a class="btn btn-default btn-sm" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&sql=[% original_sql || sql |uri %]&reportname=[% reportname |uri %]&notes=[% notes |uri %]">
|
||
<i class="fa fa-copy"></i> Duplicate
|
||
</a>
|
||
</div>
|
||
[% END %]
|
||
|
||
[% IF ( CAN_user_reports_delete_reports ) %]
|
||
<div class="btn-group">
|
||
<a class="delete btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved">
|
||
<i class="fa fa-trash"></i> Delete
|
||
</a>
|
||
</div>
|
||
[% END %]
|
||
|
||
[% UNLESS ( errors ) # Unless there are errors saving a report %]
|
||
<div class="btn-group">
|
||
<a id="runreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Run%20this%20report">
|
||
<i class="fa fa-play"></i> Run report
|
||
</a>
|
||
</div>
|
||
<div class="btn-group">
|
||
<a class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id | html %]">
|
||
<i class="fa fa-clock-o"></i> Schedule
|
||
</a>
|
||
</div>
|
||
[% END %]
|
||
|
||
[% IF ( mana_id && Koha.Preference('Mana') == 1 ) %]
|
||
<div class="btn-group">
|
||
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> Report mistake <span class="caret"></span></button>
|
||
<ul class="dropdown-menu">
|
||
[% FOREACH c IN mana_comments %]
|
||
<li class="mana-comment" data-id="[% c.id | $raw %]">
|
||
<a href="#">[% c.message | html %] ([% c.nb | html %])</a>
|
||
</li>
|
||
[% END %]
|
||
<li role="separator" class="divider"></li>
|
||
<li class="mana-other-comment"><a href="#">Other</a> </li>
|
||
</ul>
|
||
</div>
|
||
|
||
<div id="mana-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="mana-comment-close" 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">
|
||
<input hidden id="mana-resource" value="report">
|
||
<input hidden id="mana-resource-id" value="[% mana_id | $raw %]">
|
||
<div>
|
||
<input type="text" maxlength="35" size="35" id="mana-comment">
|
||
</div>
|
||
<button id="mana-send-comment"> Comment </button>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
[% END %]
|
||
|
||
[% IF ( execute ) %]
|
||
[% BLOCK params %]
|
||
[%- FOREACH param IN sql_params %]&sql_params=[% param | uri %][% END %]
|
||
[%- FOREACH param_name IN param_names %]&param_name=[% param_name | uri %][% END %]
|
||
[%- END %]
|
||
|
||
|
||
<div class="btn-group">
|
||
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> Download <span class="caret"></span></button>
|
||
<ul class="dropdown-menu">
|
||
<li><a id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=csv&report_id=[% id | html %]&reportname=[% name |uri %][% PROCESS params %]">[% PROCESS 'delimiter_text.inc' %]</a></li>
|
||
<li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=tab&report_id=[% id | html %]&reportname=[% name |uri %][% PROCESS params %]">Tab separated text</a></li>
|
||
<li><a id="ods" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=ods&report_id=[% id | html %]&reportname=[% name |uri %][% PROCESS params %]">Open Document Spreadsheet</a></li>
|
||
[% IF (results.json) %]
|
||
<li><a id="download-chart" href="#">Chart (.svg)</a></li>
|
||
[% END %]
|
||
</ul>
|
||
</div>
|
||
<div class="btn-group">
|
||
<a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_hid" href="#"><i class="fa fa-eye"></i> Show SQL code</a>
|
||
<a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_vis" href="#" style="display:none;"><i class="fa fa-eye-slash"></i> Hide SQL code</a>
|
||
</div>
|
||
<div class="btn-group">
|
||
<a class="btn btn-default btn-sm" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-bar-chart"></i> Create chart</a>
|
||
</div>
|
||
[% END %]
|
||
|
||
[% END %]
|
||
</div>
|
||
|
||
[% IF Koha.Preference('Mana')==1 %]
|
||
<div id="mana_search_result" class="modal fade container-fluid" 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>
|
||
<div class="modal-body">
|
||
<fieldset>
|
||
<form id="mana_search_form" style="margin-left: 5%">
|
||
Please enter a few key words:
|
||
<input type="text" id="mana_search_field">
|
||
<input type="submit" class="mana_search_button" value="Search">
|
||
</form>
|
||
</fieldset>
|
||
<div class="mana_result_content">
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
[% END %]
|
||
|
||
<script>
|
||
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){
|
||
if ( result.errmsg ){
|
||
alert( result.errmsg );
|
||
}
|
||
else{
|
||
window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&phase=Show%20SQL&mana_success=1&phase=Edit%20SQL");
|
||
}
|
||
})
|
||
.fail( function ( foo, msg, longmsg, bla ){
|
||
});
|
||
}
|
||
|
||
function mana_search( textquery ){
|
||
$(document.body).css({'cursor' : 'wait'});
|
||
$.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 ) {
|
||
$(document.body).css({'cursor' : 'default'});
|
||
$("#mana_search_result .modal-body .mana_result_content").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();
|
||
|
||
$(".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 ){
|
||
});
|
||
}
|
||
</script>
|