X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Freports%2Fguided_reports_start.tt;h=e3df4e22af0d1763025509eb45c454aeedb72bbf;hb=8ae5719d1681ffb5bf3dc803de5b80a39b6f3a68;hp=31fd512421bae8ddae1f4883bcaaa3da759cbe63;hpb=d1cea14fae6525b7478548aa19108871395e198d;p=koha_fer

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 31fd512421..e3df4e22af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -123,7 +123,6 @@ canned reports and writing custom SQL reports.</p>
 
 [% IF ( saved1 ) %]
 [% IF ( savedreports ) %]<h1>Saved Reports</h1>
-<p>Choose the report to run from the list</p>
 
 <span id="pagertable_reports" class="pager">
  <form class="formpager">&nbsp;<strong>page(s)</strong>&nbsp;:
@@ -167,7 +166,7 @@ canned reports and writing custom SQL reports.</p>
 <td>[% savedreport.notes %]</td>
 <td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
 <td>[% savedreport.date_created %]</td>
-<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 %]
+<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 %]
 </td>
     <td>
         <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Show%20SQL">Show</a> 
@@ -184,11 +183,30 @@ canned reports and writing custom SQL reports.</p>
 [% END %]
 </tbody>
 </table>
-[% ELSE %]<h4>There are no saved reports. 
+[% ELSE %]<div class="dialog message">
+    [% IF (filter_set) %]
+    <h4>No saved reports match your criteria. </h4>
     [% IF ( CAN_user_reports_create_reports ) %]
-        <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build new?</a>
+    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
+    <input type="hidden" name="phase" value="Build new" />
+    <input type="submit" class="edit" value="Build a new report" accesskey="y" />
+    </form>
+
+    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
+    <input type="hidden" name="phase" value="Use saved" />
+    <input type="hidden" name="filter_set" value="1" />
+    <input type="hidden" name="filter_keyword" value="" />
+    <input type="submit" class="deny" value="Cancel filter" accesskey="n" />
+    </form>
+
     [% END %]
-</h4>
+    [% ELSE %]
+    <h4>There are no saved reports. </h4>
+    [% IF ( CAN_user_reports_create_reports ) %]
+        <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a new report?</a>
+    [% END %]
+    [% END %]
+    </div>
 [% END %]
 [% END %]
 
@@ -313,7 +331,7 @@ canned reports and writing custom SQL reports.</p>
             <script type="text/javascript">   
             Calendar.setup({  
             inputField     : "[% criteri.name %]_value",
-            ifFormat       : "[% criteri.DHTMLcalendar_dateformat %]",
+            ifFormat       : "[% DHTMLcalendar_dateformat %]",
             button         : "buttonfrom[% criteri.name %]",
             align          : "Tl" 
             });     
@@ -336,7 +354,7 @@ canned reports and writing custom SQL reports.</p>
             <script type="text/javascript">   
                 Calendar.setup({  
                 inputField     : "from_[% criteri.name %]_value",
-                ifFormat       : "[% criteri.DHTMLcalendar_dateformat %]",
+                ifFormat       : "[% DHTMLcalendar_dateformat %]",
                 button         : "buttonfromfrom_[% criteri.name %]",
                 align          : "Tl" 
                 });     
@@ -347,7 +365,7 @@ canned reports and writing custom SQL reports.</p>
             <script type="text/javascript">   
                 Calendar.setup({  
                 inputField     : "to_[% criteri.name %]_value",
-                ifFormat       : "[% criteri.DHTMLcalendar_dateformat %]",
+                ifFormat       : "[% DHTMLcalendar_dateformat %]",
                 button         : "buttonfromto_[% criteri.name %]",
                 align          : "Tl" 
                 });     
@@ -374,8 +392,7 @@ canned reports and writing custom SQL reports.</p>
 [% IF ( definitions ) %]
 <fieldset><legend>Dictionary Definitions</legend><table>
 [% FOREACH definition IN definitions %]
