Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 17282: add template's variable filters

Browse source 
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Alex Arnaud 2018-09-24 12:22:09 +00:00 committed by Nick Clemens
parent edb627bcf2
commit 1814ae1769
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc
View file

@ -21,9 +21,9 @@
<li>
<label for="x_element">x column:</label>
<select id="x_element" name="x">
<option value="[% supposed_x %]" selected>[% supposed_x %]</option>
<option value="[% supposed_x | html %]" selected>[% supposed_x | html %]</option>
[% FOREACH header IN header_row %]
<option value="[% header.cell %]">[% header.cell %]</option>
<option value="[% header.cell | html %]">[% header.cell | html %]</option>
[% END %]
</select>
</li>
@ -40,22 +40,22 @@
[% column = 1 %]
<li>
[% FOREACH header IN header_row %]
<fieldset class="chart-column-conf" id="column_[% column %]" style="display: inline !important;">
<fieldset class="chart-column-conf" id="column_[% column | html %]" style="display: inline !important;">
<legend>
Column [% column %]
<a class="chart-column-delete" href="#" data-column="[% column %]">
<img src="[% interface %]/[% theme %]/img/x.png" alt="Delete" />
Column [% column | html %]
<a class="chart-column-delete" href="#" data-column="[% column | html %]">
<img src="[% interface | html %]/[% theme | html %]/img/x.png" alt="Delete" />
</a>
</legend>
<div>
<label for="y_[% column %]" >y:</label>
<select id="y_[% column %]" name="y">
<option value="[% supposed_x %]" selected>[% supposed_x %]</option>
<label for="y_[% column | html %]" >y:</label>
<select id="y_[% column | html %]" name="y">
<option value="[% supposed_x | html %]" selected>[% supposed_x | html %]</option>
[% FOREACH h IN header_row %]
[% IF header.cell == h.cell %]
<option value="[% h.cell %]" selected>[% h.cell %]</option>
<option value="[% h.cell | html %]" selected>[% h.cell | html %]</option>
[% ELSE %]
<option value="[% h.cell %]">[% h.cell %]</option>
<option value="[% h.cell | html %]">[% h.cell | html %]</option>
[% END %]
[% END %]
</select>
@ -63,13 +63,13 @@
<div class="chart-column-group">
[% i = 1 %]
<label for="group_[% column %]">Group:</label>
<select id="group_[% column %]" name="group">
<label for="group_[% column | html %]">Group:</label>
<select id="group_[% column | html %]" name="group">
[% FOREACH h IN header_row %]
[% IF i == column %]
<option value="[% i %]" selected>[% i %]</option>
<option value="[% i | html %]" selected>[% i | html %]</option>
[% ELSE %]
<option value="[% i %]">[% i %]</option>
<option value="[% i | html %]">[% i | html %]</option>
[% END %]
[% i = i + 1 %]
[% END %]
@ -77,8 +77,8 @@
</div>
<div class="chart-column-line">
<label for="line_[% column %]">line:</label>
<input class="column-line" id="column-line" name="[% header.cell %]" type="checkbox">
<label for="line_[% column | html %]">line:</label>
<input class="column-line" id="column-line" name="[% header.cell | html %]" type="checkbox">
</div>
</fieldset>
[% column = column + 1 %]
@ -91,6 +91,6 @@
</ol>
</fieldset>
[% item = { cell = supposed_x } %]
[% header_row.unshift(item) %]
[% header_row.unshift(item) | html %]
<div id="chart"></div>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
View file

@ -61,7 +61,7 @@
<li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=tab&amp;report_id=[% id | html %]&amp;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&amp;format=ods&amp;report_id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">Open Document Spreadsheet</a></li>
[% IF (results.json) %]
<li><a id="download-chart" href="#">Download chart</a></li>
<li><a id="download-chart" href="#">Chart (.svg)</a></li>
[% END %]
</ul>
</div>

8
koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
View file

@ -1048,14 +1048,14 @@ $(document).ready(function() {
var lines = [];
var options = {};
headers = [% header_row.json %];
headers = [% header_row.json | $raw %];
var results;
if ($('input[name="chart-include-all"]').prop('checked')) {
results = [% allresults.json %]
results = [% allresults.json | $raw %]
}
else {
results = [% results.json %]
results = [% results.json | $raw %]
}
if ($('input[name="chart-exclude-last"]').prop('checked')) {
@ -1105,7 +1105,7 @@ $(document).ready(function() {
options.lines = lines;
chart = create_chart(kept_headers, kept_results, x_elements, y_elements, groups, options);
$('#chart').prepend('<div style="font-size: 1rem; text-align: center;">' + "[% name %]" + '</div>');
$('#chart').prepend('<div style="font-size: 1rem; text-align: center;">' + "[% name | html %]" + '</div>');
$('#download-chart').show();
$("#draw-chart").html(_(btn_text));
$("html, body").animate({ scrollTop: $(document).height() }, "slow");