@@ -, +, @@
libraries in the about page - fix a QA warning - Move chart settings on top
and make them hidden by default - Add options to get all results
---
koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc | 8 +++++++-
.../prog/en/includes/reports-toolbar.inc | 4 ++++
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 ++++++
.../prog/en/modules/reports/guided_reports_start.tt | 21 +++++++++++++++++----
reports/guided_reports.pl | 7 +++++++
5 files changed, 41 insertions(+), 5 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc
@@ -1,4 +1,4 @@
-
+
+
[% END %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -914,6 +914,12 @@
Leaflet
The Leaflet JavaScript library by Vladimir Agafonkinis licensed under the BSD License.
+
+
D3.js
+
D3.js v3.5.17 is a JavaScript library for manipulating documents based on data. It is under the BSD 3-clause Licence
+
+
C3.js
+
C3.js v0.4.11 is a D3-based reusable chart library under the MIT licence
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -206,6 +206,12 @@ $("#delColumn").on("click",function(){
$("#toggle_sql_vis").toggle();
});
+ $(".toggle_chart_settings").click(function(){
+ $("#makechart").toggle();
+ $("#toggle_chart_settings_hid").toggle();
+ $("#toggle_chart_settings_vis").toggle();
+ });
+
$("#table_reports").delegate(".confirmdelete", 'click', function(){
$(this).parents('tr').attr("class","warn");
if(confirm(_("Are you sure you want to delete this saved report?"))){
@@ -963,7 +969,7 @@ canned reports and writing custom SQL reports.
$('#draw-chart').click(function() {
var btn_text = $("#draw-chart").html();
- $("#draw-chart").html(_('Loading...'));
+ $("#draw-chart").html(_("Loading..."));
var x_elements = $('select[name="x"]').val();
var y_elements = [];
@@ -973,7 +979,14 @@ canned reports and writing custom SQL reports.
//var headers = [% header_row.json %];
headers = [% header_row.json %];
- var results = [% results.json %]
+
+ var results;
+ if ($('input[name="chart-include-all"]').prop('checked')) {
+ results = [% allresults.json %]
+ }
+ else {
+ results = [% results.json %]
+ }
if ($('input[name="chart-exclude-last"]').prop('checked')) {
results.splice(-1, 1);
@@ -1037,6 +1050,8 @@ canned reports and writing custom SQL reports.
Report SQL:[% sql |html %]
+[% INCLUDE 'chart.inc' %]
+