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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-45 / +44 lines)
Lines 94-100 Link Here
94
            › Step 6 of 6: Select how you want the report ordered
94
            › Step 6 of 6: Select how you want the report ordered
95
        [% END %]
95
        [% END %]
96
    [% END %]
96
    [% END %]
97
</div>
97
</div> <!-- /#breadcrumbs -->
98
98
99
<div id="update_sql" class="modal" tabindex="-1" role="dialog" aria-labelledby="update_sql_label" aria-hidden="true">
99
<div id="update_sql" class="modal" tabindex="-1" role="dialog" aria-labelledby="update_sql_label" aria-hidden="true">
100
    <div class="modal-dialog">
100
    <div class="modal-dialog">
Lines 110-118 Link Here
110
                <a href="#" class="btn btn-default" id="update_sql_button" role="button" data-toggle="modal">Update</a>
110
                <a href="#" class="btn btn-default" id="update_sql_button" role="button" data-toggle="modal">Update</a>
111
                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
111
                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
112
            </div>
112
            </div>
113
        </div>
113
        </div> <!-- /.modal-content -->
114
    </div>
114
    </div> <!-- /.modal-dialog -->
115
</div>
115
</div> <!-- #update_sql -->
116
116
117
<div class="main container-fluid">
117
<div class="main container-fluid">
118
    <div class="row">
118
    <div class="row">
Lines 154-160 Link Here
154
                        <input type="hidden" name="phase" value="View Dictionary"/>
154
                        <input type="hidden" name="phase" value="View Dictionary"/>
155
                        <input type="submit" name="submit" value="View dictionary"/>
155
                        <input type="submit" name="submit" value="View dictionary"/>
156
                    </form>
156
                    </form>
157
                [% END %]
