Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Bug 26708: Add SQL popup when hovering over name of report 

This patch adds an option to preview a report's SQL by selecting
"Preview SQL" from the "Actions" menu.

To test, apply the patch and go to Reports -> Saved reports.

 - In the table listing saved reports, open the "Actions" pop-up menu
   and click the "Preview SQL" link.
 - You should be shown a modal with a syntax-highlighted view of the SQL
   code.
 - The footer of the modal should have options for Edit, Duplicate,
   Schedule, Delete, Run report, and Close.
 - Test that all these buttons work correctly.
 - Test that all of these features work correctly any page of the saved
   reports DataTable.

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
21.05.x
Owen Leonard 3 years ago
committed by Jonathan Druart
parent
0751f9b0c9
commit
d3323881d5
1 changed files with 53 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt

54
koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
View File

@ -329,7 +329,12 @@
class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown"
href="#"><b class="caret"></b></a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
<li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | uri %]&amp;phase=Show%20SQL"><i class="fa fa-search"></i> Show</a></li>
<li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | uri %]&amp;phase=Show%20SQL"><i class="fa fa-search"></i> View</a></li>
<li>
<a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | uri %]&phase=Show%20SQL" class="preview_sql" data-reportid="[% savedreport.id | html %]">
<i class="fa fa-eye"></i> Preview SQL
</a>
</li>
[% IF ( CAN_user_reports_create_reports ) %]
<li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | uri %]&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 existing&amp;report_id=[% savedreport.id | uri %]"><i class="fa fa-copy"></i> Duplicate</a></li>
@ -343,6 +348,7 @@
[% END %]
</ul>
</div>
<input type="hidden" id="previewSql[% savedreport.id | html %]" value="[% savedreport.savedsql | html %]" data-title="[% savedreport.report_name | html %]" />
</td>
</tr>
[% END %]
@ -1800,6 +1806,12 @@
e.preventDefault();
addToList();
});
$("body").on("click", ".preview_sql", function(e){
e.preventDefault();
var reportid = $(this).data("reportid");
previewSql( reportid );
});
});
function tabsInit( ui, rtable ){
@ -1927,6 +1939,46 @@
window.open(url, 'Add_to_virtualshelf', 'width=500, height=400, toolbar=false, scrollbars=yes');
return false;
}
// Adapted from https://gist.github.com/jnormore/7418776
function previewSql(reportid) {
var yes_label = "";
var no_label = "";
var message = $("#previewSql" + reportid ).val();
var title = $("#previewSql" + reportid ).data("title");
if( $("#preview-sql-modal").length > 0) {
$("#preview-sql-modal").remove();
}
$("body").append('<div id="preview-sql-modal" tabindex="-1" role="dialog" aria-hidden="true" class="modal">\
<div class="modal-dialog">\
<div class="modal-content">\
<div class="modal-header" style="min-height:40px;">\
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">\
<span aria-hidden="true">×</span>\
</button>\
<h4 class="modal-title">' + title + '</h4>\
</div>\
<div class="modal-body"><textarea id="code' + reportid + '">' + message + '</textarea>\
<div class="modal-footer">\
<a id="preview-modal-editreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=' + reportid + '&amp;phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a>\
<a id="preview-modal-duplicate" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from existing&amp;report_id=' + reportid + '"><i class="fa fa-copy"></i> Duplicate</a>\
<a id="preview-modal-duplicate" class="btn btn-default" href="/cgi-bin/koha/tools/scheduler.pl?id=' + reportid + '"><i class="fa fa-clock-o"></i> Schedule</a>\
<a id="preview-modal-delete" class="delete btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=' + reportid + '&amp;phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a>\
<a id="preview-modal-runreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=' + reportid + '&amp;phase=Run%20this%20report"><i class="fa fa-play"></i> Run report</a>\
<a href="#" id="preview-sql-modal-cancel" data-dismiss="modal" class="btn btn-default"><i class="fa fa-remove" aria-hidden="true"></i> Close</a>\
</div>\
</div>\
</div>\
</div>');
$("#preview-sql-modal").modal('show');
CodeMirror.fromTextArea( document.getElementById("code" + reportid ), {
lineNumbers: false,
mode: "text/x-sql",
lineWrapping: true,
readOnly: true
});
}
</script>
[% END %]

Write Preview
Loading…
Cancel
Save