-    <tr><td><input type="checkbox" name="definition" value="<!--
-TMPL_VAR NAME="id" -->" /> [% definition.name %]</td></tr>
+    <tr><td><input type="checkbox" name="definition" value="[% definition.id %]" /> [% definition.name %]</td></tr>
 [% END %]
 </table>
 [% END %]
@@ -397,10 +414,7 @@ TMPL_VAR NAME="id" -->" /> [% definition.name %]</td></tr>
 <input type="hidden" name="criteria" value="[% criteriastring %]" />
 <fieldset><table>
 [% FOREACH total_b IN total_by %]
-<tr><td><input type="checkbox" name="total_by" id="<!-- TMPL_VAR
-NAME="name" -->" value="<!-- TMPL_VAR
-NAME="name" -->" /> <label for="<!-- TMPL_VAR
-NAME="name" -->">[% total_b.name %]</label></td>
+<tr><td><input type="checkbox" name="total_by" id="[% total_b.name %]" value="[% total_b.name %]" /> <label for="[% total_b.name %]">[% total_b.name %]</label></td>
 <td><select name="[% total_b.name %]_tvalue">
 
 [% FOREACH selec IN total_b.select %]
@@ -429,10 +443,7 @@ NAME="name" -->">[% total_b.name %]</label></td>
 <input type="hidden" name="definition" value="[% definition %]" />
 <input type="hidden" name="totals" value="[% totals %]" />
 <fieldset><table>[% FOREACH order_b IN order_by %]
-<tr><td><input type="checkbox" id="<!-- TMPL_VAR
-NAME="name" -->" name="order_by" value="<!-- TMPL_VAR
-NAME="name" -->" /> <label for="<!-- TMPL_VAR
-NAME="name" -->">[% order_b.name %]</label></td><td>
+<tr><td><input type="checkbox" id="[% order_b.name %]" name="order_by" value="[% order_b.name %]" /> <label for="[% order_b.name %]">[% order_b.name %]</label></td><td>
 <select name="[% order_b.name %]_ovalue">
 
 [% FOREACH selec IN order_b.select %]
@@ -500,7 +511,7 @@ NAME="name" -->">[% order_b.name %]</label></td><td>
 [% IF ( notes ) %]<p>[% notes %]</p>[% END %]
 [% IF ( unlimited_total ) %]<p>Total number of rows matching the (unlimited) query is [% unlimited_total %].</p>[% END %]
 <pre id="sql_output">[% sql %]</pre>
-<div class="pages">[% DEFAULT pagination_bar="" %]</div>
+<div class="pages">[% pagination_bar %]</div>
 [% UNLESS ( errors ) %]
 <table>
 <tr>[% FOREACH header_ro IN header_row %]<th>[% header_ro.cell %]</th>[% END %]</tr>
@@ -648,6 +659,37 @@ Sub report:<select name="subreport">
 </div>
 </div>
 <div class="yui-b">
+
+[% IF ( saved1 ) %]
+<div id="saved-reports-filter">
+<form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
+  <input type="hidden" name="phase" value="Use saved" />
+  <input type="hidden" name="filter_set" value="1" />
+  <fieldset class="brief">
+  <h3>Filter</h3>
+  <ol>
+    <li><label for="filter_date">Date:
+  <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 %]" />
+    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+    <script type="text/javascript">
+        Calendar.setup(
+        {
+          inputField : "filter_date",
+          ifFormat : "[% DHTMLcalendar_dateformat %]",
+          button : "filter_date_button"
+        }
+        );
+    </script>
+    </li>
+    <li><label for="filter_author">Author:</label> <input type="text" id="filter_author" name="filter_author" value="[% filter_author %]" /></li>
+    <li><label for="filter_keyword">Keyword:</label> <input type="text" id="filter_keyword" name="filter_keyword" value="[% filter_keyword %]" /></li>
+  </ol>
+  <fieldset class="action"><input type="submit" value="Apply filter" /></fieldset>
+</form>
+</div>
+[% END %]
+
+
 [% INCLUDE 'guided-reports-view.inc' %]
 </div>
 </div>