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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-27 / +54 lines)
Lines 123-151 canned reports and writing custom SQL reports.</p> Link Here
123
123
124
[% IF ( saved1 ) %]
124
[% IF ( saved1 ) %]
125
[% IF ( savedreports ) %]<h1>Saved Reports</h1>
125
[% IF ( savedreports ) %]<h1>Saved Reports</h1>
126
<p>Choose the report to run from the list</p>
127
128
<div style="margin: 5px">
129
<form action="?">
130
  <input type="hidden" name="phase" value="Use saved" />
131
  <input type="hidden" name="filter_set" value="1" />
132
  <table>
133
    <tr>
134
      <td rowspan="3"><h3>Filter</h3><br/><input type="submit" value="Go" /></td>
135
      <td align="right">Date:</td>
136
      <td><input type="text" name="filter_date" size="10" value="[% filter_date %]" /></td>
137
    </tr>
138
    <tr>
139
      <td align="right">Author:</td>
140
      <td><input type="text" name="filter_author" value="[% filter_author %]" /></td>
141
    </tr>
142
    <tr>
143
      <td align="right">Keyword:</td>
144
      <td><input type="text" name="filter_keyword" value="[% filter_keyword %]" /></td>
145
    </tr>
146
  </table>
147
</form>
148
</div>
149
126
150
<span id="pagertable_reports" class="pager">
127
<span id="pagertable_reports" class="pager">
151
 <form class="formpager">&nbsp;<strong>page(s)</strong>&nbsp;:
128
 <form class="formpager">&nbsp;<strong>page(s)</strong>&nbsp;:
Lines 189-195 canned reports and writing custom SQL reports.</p> Link Here
189
<td>[% savedreport.notes %]</td>
166
<td>[% savedreport.notes %]</td>
190
<td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
167
<td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
191
<td>[% savedreport.date_created %]</td>
168
<td>[% savedreport.date_created %]</td>
192
<td>[% IF ( savedreport.date_run ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&id=[% savedreport.id %]">[% savedreport.date_run %]</a>[% END %]
169
<td>[% IF ( savedreport.date_run ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&amp;id=[% savedreport.id %]">[% savedreport.date_run %]</a>[% END %]
193
</td>
170
</td>
194
    <td>
171
    <td>
195
        <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Show%20SQL">Show</a> 
172
        <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Show%20SQL">Show</a> 
Lines 206-216 canned reports and writing custom SQL reports.</p> Link Here
206
[% END %]
183
[% END %]
207
</tbody>
184
</tbody>
208
</table>
185
</table>
209
[% ELSE %]<h4>There are no saved reports. 
186
[% ELSE %]<div class="dialog message">
187
    [% IF (filter_set) %]
188
    <h4>No saved reports match your criteria. </h4>
189
    [% IF ( CAN_user_reports_create_reports ) %]
190
    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
191
    <input type="hidden" name="phase" value="Build new" />
192
    <input type="submit" class="edit" value="Build a new report" accesskey="y" />
193
    </form>
194
195
    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
196
    <input type="hidden" name="phase" value="Use saved" />
197
    <input type="hidden" name="filter_set" value="1" />
198
    <input type="hidden" name="filter_keyword" value="" />
199
    <input type="submit" class="deny" value="Cancel filter" accesskey="n" />
200
    </form>
201
202
    [% END %]
203
    [% ELSE %]
204
    <h4>There are no saved reports. </h4>
210
    [% IF ( CAN_user_reports_create_reports ) %]
205
    [% IF ( CAN_user_reports_create_reports ) %]
211
        <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build new?</a>
206
        <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a new report?</a>
212
    [% END %]
207
    [% END %]
213
</h4>
208
    [% END %]
209
    </div>
214
[% END %]
210
[% END %]
215
[% END %]
211
[% END %]
216
212
Lines 670-675 Sub report:<select name="subreport"> Link Here
670
</div>
666
</div>
671
</div>
667
</div>
672
<div class="yui-b">
668
<div class="yui-b">
669
670
[% IF ( saved1 ) %]
671
<div id="saved-reports-filter">
672
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
673
  <input type="hidden" name="phase" value="Use saved" />
674
  <input type="hidden" name="filter_set" value="1" />
675
  <fieldset class="brief">
676
  <h3>Filter</h3>
677
  <ol>
678
    <li><label for="filter_date">Date:
679
  <img src="[% themelang %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show Calendar" /></label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filter_date %]" />
680
    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
681
    <script type="text/javascript">
682
        Calendar.setup(
683
        {
684
          inputField : "filter_date",
685
          ifFormat : "[% DHTMLcalendar_dateformat %]",
686
          button : "filter_date_button"
687
        }
688
        );
689
    </script>
690
    </li>
691
    <li><label for="filter_author">Author:</label> <input type="text" id="filter_author" name="filter_author" value="[% filter_author %]" /></li>
692
    <li><label for="filter_keyword">Keyword:</label> <input type="text" id="filter_keyword" name="filter_keyword" value="[% filter_keyword %]" /></li>
693
  </ol>
694
  <fieldset class="action"><input type="submit" value="Apply filter" /></fieldset>
695
</form>
696
</div>
697
[% END %]
698
699
673
[% INCLUDE 'guided-reports-view.inc' %]
700
[% INCLUDE 'guided-reports-view.inc' %]
674
</div>
701
</div>
675
</div>
702
</div>
(-)a/reports/guided_reports.pl (-1 / +1 lines)
Lines 68-73 if ( $input->param("filter_set") ) { Link Here
68
    $filter = {};
68
    $filter = {};
69
    $filter->{$_} = $input->param("filter_$_") foreach qw/date author keyword/;
69
    $filter->{$_} = $input->param("filter_$_") foreach qw/date author keyword/;
70
    $session->param('report_filter', $filter) if $session;
70
    $session->param('report_filter', $filter) if $session;
71
    $template->param( 'filter_set' => 1 );
71
}
72
}
72
elsif ($session) {
73
elsif ($session) {
73
    $filter = $session->param('report_filter');
74
    $filter = $session->param('report_filter');
74
- 

Return to bug 6284