Lines 49-70
Link Here
|
49 |
[% END %] |
49 |
[% END %] |
50 |
|
50 |
|
51 |
[% IF ( build1 ) %] |
51 |
[% IF ( build1 ) %] |
52 |
[% t("Build a report, step 1 of 6: Choose a module") | html %] |
52 |
[% t("Build a report, step 1 of 7: Choose a module") | html %] |
53 |
› |
53 |
› |
54 |
[% ELSIF ( build2 ) %] |
54 |
[% ELSIF ( build2 ) %] |
55 |
[% t("Build a report, step 2 of 6: Pick a report type") | html %] |
55 |
[% t("Build a report, step 2 of 7: Pick a report type") | html %] |
56 |
› |
56 |
› |
57 |
[% ELSIF ( build3 ) %] |
57 |
[% ELSIF ( build3 ) %] |
58 |
[% t("Build a report, step 3 of 6: Select columns for display") | html %] |
58 |
[% t("Build a report, step 3 of 7: Select columns for display") | html %] |
59 |
› |
59 |
› |
60 |
[% ELSIF ( build4 ) %] |
60 |
[% ELSIF ( build4 ) %] |
61 |
[% t("Build a report, step 4 of 6: Select criteria to limit on") | html %] |
61 |
[% t("Build a report, step 4 of 7: Select criteria to limit on") | html %] |
62 |
› |
62 |
› |
63 |
[% ELSIF ( build5 ) %] |
63 |
[% ELSIF ( build5 ) %] |
64 |
[% t("Build a report, step 5 of 6: Pick which columns to total") | html %] |
64 |
[% t("Build a report, step 5 of 7: Pick which columns to total") | html %] |
65 |
› |
65 |
› |
66 |
[% ELSIF ( build6 ) %] |
66 |
[% ELSIF ( build6 ) %] |
67 |
[% t("Build a report, step 6 of 6: Select how you want the report ordered") | html %] |
67 |
[% t("Build a report, step 6 of 7: Select how you want the report ordered") | html %] |
|
|
68 |
› |
69 |
[% ELSIF ( showreport ) %] |
70 |
[% t("Build a report, step 7 of 7: Confirm custom report") | html %] |
68 |
› |
71 |
› |
69 |
[% END %] |
72 |
[% END %] |
70 |
[% t("Guided reports wizard") | html %] |
73 |
[% t("Guided reports wizard") | html %] |
Lines 171-193
Link Here
|
171 |
[% WRAPPER breadcrumb_item bc_active= 1 %] |
174 |
[% WRAPPER breadcrumb_item bc_active= 1 %] |
172 |
<span>Run</span> |
175 |
<span>Run</span> |
173 |
[% END %] |
176 |
[% END %] |
174 |
[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %] |
177 |
[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 || showreport ) %] |
175 |
[% WRAPPER breadcrumb_item %] |
178 |
[% WRAPPER breadcrumb_item %] |
176 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form">Build a report</a> |
179 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form">Build a report</a> |
177 |
[% END %] |
180 |
[% END %] |
178 |
[% WRAPPER breadcrumb_item bc_active= 1 %] |
181 |
[% WRAPPER breadcrumb_item bc_active= 1 %] |
179 |
[% IF ( build1 ) %] |
182 |
[% IF ( build1 ) %] |
180 |
<span>Step 1 of 6: Choose a module</span> |
183 |
<span>Step 1 of 7: Choose a module</span> |
181 |
[% ELSIF ( build2 ) %] |
184 |
[% ELSIF ( build2 ) %] |
182 |
<span>Step 2 of 6: Pick a report type</span> |
185 |
<span>Step 2 of 7: Pick a report type</span> |
183 |
[% ELSIF ( build3 ) %] |
186 |
[% ELSIF ( build3 ) %] |
184 |
<span>Step 3 of 6: Select columns for display</span> |
187 |
<span>Step 3 of 7: Select columns for display</span> |
185 |
[% ELSIF ( build4 ) %] |
188 |
[% ELSIF ( build4 ) %] |
186 |
<span>Step 4 of 6: Select criteria to limit on</span> |
189 |
<span>Step 4 of 7: Select criteria to limit on</span> |
187 |
[% ELSIF ( build5 ) %] |
190 |
[% ELSIF ( build5 ) %] |
188 |
<span>Step 5 of 6: Pick which columns to total</span> |
191 |
<span>Step 5 of 7: Pick which columns to total</span> |
189 |
[% ELSIF ( build6 ) %] |
192 |
[% ELSIF ( build6 ) %] |
190 |
<span>Step 6 of 6: Select how you want the report ordered</span> |
193 |
<span>Step 6 of 7: Select how you want the report ordered</span> |
|
|
194 |
[% ELSIF ( showreport ) %] |
195 |
<span>Step 7 of 7: Confirm custom report</span> |
191 |
[% END # /IF ( build1 ) %] |
196 |
[% END # /IF ( build1 ) %] |
192 |
[% END # /WRAPPER breadcrumb_item %] |
197 |
[% END # /WRAPPER breadcrumb_item %] |
193 |
[% END # /IF ( saved1 ) %] |
198 |
[% END # /IF ( saved1 ) %] |
Lines 227-233
Link Here
|
227 |
<h1>Guided reports</h1> |
232 |
<h1>Guided reports</h1> |
228 |
<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> |
233 |
<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> |
229 |
|
234 |
|
230 |
<h3>Build and run reports</h3> |
235 |
<h2>Build and run reports</h2> |
231 |
|
236 |
|
232 |
[% IF ( CAN_user_reports_create_reports ) %] |
237 |
[% IF ( CAN_user_reports_create_reports ) %] |
233 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form" class="btn btn-primary">Build new</a> |
238 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form" class="btn btn-primary">Build new</a> |
Lines 241-247
Link Here
|
241 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form_sql" class="btn btn-primary">Create report from SQL</a> |
246 |
<a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form_sql" class="btn btn-primary">Create report from SQL</a> |
242 |
[% END %] |
247 |
[% END %] |
243 |
|
248 |
|
244 |
<h3>Reports Dictionary</h3> |
249 |
<h2>Reports Dictionary</h2> |
245 |
<p>Use the reports dictionary to define custom criteria to use in your reports</p> |
250 |
<p>Use the reports dictionary to define custom criteria to use in your reports</p> |
246 |
<a href="/cgi-bin/koha/reports/dictionary.pl?op=list" class="btn btn-primary">View dictionary</a> |
251 |
<a href="/cgi-bin/koha/reports/dictionary.pl?op=list" class="btn btn-primary">View dictionary</a> |
247 |
[% END # /IF (start) %] |
252 |
[% END # /IF (start) %] |
Lines 503-509
Link Here
|
503 |
<form method="post" action="/cgi-bin/koha/reports/guided_reports.pl"> |
508 |
<form method="post" action="/cgi-bin/koha/reports/guided_reports.pl"> |
504 |
[% INCLUDE 'csrf-token.inc' %] |
509 |
[% INCLUDE 'csrf-token.inc' %] |
505 |
<fieldset class="rows"> |
510 |
<fieldset class="rows"> |
506 |
<legend>Step 1 of 6: Choose a module to report on,[% IF (usecache) %]Set cache expiry,[% END %] and choose report visibility </legend> |
511 |
<legend>Step 1 of 7: Choose a module to report on,[% IF (usecache) %]Set cache expiry,[% END %] and choose report visibility </legend> |
507 |
<ol> |
512 |
<ol> |
508 |
<li> |
513 |
<li> |
509 |
<label for="area">Choose: </label> |
514 |
<label for="area">Choose: </label> |
Lines 561-567
Link Here
|
561 |
<input type="hidden" name="public" value="[% public | html %]" /> |
566 |
<input type="hidden" name="public" value="[% public | html %]" /> |
562 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
567 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
563 |
<fieldset class="rows"> |
568 |
<fieldset class="rows"> |
564 |
<legend>Step 2 of 6: Pick a report type</legend> |
569 |
<legend>Step 2 of 7: Pick a report type</legend> |
565 |
<ol> |
570 |
<ol> |
566 |
<li> |
571 |
<li> |
567 |
<label for="types">Choose: </label> |
572 |
<label for="types">Choose: </label> |
Lines 584-591
Link Here
|
584 |
|
589 |
|
585 |
[% IF ( build3 ) %] |
590 |
[% IF ( build3 ) %] |
586 |
<h1>Build a report</h1> |
591 |
<h1>Build a report</h1> |
587 |
<h3>Step 3 of 6: Select columns for display</h3> |
|
|
588 |
<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> |
589 |
|
592 |
|
590 |
<form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
593 |
<form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
591 |
[% INCLUDE 'csrf-token.inc' %] |
594 |
[% INCLUDE 'csrf-token.inc' %] |
Lines 594-599
Link Here
|
594 |
<input type="hidden" name="public" value="[% public | html %]" /> |
597 |
<input type="hidden" name="public" value="[% public | html %]" /> |
595 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
598 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
596 |
<fieldset> |
599 |
<fieldset> |
|
|
600 |
<legend>Step 3 of 7: Select columns for display</legend> |
601 |
<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> |
602 |
|
597 |
<div id="column_selection"> |
603 |
<div id="column_selection"> |
598 |
<div id="column_options"> |
604 |
<div id="column_options"> |
599 |
<select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;"> |
605 |
<select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;"> |
Lines 641-647
Link Here
|
641 |
<input type="hidden" name="public" value="[% public | html %]" /> |
647 |
<input type="hidden" name="public" value="[% public | html %]" /> |
642 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
648 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
643 |
<fieldset> |
649 |
<fieldset> |
644 |
<legend>Step 4 of 6: Select criteria to limit on</legend> |
650 |
<legend>Step 4 of 7: Select criteria to limit on</legend> |
645 |
<table> |
651 |
<table> |
646 |
[% FOREACH criteri IN criteria %] |
652 |
[% FOREACH criteri IN criteria %] |
647 |
<tr> |
653 |
<tr> |
Lines 726-732
Link Here
|
726 |
|
732 |
|
727 |
[% IF ( build5 ) %] |
733 |
[% IF ( build5 ) %] |
728 |
<h1>Build a report</h1> |
734 |
<h1>Build a report</h1> |
729 |
<h3>Step 5 of 6: Pick which columns to total</h3> |
|
|
730 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
735 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
731 |
[% INCLUDE 'csrf-token.inc' %] |
736 |
[% INCLUDE 'csrf-token.inc' %] |
732 |
<input type="hidden" name="area" value="[% area | html %]" /> |
737 |
<input type="hidden" name="area" value="[% area | html %]" /> |
Lines 737-742
Link Here
|
737 |
<input type="hidden" name="public" value="[% public | html %]" /> |
742 |
<input type="hidden" name="public" value="[% public | html %]" /> |
738 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
743 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
739 |
<fieldset> |
744 |
<fieldset> |
|
|
745 |
<legend>Step 5 of 7: Pick which columns to total</legend> |
740 |
<table> |
746 |
<table> |
741 |
[% FOREACH total_b IN total_by %] |
747 |
[% FOREACH total_b IN total_by %] |
742 |
<tr> |
748 |
<tr> |
Lines 766-772
Link Here
|
766 |
|
772 |
|
767 |
[% IF ( build6 ) %] |
773 |
[% IF ( build6 ) %] |
768 |
<h1>Build a report</h1> |
774 |
<h1>Build a report</h1> |
769 |
<h3>Step 6 of 6: Choose how you want the report ordered</h3> |
|
|
770 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
775 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
771 |
[% INCLUDE 'csrf-token.inc' %] |
776 |
[% INCLUDE 'csrf-token.inc' %] |
772 |
<input type="hidden" name="area" value="[% area | html %]" /> |
777 |
<input type="hidden" name="area" value="[% area | html %]" /> |
Lines 778-783
Link Here
|
778 |
<input type="hidden" name="public" value="[% public | html %]" /> |
783 |
<input type="hidden" name="public" value="[% public | html %]" /> |
779 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
784 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
780 |
<fieldset> |
785 |
<fieldset> |
|
|
786 |
<legend>Step 6 of 7: Choose how you want the report ordered</legend> |
781 |
<table> |
787 |
<table> |
782 |
[% FOREACH order_b IN order_by %] |
788 |
[% FOREACH order_b IN order_by %] |
783 |
<tr> |
789 |
<tr> |
Lines 798-812
Link Here
|
798 |
</fieldset> |
804 |
</fieldset> |
799 |
<fieldset class="action"> |
805 |
<fieldset class="action"> |
800 |
<input type="hidden" name="op" value="cud-build_report" /> |
806 |
<input type="hidden" name="op" value="cud-build_report" /> |
801 |
<input type="submit" name="submit" class="btn btn-primary" value="Finish" /> |
807 |
<button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-left-long" aria-hidden="true"></i> Back</button> |
|
|
808 |
<button type="submit" class="btn btn-primary">Next <i class="fa fa-right-long" aria-hidden="true"></i></button> |
802 |
</fieldset> |
809 |
</fieldset> |
803 |
</form> |
810 |
</form> |
804 |
[% END #/ IF ( build6 ) %] |
811 |
[% END #/ IF ( build6 ) %] |
805 |
|
812 |
|
806 |
[% IF ( showreport ) %] |
813 |
[% IF ( showreport ) %] |
807 |
<h1>Confirm custom report</h1> |
814 |
<h1>Build a report</h1> |
808 |
<p>Your report will be generated with the following SQL statement.</p> |
815 |
<div class="page-section"> |
809 |
<p> [% sql | html %] </p> |
816 |
<h2>Step 7 of 7: Confirm custom report</h2> |
|
|
817 |
<p>Your report will be generated with the following SQL statement.</p> |
818 |
<textarea id="sql" readonly="readonly">[% sql | html %]</textarea> |
819 |
<div class="alert alert-info">You may add a title to your report in the next step.</div> |
820 |
</div> |
810 |
|
821 |
|
811 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
822 |
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> |
812 |
[% INCLUDE 'csrf-token.inc' %] |
823 |
[% INCLUDE 'csrf-token.inc' %] |
Lines 814-823
Link Here
|
814 |
<input type="hidden" name="type" value="[% type | html %]" /> |
825 |
<input type="hidden" name="type" value="[% type | html %]" /> |
815 |
<input type="hidden" name="public" value="[% public | html %]" /> |
826 |
<input type="hidden" name="public" value="[% public | html %]" /> |
816 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
827 |
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> |
817 |
<p>You will need to save the report before you can execute it</p> |
|
|
818 |
<fieldset class="action" |
828 |
<fieldset class="action" |
819 |
><input type="hidden" name="op" value="cud-save" /> |
829 |
><input type="hidden" name="op" value="cud-save" /> |
820 |
<input type="submit" name="submit" class="btn btn-primary" value="Next" /> |
830 |
<button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-left-long" aria-hidden="true"></i> Back</button> |
|
|
831 |
<button type="submit" class="btn btn-primary">Next <i class="fa fa-right-long" aria-hidden="true"></i></button> |
821 |
</fieldset> |
832 |
</fieldset> |
822 |
</form> |
833 |
</form> |
823 |
[% END #/ IF ( showreport ) %] |
834 |
[% END #/ IF ( showreport ) %] |
Lines 1496-1504
Link Here
|
1496 |
[% UNLESS ( errors ) %] |
1507 |
[% UNLESS ( errors ) %] |
1497 |
<br /> |
1508 |
<br /> |
1498 |
<div id="report_updated"> |
1509 |
<div id="report_updated"> |
1499 |
<div class="alert alert-info"> |
1510 |
[% IF ( reportname ) %] |
1500 |
<p>Your report "[% reportname | html %]" has been saved</p> |
1511 |
<div class="alert alert-info"> Your report "[% reportname | html %]" has been saved </div> |
1501 |
</div> |
1512 |
[% ELSE %] |
|
|
1513 |
<div class="alert alert-warning"> Your report has been saved without a title </div> |
1514 |
[% END %] |
1502 |
</div> |
1515 |
</div> |
1503 |
[% END %] |
1516 |
[% END %] |
1504 |
[% END %] |
1517 |
[% END %] |
Lines 1883-1889
Link Here
|
1883 |
} |
1896 |
} |
1884 |
[% END %] |
1897 |
[% END %] |
1885 |
|
1898 |
|
1886 |
[% IF ( showsql ) %] |
1899 |
[% IF ( showsql || showreport ) %] |
1887 |
|
1900 |
|
1888 |
var editor = CodeMirror.fromTextArea(sql, { |
1901 |
var editor = CodeMirror.fromTextArea(sql, { |
1889 |
lineNumbers: false, |
1902 |
lineNumbers: false, |
1890 |
- |
|
|