View | Details | Raw Unified | Return to bug 16388
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc (-1 / +13 lines)
Lines 9-15 Link Here
9
        </div>
9
        </div>
10
    [% END %]
10
    [% END %]
11
11
12
    [% IF ( showsql || execute || editsql || save_successful ) %]
12
    [% IF ( showsql || execute || editsql || save_successful || runreport ) %]
13
        [% IF ( CAN_user_reports_create_reports ) %]
13
        [% IF ( CAN_user_reports_create_reports ) %]
14
            [% UNLESS ( editsql ) # Do not show edit button on edit page %]
14
            [% UNLESS ( editsql ) # Do not show edit button on edit page %]
15
                <div class="btn-group">
15
                <div class="btn-group">
Lines 45-50 Link Here
45
                </a>
45
                </a>
46
            </div>
46
            </div>
47
        [% END %]
47
        [% END %]
48
49
        [% IF ( runreport ) %]
50
            <div class="btn-group">
51
                <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> Download <span class="caret"></span></button>
52
                <ul class="dropdown-menu">
53
                    <li><a id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=csv&amp;sql=[% sql |uri %]&amp;reportname=[% name |uri %]">Comma separated text</a></li>
54
                    <li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=tab&amp;sql=[% sql |uri %]&amp;reportname=[% name |uri %]">Tab separated text</a></li>
55
                    <li><a id="ods" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=ods&amp;sql=[% sql |uri %]&amp;reportname=[% name |uri %]">Open Document Spreadsheet</a></li>
56
                </ul>
57
            </div>
58
        [% END %]
59
48
    [% END %]
60
    [% END %]
49
</div>
61
</div>
50
62
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-13 lines)
Lines 841-859 canned reports and writing custom SQL reports.</p> Link Here
841
</tr>
841
</tr>
842
[% END %]
842
[% END %]
843
</table>
843
</table>
844
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
845
<fieldset class="action">
846
<label for="format">Download the report: </label>
847
<select name="format" id="format">
848
<option value="csv">Comma separated text</option>
849
<option value="tab">Tab separated text</option>
850
<option value="ods">Open Document Spreadsheet</option>
851
</select>
852
<input type="hidden" name="sql" value="[% sql |html %]" />
853
<input type="hidden" name="phase" value="Export" />
854
<input type="submit" name="submit" value="Download" /></fieldset>
855
<input type="hidden" name="reportname" value="[% name %]" />
856
</form>
857
[% END %]
844
[% END %]
858
[% END %]
845
[% END %]
859
846
(-)a/reports/guided_reports.pl (-1 / +1 lines)
Lines 787-792 elsif ($phase eq 'Run this report'){ Link Here
787
                $url = join('&amp;sql_params=', $url, map { URI::Escape::uri_escape_utf8($_) } @sql_params);
787
                $url = join('&amp;sql_params=', $url, map { URI::Escape::uri_escape_utf8($_) } @sql_params);
788
            }
788
            }
789
            $template->param(
789
            $template->param(
790
                'runreport' => 1,
790
                'results' => \@rows,
791
                'results' => \@rows,
791
                'sql'     => $sql,
792
                'sql'     => $sql,
792
                'id'      => $report_id,
793
                'id'      => $report_id,
793
- 

Return to bug 16388