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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc (-3 / +3 lines)
Lines 1-15 Link Here
1
<div id="navmenu">
1
<div id="navmenu">
2
<div id="navmenulist">
2
<div id="navmenulist">
3
3
4
<h5>Run reports</h5>
4
<h2>Run reports</h2>
5
<ul>
5
<ul>
6
	[% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a></li>[% END %]
6
	[% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a></li>[% END %]
7
</ul>
7
</ul>
8
<h5>Reports dictionary</h5>
8
<h2>Reports dictionary</h2>
9
<ul>
9
<ul>
10
<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li>
10
<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li>
11
</ul>
11
</ul>
12
<h5>Useful resources</h5>
12
<h2>Useful resources</h2>
13
<ul>
13
<ul>
14
<li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha report library</a></li>
14
<li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha report library</a></li>
15
<li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li>
15
<li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc (-6 / +6 lines)
Lines 3-9 Link Here
3
<div id="navmenu">
3
<div id="navmenu">
4
    <div id="navmenulist">
4
    <div id="navmenulist">
5
5
6
        <h5>Guided reports</h5>
6
        <h2>Guided reports</h2>
7
            <ul>
7
            <ul>
8
                <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports</a></li>
8
                <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports</a></li>
9
                [% IF ( CAN_user_reports_create_reports ) %]
9
                [% IF ( CAN_user_reports_create_reports ) %]
Lines 17-23 Link Here
17
                [% END %]
17
                [% END %]
18
            </ul>
18
            </ul>
19
19
20
        <h5>Statistics wizards</h5>
20
        <h2>Statistics wizards</h2>
21
            <ul>
21
            <ul>
22
                <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
22
                <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
23
                <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
23
                <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
Lines 29-54 Link Here
29
            </ul>
29
            </ul>
30
30
31
        [% IF Koha.ArePluginsEnabled() %]
31
        [% IF Koha.ArePluginsEnabled() %]
32
            <h5>Report plugins</h5>
32
            <h2>Report plugins</h2>
33
            <ul>
33
            <ul>
34
                <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li>
34
                <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li>
35
            </ul>
35
            </ul>
36
        [% END %]
36
        [% END %]
37
37
38
        <h5>Top lists</h5>
38
        <h2>Top lists</h2>
39
        <ul>
39
        <ul>
40
            <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
40
            <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
41
            <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li>
41
            <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li>
42
        </ul>
42
        </ul>
43
43
44
        <h5>Inactive</h5>
44
        <h2>Inactive</h2>
45
        <ul>
45
        <ul>
46
            <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li>
46
            <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li>
47
            <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items with no checkouts</a></li>
47
            <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items with no checkouts</a></li>
48
        </ul>
48
        </ul>
49
49
50
50
51
        <h5>Other</h5>
51
        <h2>Other</h2>
52
        <ul>
52
        <ul>
53
            <li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost items</a></li>
53
            <li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost items</a></li>
54
            <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li>
54
            <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt (-3 / +3 lines)
Lines 48-54 Link Here
48
		[% END %]
48
		[% END %]
49
		
49
		
50
		[% IF ( mainloo.looptables ) %]
50
		[% IF ( mainloo.looptables ) %]
51
			<h3><a name="summary" id="summary"></a>Summary</h3>
51
<h2><a name="summary" id="summary"></a>Summary</h2>
52
			<table id="summary_table">
52
			<table id="summary_table">
53
                <tr><th>Group</th><th>Call number range</th><th>Number of items displayed</th><th>Total items in group</th>
53
                <tr><th>Group</th><th>Call number range</th><th>Number of items displayed</th><th>Total items in group</th>
54
				</tr>
54
				</tr>
Lines 68-76 Link Here
68
68
69
		[% END %]
69
		[% END %]
70
		[% FOREACH looptable IN mainloo.looptables %]
70
		[% FOREACH looptable IN mainloo.looptables %]
71
		<h3><a id="table[% looptable.coltitle | html %]"></a>
71
<h2><a id="table[% looptable.coltitle | html %]"></a>
72
			[% looptable.coltitle | html %]
72
			[% looptable.coltitle | html %]
73
		</h3>
73
</h2>
74
		<table>
74
		<table>
75
			<tr>
75
			<tr>
76
				<th>#</th>
76
				<th>#</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt (-2 / +2 lines)
Lines 9-20 Link Here
9
                There is no valid report for this id.
9
                There is no valid report for this id.
10
            [% ELSIF msg == 'can_be_updated' %]
10
            [% ELSIF msg == 'can_be_updated' %]
11
                <div id="col1">
11
                <div id="col1">
12
                    <h3>Existing SQL</h3>
12
                    <h2>Existing SQL</h2>
13
                    <span class="show_sql">[% current_sql | html_entity %]</span>
13
                    <span class="show_sql">[% current_sql | html_entity %]</span>
14
                </div>
14
                </div>
15
15
16
                <div id="col2">
16
                <div id="col2">
17
                    <h3>Updated SQL</h3>
17
                    <h2>Updated SQL</h2>
18
                    <span class="show_sql">[% updated_sql | html_entity %]</span>
18
                    <span class="show_sql">[% updated_sql | html_entity %]</span>
19
                </div>
19
                </div>
20
            [% ELSE %]
20
            [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt (-5 / +5 lines)
Lines 154-160 Link Here
154
[% END %]
154
[% END %]
155
155
156
[% IF ( new_dictionary ) %]
156
[% IF ( new_dictionary ) %]
157
<h3>Add new definition</h3>
157
<h2>Add new definition</h2>
158
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
158
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
159
<fieldset class="rows"><legend>Step 1 of 5: Name the new definition</legend><ol>
159
<fieldset class="rows"><legend>Step 1 of 5: Name the new definition</legend><ol>
160
<li>
160
<li>
Lines 173-179 Link Here
173
[% END %]
173
[% END %]
174
174
175
[%- IF ( step_2 ) -%]
175
[%- IF ( step_2 ) -%]
176
<h3>Add new definition</h3>
176
<h2>Add new definition</h2>
177
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
177
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
178
  <fieldset class="rows">
178
  <fieldset class="rows">
179
    <legend>Step 2 of 5: Choose the area</legend>
179
    <legend>Step 2 of 5: Choose the area</legend>
Lines 195-201 Link Here
195
[%- END -%]
195
[%- END -%]
196
196
197
[% IF ( step_3 ) %]
197
[% IF ( step_3 ) %]
198
<h3>Add new definition</h3>
198
<h2>Add new definition</h2>
199
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">      
199
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">      
200
<fieldset class="rows">
200
<fieldset class="rows">
201
<legend>Step 3 of 5: Choose a column</legend>
201
<legend>Step 3 of 5: Choose a column</legend>
Lines 231-237 Link Here
231
[% END %]
231
[% END %]
232
232
233
[% IF ( step_4 ) %]
233
[% IF ( step_4 ) %]
234
<h3>Add new definition</h3>
234
<h2>Add new definition</h2>
235
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
235
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
236
<fieldset class="rows">
236
<fieldset class="rows">
237
<legend>Step 4 of 5: Specify a value</legend>
237
<legend>Step 4 of 5: Specify a value</legend>
Lines 287-293 Link Here
287
<input type="hidden" name="definition_description" value="[% definition_description | html %]" />
287
<input type="hidden" name="definition_description" value="[% definition_description | html %]" />
288
<input type="hidden" name="columnstring" value="[% columnstring | html %]" />
288
<input type="hidden" name="columnstring" value="[% columnstring | html %]" />
289
289
290
<h3>Add new definition</h3>
290
<h2>Add new definition</h2>
291
291
292
<fieldset class="rows">
292
<fieldset class="rows">
293
  <legend>Step 5 of 5: Confirm details</legend>
293
  <legend>Step 5 of 5: Confirm details</legend>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-13 / +13 lines)
Lines 143-149 Link Here
143
        <div class="modal-content">
143
        <div class="modal-content">
144
            <div class="modal-header">
144
            <div class="modal-header">
145
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
145
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
146
                <h3 id="update_sql_label">Update SQL</h3>
146
                <h2 id="update_sql_label">Update SQL</h2>
147
            </div>
147
            </div>
148
            <div class="modal-body">
148
            <div class="modal-body">
149
                <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div>
149
                <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div>
Lines 167-173 Link Here
167
                    <h1>Guided reports</h1>
167
                    <h1>Guided reports</h1>
168
                    <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>
168
                    <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>
169
169
170
                    <h3>Build and run reports</h3>
170
                    <h2>Build and run reports</h2>
171
171
172
                    [% IF ( CAN_user_reports_create_reports ) %]
172
                    [% IF ( CAN_user_reports_create_reports ) %]
173
                        <form action="/cgi-bin/koha/reports/guided_reports.pl">
173
                        <form action="/cgi-bin/koha/reports/guided_reports.pl">
Lines 190-196 Link Here
190
                        </form>
190
                        </form>
191
                    [% END %]
191
                    [% END %]
192
192
193
                    <h3>Reports Dictionary</h3>
193
                    <h2>Reports Dictionary</h2>
194
                    <p>Use the reports dictionary to define custom criteria to use in your reports</p>
194
                    <p>Use the reports dictionary to define custom criteria to use in your reports</p>
195
                    <form action="/cgi-bin/koha/reports/dictionary.pl">
195
                    <form action="/cgi-bin/koha/reports/dictionary.pl">
196
                        <input type="hidden" name="phase" value="View Dictionary"/>
196
                        <input type="hidden" name="phase" value="View Dictionary"/>
Lines 408-414 Link Here
408
                    [% ELSE # IF ( savedreports ) %]
408
                    [% ELSE # IF ( savedreports ) %]
409
                        <div class="dialog message">
409
                        <div class="dialog message">
410
                            [% IF (filter_set || filters.date || filters.author || filters.keyword) %]
410
                            [% IF (filter_set || filters.date || filters.author || filters.keyword) %]
411
                                <h4>No saved reports match your criteria. </h4>
411
                                <h2>No saved reports match your criteria. </h2>
412
                                [% IF ( CAN_user_reports_create_reports ) %]
412
                                [% IF ( CAN_user_reports_create_reports ) %]
413
                                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
413
                                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
414
                                        <input type="hidden" name="phase" value="Build new" />
414
                                        <input type="hidden" name="phase" value="Build new" />
Lines 428-434 Link Here
428
                                    </form>
428
                                    </form>
429
                                [% END %]
429
                                [% END %]
430
                            [% ELSE %]
430
                            [% ELSE %]
431
                                <h4>There are no saved reports. </h4>
431
                                <h2>There are no saved reports. </h2>
432
                                [% IF ( CAN_user_reports_create_reports ) %]
432
                                [% IF ( CAN_user_reports_create_reports ) %]
433
                                    <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a new report?</a>
433
                                    <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a new report?</a>
434
                                [% END %]
434
                                [% END %]
Lines 528-534 Link Here
528
528
529
                [% IF ( build3 ) %]
529
                [% IF ( build3 ) %]
530
                    <h1>Build a report</h1>
530
                    <h1>Build a report</h1>
531
                    <h3>Step 3 of 6: Select columns for display</h3>
531
                    <h2>Step 3 of 6: Select columns for display</h2>
532
                    <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>
532
                    <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>
533
533
534
                    <form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
534
                    <form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
Lines 670-676 Link Here
670
670
671
                [% IF ( build5 ) %]
671
                [% IF ( build5 ) %]
672
                    <h1>Build a report</h1>
672
                    <h1>Build a report</h1>
673
                    <h3>Step 5 of 6: Pick which columns to total</h3>
673
                    <h2>Step 5 of 6: Pick which columns to total</h2>
674
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
674
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
675
                        <input type="hidden" name="area" value="[% area | html %]" />
675
                        <input type="hidden" name="area" value="[% area | html %]" />
676
                        <input type="hidden" name="type" value="[% type | html %]" />
676
                        <input type="hidden" name="type" value="[% type | html %]" />
Lines 708-714 Link Here
708
708
709
                [% IF ( build6 ) %]
709
                [% IF ( build6 ) %]
710
                    <h1>Build a report</h1>
710
                    <h1>Build a report</h1>
711
                    <h3>Step 6 of 6: Choose how you want the report ordered</h3>
711
                    <h2>Step 6 of 6: Choose how you want the report ordered</h2>
712
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
712
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
713
                        <input type="hidden" name="area" value="[% area | html %]" />
713
                        <input type="hidden" name="area" value="[% area | html %]" />
714
                        <input type="hidden" name="type" value="[% type | html %]" />
714
                        <input type="hidden" name="type" value="[% type | html %]" />
Lines 793-799 Link Here
793
793
794
                [% IF ( warn_authval_problem ) %]
794
                [% IF ( warn_authval_problem ) %]
795
                    <div class="dialog alert">
795
                    <div class="dialog alert">
796
                        <h3>Errors found when processing parameters for report: [% name | html %]</h3>
796
                        <h1>Errors found when processing parameters for report: [% name | html %]</h1>
797
                        [% FOREACH problematic_authval IN problematic_authvals %]
797
                        [% FOREACH problematic_authval IN problematic_authvals %]
798
                            <p>
798
                            <p>
799
                            <strong>[% problematic_authval.name | html %]:</strong> The authorized value category (<strong>[% problematic_authval.authval | html %]</strong>)
799
                            <strong>[% problematic_authval.name | html %]:</strong> The authorized value category (<strong>[% problematic_authval.authval | html %]</strong>)
Lines 834-840 Link Here
834
                        [% IF ( auth_val_error ) %]
834
                        [% IF ( auth_val_error ) %]
835
                            <input type='hidden' name='phase' value='Edit SQL' />
835
                            <input type='hidden' name='phase' value='Edit SQL' />
836
                            <div class="dialog alert">
836
                            <div class="dialog alert">
837
                                <h3>Errors found when processing parameters for report: [% name | html %]</h3>
837
                                <h1>Errors found when processing parameters for report: [% name | html %]</h1>
838
                                [% FOREACH auth_val_error IN auth_val_errors %]
838
                                [% FOREACH auth_val_error IN auth_val_errors %]
839
                                    <p>
839
                                    <p>
840
                                        <strong>[% auth_val_error.entry | html %]:</strong> The authorized value category (<strong>[% auth_val_error.auth_val | html %]</strong>)
840
                                        <strong>[% auth_val_error.entry | html %]:</strong> The authorized value category (<strong>[% auth_val_error.auth_val | html %]</strong>)
Lines 1315-1321 Link Here
1315
                            <input type="hidden" name="phase" value="Use saved" />
1315
                            <input type="hidden" name="phase" value="Use saved" />
1316
                            <input type="hidden" name="filter_set" value="1" />
1316
                            <input type="hidden" name="filter_set" value="1" />
1317
                            <fieldset class="brief">
1317
                            <fieldset class="brief">
1318
                                <h3>Filter</h3>
1318
                                <h2>Filter</h2>
1319
                                <ol>
1319
                                <ol>
1320
                                    <li>
1320
                                    <li>
1321
                                        <label for="filter_date">Date:</label>
1321
                                        <label for="filter_date">Date:</label>
Lines 1350-1356 Link Here
1350
            <div class="modal-content">
1350
            <div class="modal-content">
1351
                <div class="modal-header">
1351
                <div class="modal-header">
1352
                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
1352
                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
1353
                    <h4 class="modal-title" id="runtime_parametersLabel">Runtime parameter options</h4>
1353
                    <h2 class="modal-title" id="runtime_parametersLabel">Runtime parameter options</h2>
1354
                </div>
1354
                </div>
1355
                <form id="send_runtime_parameter">
1355
                <form id="send_runtime_parameter">
1356
                    <input type="hidden" name="param_category" id="param_category" />
1356
                    <input type="hidden" name="param_category" id="param_category" />
Lines 2152-2158 Link Here
2152
                            <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">\
2152
                            <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">\
2153
                                <span aria-hidden="true">×</span>\
2153
                                <span aria-hidden="true">×</span>\
2154
                            </button>\
2154
                            </button>\
2155
                            <h4 class="modal-title">' + title + '</h4>\
2155
                            <h2 class="modal-title">' + title + '</h2>\
2156
                        </div>\
2156
                        </div>\
2157
                        <div class="modal-body"><textarea id="code' + reportid + '">' + message + '</textarea>\
2157
                        <div class="modal-body"><textarea id="code' + reportid + '">' + message + '</textarea>\
2158
                        <div class="modal-footer">\
2158
                        <div class="modal-footer">\
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt (-2 / +1 lines)
Lines 50-56 Link Here
50
                        </form>
50
                        </form>
51
                    [% END %]
51
                    [% END %]
52
52
53
        <h5>Reports dictionary</h5>
53
        <h2>Reports dictionary</h2>
54
        <ul>
54
        <ul>
55
            <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li>
55
            <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li>
56
        </ul>
56
        </ul>
57
- 

Return to bug 27741