|
Lines 50-71
Link Here
|
| 50 |
[% END %] |
50 |
[% END %] |
| 51 |
|
51 |
|
| 52 |
[% IF ( build1 ) %] |
52 |
[% IF ( build1 ) %] |
| 53 |
[% t("Build a report, step 1 of 6: Choose a module") | html %] |
53 |
[% t("Build a report, step 1 of 7: Choose a module") | html %] |
| 54 |
› |
54 |
› |
| 55 |
[% ELSIF ( build2 ) %] |
55 |
[% ELSIF ( build2 ) %] |
| 56 |
[% t("Build a report, step 2 of 6: Pick a report type") | html %] |
56 |
[% t("Build a report, step 2 of 7: Pick a report type") | html %] |
| 57 |
› |
57 |
› |
| 58 |
[% ELSIF ( build3 ) %] |
58 |
[% ELSIF ( build3 ) %] |
| 59 |
[% t("Build a report, step 3 of 6: Select columns for display") | html %] |
59 |
[% t("Build a report, step 3 of 7: Select columns for display") | html %] |
| 60 |
› |
60 |
› |
| 61 |
[% ELSIF ( build4 ) %] |
61 |
[% ELSIF ( build4 ) %] |
| 62 |
[% t("Build a report, step 4 of 6: Select criteria to limit on") | html %] |
62 |
[% t("Build a report, step 4 of 7: Select criteria to limit on") | html %] |
| 63 |
› |
63 |
› |
| 64 |
[% ELSIF ( build5 ) %] |
64 |
[% ELSIF ( build5 ) %] |
| 65 |
[% t("Build a report, step 5 of 6: Pick which columns to total") | html %] |
65 |
[% t("Build a report, step 5 of 7: Pick which columns to total") | html %] |
| 66 |
› |
66 |
› |
| 67 |
[% ELSIF ( build6 ) %] |
67 |
[% ELSIF ( build6 ) %] |
| 68 |
[% t("Build a report, step 6 of 6: Select how you want the report ordered") | html %] |
68 |
[% t("Build a report, step 6 of 7: Select how you want the report ordered") | html %] |
|
|
69 |
› |
| 70 |
[% ELSIF ( showreport ) %] |
| 71 |
[% t("Build a report, step 7 of 7: Confirm custom report") | html %] |
| 69 |
› |
72 |
› |
| 70 |
[% END %] |
73 |
[% END %] |
| 71 |
[% t("Guided reports wizard") | html %] |
74 |
[% t("Guided reports wizard") | html %] |
|
Lines 172-194
Link Here
|
| 172 |
[% WRAPPER breadcrumb_item bc_active= 1 %] |
175 |
[% WRAPPER breadcrumb_item bc_active= 1 %] |
| 173 |
<span>Run</span> |
176 |
<span>Run</span> |
| 174 |
[% END %] |
177 |
[% END %] |
| 175 |
[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %] |
178 |
[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 || showreport ) %] |
| 176 |
[% WRAPPER breadcrumb_item %] |
179 |
[% WRAPPER breadcrumb_item %] |
| 177 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form">Build a report</a> |
180 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form">Build a report</a> |
| 178 |
[% END %] |
181 |
[% END %] |
| 179 |
[% WRAPPER breadcrumb_item bc_active= 1 %] |
182 |
[% WRAPPER breadcrumb_item bc_active= 1 %] |
| 180 |
[% IF ( build1 ) %] |
183 |
[% IF ( build1 ) %] |
| 181 |
<span>Step 1 of 6: Choose a module</span> |
184 |
<span>Step 1 of 7: Choose a module</span> |
| 182 |
[% ELSIF ( build2 ) %] |
185 |
[% ELSIF ( build2 ) %] |
| 183 |
<span>Step 2 of 6: Pick a report type</span> |
186 |
<span>Step 2 of 7: Pick a report type</span> |
| 184 |
[% ELSIF ( build3 ) %] |
187 |
[% ELSIF ( build3 ) %] |
| 185 |
<span>Step 3 of 6: Select columns for display</span> |
188 |
<span>Step 3 of 7: Select columns for display</span> |
| 186 |
[% ELSIF ( build4 ) %] |
189 |
[% ELSIF ( build4 ) %] |
| 187 |
<span>Step 4 of 6: Select criteria to limit on</span> |
190 |
<span>Step 4 of 7: Select criteria to limit on</span> |
| 188 |
[% ELSIF ( build5 ) %] |
191 |
[% ELSIF ( build5 ) %] |
| 189 |
<span>Step 5 of 6: Pick which columns to total</span> |
192 |
<span>Step 5 of 7: Pick which columns to total</span> |
| 190 |
[% ELSIF ( build6 ) %] |
193 |
[% ELSIF ( build6 ) %] |
| 191 |
<span>Step 6 of 6: Select how you want the report ordered</span> |
194 |
<span>Step 6 of 7: Select how you want the report ordered</span> |
|
|
195 |
[% ELSIF ( showreport ) %] |
| 196 |
<span>Step 7 of 7: Confirm custom report</span> |
| 192 |
[% END # /IF ( build1 ) %] |
197 |
[% END # /IF ( build1 ) %] |
| 193 |
[% END # /WRAPPER breadcrumb_item %] |
198 |
[% END # /WRAPPER breadcrumb_item %] |
| 194 |
[% END # /IF ( saved1 ) %] |
199 |
[% END # /IF ( saved1 ) %] |
|
Lines 228-234
Link Here
|
| 228 |
<h1>Guided reports</h1> |
233 |
<h1>Guided reports</h1> |
| 229 |
<p>Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.</p> |
234 |
<p>Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.</p> |
| 230 |
|
235 |
|
| 231 |
<h3>Build and run reports</h3> |
236 |
<h2>Build and run reports</h2> |
| 232 |
|
237 |
|
| 233 |
[% IF ( CAN_user_reports_create_reports ) %] |
238 |
[% IF ( CAN_user_reports_create_reports ) %] |
| 234 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form" class="btn btn-primary">Build new</a> |
239 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form" class="btn btn-primary">Build new</a> |
|
Lines 242-248
Link Here
|
| 242 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form_sql" class="btn btn-primary">Create report from SQL</a> |
247 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form_sql" class="btn btn-primary">Create report from SQL</a> |
| 243 |
[% END %] |
248 |
[% END %] |
| 244 |
|
249 |
|
| 245 |
<h3>Reports Dictionary</h3> |
250 |
<h2>Reports Dictionary</h2> |
| 246 |
<p>Use the reports dictionary to define custom criteria to use in your reports</p> |
251 |
<p>Use the reports dictionary to define custom criteria to use in your reports</p> |
| 247 |
<a href="/cgi-bin/koha/reports/dictionary.pl?op=list" class="btn btn-primary">View dictionary</a> |
252 |
<a href="/cgi-bin/koha/reports/dictionary.pl?op=list" class="btn btn-primary">View dictionary</a> |
| 248 |
[% END # /IF (start) %] |
253 |
[% END # /IF (start) %] |
|
Lines 504-510
Link Here
|
| 504 |
<form method="post" action="/cgi-bin/koha/reports/guided_reports.pl"> |
509 |
<form method="post" action="/cgi-bin/koha/reports/guided_reports.pl"> |
| 505 |
[% INCLUDE 'csrf-token.inc' %] |
510 |
[% INCLUDE 'csrf-token.inc' %] |
| 506 |
<fieldset class="rows"> |
511 |
<fieldset class="rows"> |
| 507 |
<legend>Step 1 of 6: Choose a module to report on,[% IF (usecache) %]Set cache expiry,[% END %] and choose report visibility </legend> |
512 |
<legend>Step 1 of 7: Choose a module to report on,[% IF (usecache) %]Set cache expiry,[% END %] and choose report visibility </legend> |
| 508 |
<ol> |
513 |
<ol> |
| 509 |
<li> |
514 |
<li> |
| 510 |
<label for="area">Choose: </label> |
515 |
<label for="area">Choose: </label> |
|
Lines 562-568
Link Here
|
| 562 |
<input type="hidden" name="public" value="[% public | html %]" /> |
567 |
<input type="hidden" name="public" value="[% public | html %]" /> |
| 563 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
568 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
| 564 |
<fieldset class="rows"> |
569 |
<fieldset class="rows"> |
| 565 |
<legend>Step 2 of 6: Pick a report type</legend> |
570 |
<legend>Step 2 of 7: Pick a report type</legend> |
| 566 |
<ol> |
571 |
<ol> |
| 567 |
<li> |
572 |
<li> |
| 568 |
<label for="types">Choose: </label> |
573 |
<label for="types">Choose: </label> |
|
Lines 585-592
Link Here
|
| 585 |
|
590 |
|
| 586 |
[% IF ( build3 ) %] |
591 |
[% IF ( build3 ) %] |
| 587 |
<h1>Build a report</h1> |
592 |
<h1>Build a report</h1> |
| 588 |
<h3>Step 3 of 6: Select columns for display</h3> |
|
|
| 589 |
<p>Note: Be careful selecting when selecting columns. If your choice is too broad it could result in a very large report that will either not complete, or slow your system down.</p> |
| 590 |
|
593 |
|
| 591 |
<form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
594 |
<form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
| 592 |
[% INCLUDE 'csrf-token.inc' %] |
595 |
[% INCLUDE 'csrf-token.inc' %] |
|
Lines 595-600
Link Here
|
| 595 |
<input type="hidden" name="public" value="[% public | html %]" /> |
598 |
<input type="hidden" name="public" value="[% public | html %]" /> |
| 596 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
599 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
| 597 |
<fieldset> |
600 |
<fieldset> |
|
|
601 |
<legend>Step 3 of 7: Select columns for display</legend> |
| 602 |
<p>Note: Be careful selecting when selecting columns. If your choice is too broad it could result in a very large report that will either not complete, or slow your system down.</p> |
| 603 |
|
| 598 |
<div id="column_selection"> |
604 |
<div id="column_selection"> |
| 599 |
<div id="column_options"> |
605 |
<div id="column_options"> |
| 600 |
<select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;"> |
606 |
<select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;"> |
|
Lines 642-648
Link Here
|
| 642 |
<input type="hidden" name="public" value="[% public | html %]" /> |
648 |
<input type="hidden" name="public" value="[% public | html %]" /> |
| 643 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
649 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
| 644 |
<fieldset> |
650 |
<fieldset> |
| 645 |
<legend>Step 4 of 6: Select criteria to limit on</legend> |
651 |
<legend>Step 4 of 7: Select criteria to limit on</legend> |
| 646 |
<table> |
652 |
<table> |
| 647 |
[% FOREACH criteri IN criteria %] |
653 |
[% FOREACH criteri IN criteria %] |
| 648 |
<tr> |
654 |
<tr> |
|
Lines 727-733
Link Here
|
| 727 |
|
733 |
|
| 728 |
[% IF ( build5 ) %] |
734 |
[% IF ( build5 ) %] |
| 729 |
<h1>Build a report</h1> |
735 |
<h1>Build a report</h1> |
| 730 |
<h3>Step 5 of 6: Pick which columns to total</h3> |
|
|
| 731 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
736 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
| 732 |
[% INCLUDE 'csrf-token.inc' %] |
737 |
[% INCLUDE 'csrf-token.inc' %] |
| 733 |
<input type="hidden" name="area" value="[% area | html %]" /> |
738 |
<input type="hidden" name="area" value="[% area | html %]" /> |
|
Lines 738-743
Link Here
|
| 738 |
<input type="hidden" name="public" value="[% public | html %]" /> |
743 |
<input type="hidden" name="public" value="[% public | html %]" /> |
| 739 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
744 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
| 740 |
<fieldset> |
745 |
<fieldset> |
|
|
746 |
<legend>Step 5 of 7: Pick which columns to total</legend> |
| 741 |
<table> |
747 |
<table> |
| 742 |
[% FOREACH total_b IN total_by %] |
748 |
[% FOREACH total_b IN total_by %] |
| 743 |
<tr> |
749 |
<tr> |
|
Lines 767-773
Link Here
|
| 767 |
|
773 |
|
| 768 |
[% IF ( build6 ) %] |
774 |
[% IF ( build6 ) %] |
| 769 |
<h1>Build a report</h1> |
775 |
<h1>Build a report</h1> |
| 770 |
<h3>Step 6 of 6: Choose how you want the report ordered</h3> |
|
|
| 771 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
776 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
| 772 |
[% INCLUDE 'csrf-token.inc' %] |
777 |
[% INCLUDE 'csrf-token.inc' %] |
| 773 |
<input type="hidden" name="area" value="[% area | html %]" /> |
778 |
<input type="hidden" name="area" value="[% area | html %]" /> |
|
Lines 779-784
Link Here
|
| 779 |
<input type="hidden" name="public" value="[% public | html %]" /> |
784 |
<input type="hidden" name="public" value="[% public | html %]" /> |
| 780 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
785 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
| 781 |
<fieldset> |
786 |
<fieldset> |
|
|
787 |
<legend>Step 6 of 7: Choose how you want the report ordered</legend> |
| 782 |
<table> |
788 |
<table> |
| 783 |
[% FOREACH order_b IN order_by %] |
789 |
[% FOREACH order_b IN order_by %] |
| 784 |
<tr> |
790 |
<tr> |
|
Lines 799-813
Link Here
|
| 799 |
</fieldset> |
805 |
</fieldset> |
| 800 |
<fieldset class="action"> |
806 |
<fieldset class="action"> |
| 801 |
<input type="hidden" name="op" value="cud-build_report" /> |
807 |
<input type="hidden" name="op" value="cud-build_report" /> |
| 802 |
<input type="submit" name="submit" class="btn btn-primary" value="Finish" /> |
808 |
<button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-left-long" aria-hidden="true"></i> Back</button> |
|
|
809 |
<button type="submit" class="btn btn-primary">Next <i class="fa fa-right-long" aria-hidden="true"></i></button> |
| 803 |
</fieldset> |
810 |
</fieldset> |
| 804 |
</form> |
811 |
</form> |
| 805 |
[% END #/ IF ( build6 ) %] |
812 |
[% END #/ IF ( build6 ) %] |
| 806 |
|
813 |
|
| 807 |
[% IF ( showreport ) %] |
814 |
[% IF ( showreport ) %] |
| 808 |
<h1>Confirm custom report</h1> |
815 |
<h1>Build a report</h1> |
| 809 |
<p>Your report will be generated with the following SQL statement.</p> |
816 |
<div class="page-section"> |
| 810 |
<p> [% sql | html %] </p> |
817 |
<h2>Step 7 of 7: Confirm custom report</h2> |
|
|
818 |
<p>Your report will be generated with the following SQL statement.</p> |
| 819 |
<textarea id="sql" readonly="readonly">[% sql | html %]</textarea> |
| 820 |
<div class="alert alert-info">You may add a title to your report in the next step.</div> |
| 821 |
</div> |
| 811 |
|
822 |
|
| 812 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
823 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
| 813 |
[% INCLUDE 'csrf-token.inc' %] |
824 |
[% INCLUDE 'csrf-token.inc' %] |
|
Lines 815-824
Link Here
|
| 815 |
<input type="hidden" name="type" value="[% type | html %]" /> |
826 |
<input type="hidden" name="type" value="[% type | html %]" /> |
| 816 |
<input type="hidden" name="public" value="[% public | html %]" /> |
827 |
<input type="hidden" name="public" value="[% public | html %]" /> |
| 817 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
828 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
| 818 |
<p>You will need to save the report before you can execute it.</p> |
|
|
| 819 |
<fieldset class="action" |
829 |
<fieldset class="action" |
| 820 |
><input type="hidden" name="op" value="cud-save" /> |
830 |
><input type="hidden" name="op" value="cud-save" /> |
| 821 |
<input type="submit" name="submit" class="btn btn-primary" value="Save" /> |
831 |
<button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-left-long" aria-hidden="true"></i> Back</button> |
|
|
832 |
<button type="submit" class="btn btn-primary">Next <i class="fa fa-right-long" aria-hidden="true"></i></button> |
| 822 |
</fieldset> |
833 |
</fieldset> |
| 823 |
</form> |
834 |
</form> |
| 824 |
[% END #/ IF ( showreport ) %] |
835 |
[% END #/ IF ( showreport ) %] |
|
Lines 1524-1532
Link Here
|
| 1524 |
[% UNLESS ( errors ) %] |
1535 |
[% UNLESS ( errors ) %] |
| 1525 |
<br /> |
1536 |
<br /> |
| 1526 |
<div id="report_updated"> |
1537 |
<div id="report_updated"> |
| 1527 |
<div class="alert alert-info"> |
1538 |
[% IF ( reportname ) %] |
| 1528 |
<p>Your report "[% reportname | html %]" has been saved</p> |
1539 |
<div class="alert alert-info"> Your report "[% reportname | html %]" has been saved </div> |
| 1529 |
</div> |
1540 |
[% ELSE %] |
|
|
1541 |
<div class="alert alert-warning"> Your report has been saved without a title </div> |
| 1542 |
[% END %] |
| 1530 |
</div> |
1543 |
</div> |
| 1531 |
[% END %] |
1544 |
[% END %] |
| 1532 |
[% END %] |
1545 |
[% END %] |
|
Lines 1908-1914
Link Here
|
| 1908 |
} |
1921 |
} |
| 1909 |
[% END %] |
1922 |
[% END %] |
| 1910 |
|
1923 |
|
| 1911 |
[% IF ( showsql ) %] |
1924 |
[% IF ( showsql || showreport ) %] |
| 1912 |
|
1925 |
|
| 1913 |
var editor = CodeMirror.fromTextArea(sql, { |
1926 |
var editor = CodeMirror.fromTextArea(sql, { |
| 1914 |
lineNumbers: false, |
1927 |
lineNumbers: false, |
| 1915 |
- |
|
|