157
                [% END # /IF (start) %]
158
158
159
                [% IF report_converted %]
159
                [% IF report_converted %]
160
                    <div class="dialog message">
160
                    <div class="dialog message">
Lines 359-365 Link Here
359
                                </form>
359
                                </form>
360
                            </div>
360
                            </div>
361
                        </div>
361
                        </div>
362
                    [% ELSE %]
362
                    [% ELSE # IF ( savedreports ) %]
363
                        <div class="dialog message">
363
                        <div class="dialog message">
364
                            [% IF (filter_set || filters.date || filters.author || filters.keyword) %]
364
                            [% IF (filter_set || filters.date || filters.author || filters.keyword) %]
365
                                <h4>No saved reports match your criteria. </h4>
365
                                <h4>No saved reports match your criteria. </h4>
Lines 386-395 Link Here
386
                                [% IF ( CAN_user_reports_create_reports ) %]
386
                                [% IF ( CAN_user_reports_create_reports ) %]
387
                                    <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a new report?</a>
387
                                    <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a new report?</a>
388
                                [% END %]
388
                                [% END %]
389
                            [% END %]
389
                            [% END # IF (filter_set || filters.date || filters.author || filters.keyword) %]
390
                        </div>
390
                        </div> <!-- /.dialog.message -->
391
                    [% END %]
391
                    [% END # /IF ( savedreports ) %]
392
                [% END %]
392
                [% END # /IF ( saved1 ) %]
393
393
394
                [% INCLUDE 'mana/mana-share-report.inc' %]
394
                [% INCLUDE 'mana/mana-share-report.inc' %]
395
395
Lines 444-456 Link Here
444
                                    </li>
444
                                    </li>
445
                                [% END %]
445
                                [% END %]
446
                            </ol>
446
                            </ol>
447
                        </fieldset>
447
                        </fieldset> <!-- /.rows -->
448
                        <fieldset class="action">
448
                        <fieldset class="action">
449
                            <input type="hidden" name="phase" value="Report on this Area" />
449
                            <input type="hidden" name="phase" value="Report on this Area" />
450
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
450
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
451
                        </fieldset>
451
                        </fieldset>
452
                    </form>
452
                    </form>
453
                [% END %]
453
                [% END # /build1 %]
454
454
455
                [% IF ( build2 ) %]
455
                [% IF ( build2 ) %]
456
                    <h1>Build a report</h1>
456
                    <h1>Build a report</h1>
Lines 478-484 Link Here
478
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
478
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
479
                        </fieldset>
479
                        </fieldset>
480
                    </form>
480
                    </form>
481
                [% END %]
481
                [% END # /IF (build2 ) %]
482
482
483
                [% IF ( build3 ) %]
483
                [% IF ( build3 ) %]
484
                    <h1>Build a report</h1>
484
                    <h1>Build a report</h1>
Lines 519-539 Link Here
519
                                        <input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br />
519
                                        <input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br />
520
                                        <input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" />
520
                                        <input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" />
521
                                    </div>
521
                                    </div>
522
                                </div>
522
                                </div> <!-- /.col-sm-6 -->
523
523
524
                                <div class="col-sm-6">
524
                                <div class="col-sm-6">
525
                                    <select id="selectedColumns" name="columns" multiple="multiple" size="25" style="width:200px; height:300px;">
525
                                    <select id="selectedColumns" name="columns" multiple="multiple" size="25" style="width:200px; height:300px;">
526
                                    </select>
526
                                    </select>
527
                                </div>
527
                                </div>
528
                            </div>
528
                            </div> <!-- /.row -->
529
                        </fieldset>
529
                        </fieldset>
530
                        <fieldset class="action">
530
                        <fieldset class="action">
531
                            <input type="hidden" name="phase" value="Choose these columns" />
531
                            <input type="hidden" name="phase" value="Choose these columns" />
532
                            <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
532
                            <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
533
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
533
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
534
                        </fieldset>
534
                        </fieldset>
535
                    </form>
535
                    </form> <!-- /#column_submit -->
536
                [% END %]
536
                [% END # /IF ( build3 ) %]
537
537
538
                [% IF ( build4 ) %]
538
                [% IF ( build4 ) %]
539
                    <h1>Build a report</h1>
539
                    <h1>Build a report</h1>
Lines 620-626 Link Here
620
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
620
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
621
                        </fieldset>
621
                        </fieldset>
622
                    </form>
622
                    </form>
623
                [% END %]
623
                [% END # /IF ( build4 ) %]
624
624
625
                [% IF ( build5 ) %]
625
                [% IF ( build5 ) %]
626
                    <h1>Build a report</h1>
626
                    <h1>Build a report</h1>
Lines 658-664 Link Here
658
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
658
                            <input type="submit" name="submit" value="Next &gt;&gt;" />
659
                        </fieldset>
659
                        </fieldset>
660
                    </form>
660
                    </form>
661
                [% END %]
661
                [% END # /IF ( build5 ) %]
662
662
663
                [% IF ( build6 ) %]
663
                [% IF ( build6 ) %]
664
                    <h1>Build a report</h1>
664
                    <h1>Build a report</h1>
Lines 696-702 Link Here
696
                            <input type="submit" name="submit" value="Finish" />
696
                            <input type="submit" name="submit" value="Finish" />
697
                        </fieldset>
697
                        </fieldset>
698
                    </form>
698
                    </form>
699
                [% END %]
699
                [% END #/ IF ( build6 ) %]
700
700
701
                [% IF ( showreport ) %]
701
                [% IF ( showreport ) %]
702
                    <h1>Confirm custom report</h1>
702
                    <h1>Confirm custom report</h1>
Lines 715-721 Link Here
715
                            <input type="submit" name="submit" value="Save" />
715
                            <input type="submit" name="submit" value="Save" />
716
                        </fieldset>
716
                        </fieldset>
717
                    </form>
717
                    </form>
718
                [% END %]
718
                [% END #/ IF ( showreport ) %]
719
719
720
                [% IF ( save ) %]
720
                [% IF ( save ) %]
721
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">
721
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">
Lines 743-749 Link Here
743
                            <input type="submit" name="submit" value="Save report" />
743
                            <input type="submit" name="submit" value="Save report" />
744
                        </fieldset>
744
                        </fieldset>
745
                    </form>
745
                    </form>
746
                [% END %]
746
                [% END # /IF( save ) %]
747
747
748
                [% IF ( warn_authval_problem ) %]
748
                [% IF ( warn_authval_problem ) %]
749
                    <div class="dialog alert">
749
                    <div class="dialog alert">
Lines 780-786 Link Here
780
                            <button type="button" class="new goback"><i class="fa fa-fw fa-pencil"></i> Edit SQL</button>
780
                            <button type="button" class="new goback"><i class="fa fa-fw fa-pencil"></i> Edit SQL</button>
781
                        </form>
781
                        </form>
782
                    </div>
782
                    </div>
783
                [% END %]
783
                [% END # /IF ( warn_authval_problem )%]
784
784
785
                [% IF ( enter_params ) %]
785
                [% IF ( enter_params ) %]
786
                    <form action='/cgi-bin/koha/reports/guided_reports.pl'>
786
                    <form action='/cgi-bin/koha/reports/guided_reports.pl'>
Lines 797-803 Link Here
797
                                [% END %]
797
                                [% END %]
798
                            </div>
798
                            </div>
799
                            <fieldset class="action"><input type="submit" value="Edit SQL" /></fieldset>
799
                            <fieldset class="action"><input type="submit" value="Edit SQL" /></fieldset>
800
                        [% ELSE %]
800
                        [% ELSE #  IF ( auth_val_error ) %]
801
                            <input type='hidden' name='phase' value='Run this report' />
801
                            <input type='hidden' name='phase' value='Run this report' />
802
                            <h1>Enter parameters for report [% name | html %]:</h1>
802
                            <h1>Enter parameters for report [% name | html %]:</h1>
803
                            [% IF ( notes ) %]
803
                            [% IF ( notes ) %]
Lines 828-843 Link Here
828
                                                    [% END %]
828
                                                    [% END %]
829
                                                </select>
829
                                                </select>
830
                                            </li>
830
                                            </li>
831
                                        [% END %]
831
                                        [% END # /IF sql_param.input == 'date' %]
832
                                    [% END %]
832
                                    [% END # /FOREACH sql_param %]
833
                                </ol>
833
                                </ol>
834
                            </fieldset>
834
                            </fieldset> <!-- /.rows -->
835
                            <fieldset class="action">
835
                            <fieldset class="action">
836
                                <input type="submit" value="Run the report" />
836
                                <input type="submit" value="Run the report" />
837
                            </fieldset>
837
                            </fieldset>
838
                        [% END %]
838
                        [% END # / IF ( auth_val_error ) %]
839
                    </form>
839
                    </form>
840
                [% END %]
840
                [% END # /IF ( enter_params ) %]
841
841
842
                [% IF ( execute ) %]
842
                [% IF ( execute ) %]
843
                    <h1>[% name | html %]</h1>
843
                    <h1>[% name | html %]</h1>
Lines 978-984 Link Here
978
                                        </ul> <!-- /.dropdown-menu -->
978
                                        </ul> <!-- /.dropdown-menu -->
979
                                    </div> <!-- /.dropdown -->
979
                                    </div> <!-- /.dropdown -->
980
                                </p>
980
                                </p>
981
                            [% END %]
981
                            [% END # /IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %]
982
                        [% END # UNLESS ( errors ) %]
982
                        [% END # UNLESS ( errors ) %]
983
                    [% END # IF ( execute ) %]
983
                    [% END # IF ( execute ) %]
984
984
Lines 1004-1010 Link Here
1004
                                [% END %]
1004
                                [% END %]
1005
                            [% END %]
1005
                            [% END %]
1006
                        </select>
1006
                        </select>
1007
                    </form>
1007
                    </form> <!-- /#limitselect -->
1008
1008
1009
                    <div class="pages">[% pagination_bar | $raw %]</div>
1009
                    <div class="pages">[% pagination_bar | $raw %]</div>
1010
                    [% UNLESS ( errors ) %]
1010
                    [% UNLESS ( errors ) %]
Lines 1026-1032 Link Here
1026
1026
1027
                    [% INCLUDE 'chart.inc' %]
1027
                    [% INCLUDE 'chart.inc' %]
1028
1028
1029
                [% END %]
1029
                [% END #/IF ( execute ) %]
1030
1030
1031
                [% IF ( create ) %]
1031
                [% IF ( create ) %]
1032
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">
1032
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">
Lines 1060-1066 Link Here
1060
                                            <option value="1">Yes</option>
1060
                                            <option value="1">Yes</option>
1061
                                        </select>
1061
                                        </select>
1062
                                    </li>
1062
                                    </li>
1063
                                [% END %]
1063
                                [% END # /IF (public) %]
1064
1064
1065
                                [% IF (usecache) %]
1065
                                [% IF (usecache) %]
1066
                                    <li>
1066
                                    <li>
Lines 1073-1085 Link Here
1073
                                            <option value="days">Days</option>
1073
                                            <option value="days">Days</option>
1074
                                        </select>
1074
                                        </select>
1075
                                    </li>
1075
                                    </li>
1076
                                [% END %]
1076
                                [% END # /IF (usecache) %]
1077
                                <li>
1077
                                <li>
1078
                                    <label for="notes">Notes:</label>
1078
                                    <label for="notes">Notes:</label>
1079
                                    <textarea id="notes" name="notes" cols="50" rows="2">[% notes | html %]</textarea>
1079
                                    <textarea id="notes" name="notes" cols="50" rows="2">[% notes | html %]</textarea>
1080
                                </li>
1080
                                </li>
1081
                            </ol>
1081
                            </ol>
1082
                        </fieldset>
1082
                        </fieldset> <!-- /.rows -->
1083
1083
1084
                        <fieldset class="rows">
1084
                        <fieldset class="rows">
1085
                            <legend>SQL:</legend>
1085
                            <legend>SQL:</legend>
Lines 1095-1101 Link Here
1095
                            <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>
1095
                            <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>
1096
                        </fieldset>
1096
                        </fieldset>
1097
                    </form>
1097
                    </form>
1098
                [% END %]
1098
                [% END #/IF ( create ) %]
1099
1099
1100
                [% IF saved_results %]
1100
                [% IF saved_results %]
1101
                    <h1>Saved report results</h1>
1101
                    <h1>Saved report results</h1>
Lines 1110-1116 Link Here
1110
                            </tr>
1110
                            </tr>
1111
                        [% END %]
1111
                        [% END %]
1112
                    </table>
1112
                    </table>
1113
                [% END %]
1113
                [% END # /IF saved_results %]
1114
1114
1115
                [% IF ( showsql ) %]
1115
                [% IF ( showsql ) %]
1116
                    <fieldset class="rows">
1116
                    <fieldset class="rows">
Lines 1128-1134 Link Here
1128
                            </li>
1128
                            </li>
1129
                        </ol>
1129
                        </ol>
1130
                    </fieldset>
1130
                    </fieldset>
1131
                [% END %]
1131
                [% END # /IF ( showsql ) %]
1132
1132
1133
                [% IF ( save_successful ) %]
1133
                [% IF ( save_successful ) %]
1134
                    [% UNLESS ( errors ) %]
1134
                    [% UNLESS ( errors ) %]
Lines 1170-1176 Link Here
1170
                                            <option value="1">Yes</option>
1170
                                            <option value="1">Yes</option>
1171
                                        </select>
1171
                                        </select>
1172
                                    </li>
1172
                                    </li>
1173
                                [% END %]
1173
                                [% END # /IF (public) %]
1174
1174
1175
                                [% IF (usecache) %]
1175
                                [% IF (usecache) %]
1176
                                    <li>
1176
                                    <li>
Lines 1189-1195 Link Here
1189
                                    <textarea id="notes" name="notes" cols="50" rows="2">[% notes | html %]</textarea>
1189
                                    <textarea id="notes" name="notes" cols="50" rows="2">[% notes | html %]</textarea>
1190
                                </li>
1190
                                </li>
1191
                            </ol>
1191
                            </ol>
1192
                        </fieldset>
1192
                        </fieldset> <!-- /.rows -->
1193
1193
1194
                        <fieldset class="rows">
1194
                        <fieldset class="rows">
1195
                            <legend>SQL:</legend>
1195
                            <legend>SQL:</legend>
Lines 1204-1210 Link Here
1204
                            <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>
1204
                            <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>
1205
                        </fieldset>
1205
                        </fieldset>
1206
                    </form>
1206
                    </form>
1207
                [% END %]
1207
                [% END # /IF ( editsql ) %]
1208
1208
1209
                [% IF ( errors ) %]
1209
                [% IF ( errors ) %]
1210
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
1210
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
Lines 1232-1238 Link Here
1232
                            <input type="submit" name="submit" value="Saved reports" />
1232
                            <input type="submit" name="submit" value="Saved reports" />
1233
                        </fieldset>
1233
                        </fieldset>
1234
                    </form>
1234
                    </form>
1235
                [% END %]
1235
                [% END # /IF ( errors ) %]
1236
1236
1237
            </main>
1237
            </main>
1238
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
1238
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
Lines 1261-1273 Link Here
1261
                                        <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword | html %]" size="16" />
1261
                                        <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword | html %]" size="16" />
1262
                                    </li>
1262
                                    </li>
1263
                                </ol>
1263
                                </ol>
1264
                            </fieldset>
1264
                            </fieldset> <!-- /.brief -->
1265
                            <fieldset class="action">
1265
                            <fieldset class="action">
1266
                                <input type="submit" value="Apply filter" />
1266
                                <input type="submit" value="Apply filter" />
1267
                                <a id="resetReportsFilter" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1">Clear</a>
1267
                                <a id="resetReportsFilter" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1">Clear</a>
1268
                            </fieldset>
1268
                            </fieldset>
1269
                        </form>
1269
                        </form>
1270
                    </div>
1270
                    </div> <!-- /#saved-reports-filter -->
1271
                [% END %]
1271
                [% END %]
1272
                [% INCLUDE 'guided-reports-view.inc' %]
1272
                [% INCLUDE 'guided-reports-view.inc' %]
1273
            </aside>
1273
            </aside>
1274
- 

Return to bug 24886