Can now view sql, and reports run page shows name

[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / en / modules / reports / guided_reports_start.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index cd25347..122b24f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -13,7 +13,7 @@
 
 <div id="doc3" class="yui-t2">
 
-   <div id="bd">
+    <div id="bd">
     <div id="yui-main">
     <div class="yui-b">
 
@@ -23,31 +23,39 @@
      <h2>Guided Reports</h2>
      <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 requiring a DBA to write the SQL code for you.</p>
+canned reports and writing custom SQL reports.</p>
      <form action="/cgi-bin/koha/reports/guided_reports.pl">
-     <h3>Build and Run existing Reports</h3>                                                                                         
+     <h3>Build And Run Reports</h3>                                                                                          
                <input type="submit" name="phase" value="Build new"/>
                <input type="submit" name="phase" value="Used saved"/>
                <input type="submit" name="phase" value="Create report from SQL"/>
 <!--           <input type="submit" name="phase" value="Create Compound Report"/> -->
-<h3>Define Custom Criteria</h3>
+</form>
+<h3>Reports Dictionary</h3>
 <p>Use the reports dictionary to define custom criteria to use in your
 reports</p>
+<form action="/cgi-bin/koha/reports/dictionary.pl">
 <input type="submit" name="phase" value="View Dictionary"/>
-       </form>
+</form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="saved1" -->
 <h1>Load Saved Reports</h1>
-Choose the report from the list
+<p>Choose the report to run from the list</p>
+<table>
 <form action="/cgi-bin/koha/reports/guided_reports.pl">
-<select name="reports">
+<th>Report Name</th><th>Type</th><th>Notes</th><th>Saved Results</th><th>Saved SQL</th><th>Delete</th>
 <!-- TMPL_LOOP NAME="savedreports" -->
-<option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="report_name"--></option>
+<tr><td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&phase=Run%20this%20report"><!-- TMPL_VAR NAME="report_name" --></td>
+<td><!-- TMPL_VAR NAME="type" --></td>
+<td><!-- TMPL_VAR NAME="notes" --></td>
+<td><!-- TMPL_IF NAME="date_run" --><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="date_run" --></a><!-- /TMPL_IF -->
+</td>
+<td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&phase=Show%20SQL">Show SQL</a></td>
+<td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&phase=Delete%20Saved">Delete</a></td></tr>
 <!-- /TMPL_LOOP -->
-</select>
-<input type="submit" name="phase" value="Run this report">
 </form>
+</table>
 <!-- /TMPL_IF -->
 
 
@@ -83,15 +91,18 @@ Choose the report from the list
 <br />
 </form>
 Tabular:
-<img src="http://staff-crc.dev.kohalibrary.com/intranet-tmpl/prog/img/reports-tabular-graphic.gif" />
-Summary:
-<img src="http://staff-crc.dev.kohalibrary.com/intranet-tmpl/prog/img/reports-summary-graphic.gif" />
+<img src="/intranet-tmpl/prog/img/reports-tabular-graphic.gif" />
+<!--- Summary and Matrix reports have not yet been implemented-->
+<!--Summary:
+<img src="/intranet-tmpl/prog/img/reports-summary-graphic.gif" />
 Matrix:
-<img src="http://staff-crc.dev.kohalibrary.com/intranet-tmpl/prog/img/reports-matrix-graphic.gif" />
+<img src="/intranet-tmpl/prog/img/reports-matrix-graphic.gif" />-->
+
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="build3" -->
 <h3>Step 3 of 6: Select Columns for Display</h3>
+<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>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
        <input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
        <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
@@ -160,7 +171,7 @@ align          : "Tl"
 <!-- /TMPL_LOOP -->
 </table><br />
 <!-- TMPL_IF NAME="definitions" -->
-Dictionary Definitions <br />
+<h4>Dictionary Definitions</h4> <br />
 <table>
 <!-- TMPL_LOOP NAME="definitions" -->
 
@@ -205,7 +216,7 @@ NAME="name" -->"> <!-- TMPL_VAR NAME="name"--></td>
 
 
 <!-- TMPL_IF NAME="build6" -->
-<h3>Step 6 of 6: Select the ordering</h3>
+<h3>Step 6 of 6: Select how you want the report ordered</h3>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
 <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
@@ -245,6 +256,7 @@ NAME="name" -->"> <!-- TMPL_VAR NAME="name"--></td><td>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="save" -->
+<h1>Save Your Custom Report</h1>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <input type="hidden" name="sql" value="<!-- TMPL_VAR NAME="sql" -->">
 <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
@@ -256,12 +268,13 @@ Notes: <textarea name="notes"></textarea><br />
 
 <!-- TMPL_IF NAME="execute" -->
 <h1>Show results</h1>
-<h2>Report Name</h2>
-<p>Report description</p>
+<h2><!-- TMPL_VAR NAME="name" --></h2>
+<p><!-- TMPL_VAR NAME="notes" --></p>
 <table>
 <!-- TMPL_LOOP NAME="results" -->
 <!-- TMPL_VAR NAME="row" -->
 <!-- /TMPL_LOOP -->
+<p>Download the report</p>
 </table>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <select name="format">
@@ -274,6 +287,7 @@ Notes: <textarea name="notes"></textarea><br />
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="create" -->
+<h1>Create Report From SQL</h1>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 Report Name: <input type="text" name="reportname"> <br />
 Type:
@@ -310,6 +324,20 @@ Sub report:<select name="subreport">
 <!-- TMPL_VAR NAME="master" --> <br />
 <!-- TMPL_VAR NAME="subsql" -->
 <!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="retresults" -->
+<table>
+<!-- TMPL_LOOP NAME="results" -->
+<!-- TMPL_VAR NAME = "row" -->
+<!-- /TMPL_LOOP -->
+</table>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="showsql" -->
+<!-- TMPL_VAR NAME="sql" -->
+<!-- /TMPL_IF -->
+
 </div>
 </div>
 </div>