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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt (-37 / +37 lines)
Lines 80-106 Link Here
80
      </form>
80
      </form>
81
      <br />
81
      <br />
82
        <table>
82
        <table>
83
		<tr>
83
            <tr>
84
		<th>Name</th>
84
                <th>Name</th>
85
		<th>Description</th>
85
                <th>Description</th>
86
		<th>Area</th>
86
                <th>Area</th>
87
		<th>Definition</th>
87
                <th>Definition</th>
88
                <th>Action</th>
88
                <th>Action</th>
89
		</tr>
89
            </tr>
90
		[% FOREACH definition IN definitions %]
90
            [% FOREACH definition IN definitions %]
91
        <tr>
91
            <tr>
92
			<td>[% definition.name %]</td>
92
                <td>[% definition.name | html %]</td>
93
			<td>[% definition.description %]</td>
93
                <td>[% definition.description | html %]</td>
94
			<td>[% definition.areaname %]</td>
94
                <td>[% definition.areaname %]</td>
95
			<td>[% definition.saved_sql %]</td>
95
                <td>[% definition.saved_sql %]</td>
96
                        <td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">
96
                <td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">
97
			<input type="hidden" name="id" value="[% definition.id %]" />
97
                    <input type="hidden" name="id" value="[% definition.id %]" />
98
			<input type="hidden" name="phase" value="Delete Definition" />
98
                    <input type="hidden" name="phase" value="Delete Definition" />
99
                        <button type="submit" name="submit" class="btn btn-default btn-xs" id="delete"><i class="fa fa-trash"></i> Delete</button>
99
                    <button type="submit" name="submit" class="btn btn-default btn-xs" id="delete"><i class="fa fa-trash"></i> Delete</button>
100
			</form></td>
100
                </form></td>
101
			</tr>
101
            </tr>
102
		[% END %]
102
            [% END %]
103
		</table>
103
        </table>
104
                [% ELSE %]
104
                [% ELSE %]
105
                <div class="dialog message">There are no saved definitions. <a id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition">Add a definition to the dictionary.</a></div>
105
                <div class="dialog message">There are no saved definitions. <a id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition">Add a definition to the dictionary.</a></div>
106
		[% END %]
106
		[% END %]
Lines 133-140 Link Here
133
    <ol>
133
    <ol>
134
      <li>
134
      <li>
135
        <input type="hidden" name="phase" value="New Term step 3" />
135
        <input type="hidden" name="phase" value="New Term step 3" />
136
        <input type="hidden" name="definition_name" value="[% definition_name %]" />
136
        <input type="hidden" name="definition_name" value="[% definition_name | html %]" />
137
        <input type="hidden" name="definition_description" value="[% definition_description %]" />
137
        <input type="hidden" name="definition_description" value="[% definition_description | html %]" />
138
        <label for="area">Select table:</label><select name="area" id="area">
138
        <label for="area">Select table:</label><select name="area" id="area">
139
      [%- FOREACH area IN areas -%]
139
      [%- FOREACH area IN areas -%]
140
        <option value="[%- area.id -%]">[%- PROCESS area_name area=area.id -%]</option>
140
        <option value="[%- area.id -%]">[%- PROCESS area_name area=area.id -%]</option>
Lines 153-160 Link Here
153
<fieldset class="rows">
153
<fieldset class="rows">
154
<legend>Step 3 of 5: Choose a column</legend>
154
<legend>Step 3 of 5: Choose a column</legend>
155
<input type="hidden" name="area" value="[% area %]" />
155
<input type="hidden" name="area" value="[% area %]" />
156
<input type="hidden" name="definition_name" value="[% definition_name %]" />
156
<input type="hidden" name="definition_name" value="[% definition_name | html %]" />
157
<input type="hidden" name="definition_description" value="[% definition_description %]" />
157
<input type="hidden" name="definition_description" value="[% definition_description | html %]" />
158
158
159
<select id="availableColumns" name="columns" size="25" style="width:200px;height:300px;margin:1em;">
159
<select id="availableColumns" name="columns" size="25" style="width:200px;height:300px;margin:1em;">
160
[% FOREACH column IN columns %]
160
[% FOREACH column IN columns %]
Lines 166-172 Link Here
166
166
167
<optgroup label="[% column.table %]">              
167
<optgroup label="[% column.table %]">              
168
[% ELSE %]               
168
[% ELSE %]               
169
<option value="[% column.name %]">          
169
<option value="[% column.name %]">
170
[% IF ( column.description ) %][% column.description %]    
170
[% IF ( column.description ) %][% column.description %]    
171
[% ELSE %]               
171
[% ELSE %]               
172
[% column.name %]                          
172
[% column.name %]                          
Lines 189-207 Link Here
189
<fieldset class="rows">
189
<fieldset class="rows">
190
<legend>Step 4 of 5: Specify a value</legend>
190
<legend>Step 4 of 5: Specify a value</legend>
191
<input type="hidden" name="area" value="[% area %]" />
191
<input type="hidden" name="area" value="[% area %]" />
192
<input type="hidden" name="definition_name" value="[% definition_name %]" />
192
<input type="hidden" name="definition_name" value="[% definition_name | html %]" />
193
<input type="hidden" name="definition_description" value="[% definition_description %]" />
193
<input type="hidden" name="definition_description" value="[% definition_description | html %]" />
194
<input type="hidden" name="columnstring" value="[% columnstring %]" />
194
<input type="hidden" name="columnstring" value="[% columnstring %]" />
195
195
196
[% FOREACH column IN columns %]
196
[% FOREACH column IN columns %]
197
<input type="hidden" name="criteria_column" value="[% column.name %]" />
197
<input type="hidden" name="criteria_column" value="[% column.name %]" />
198
<ol><li><span class="label">Column: </span> [% column.name %]</li>
198
<ol><li><span class="label">Column: </span> [% column.name %]</li>
199
[% IF ( column.distinct ) %]
199
[% IF ( column.distinct ) %]
200
	<li><label for="[% column.name %]_value">Choose: </label> <select id="[% column.name %]_value" name="[% column.name %]_value"> 
200
    <li><label for="[% column.name %]_value">Choose: </label> <select id="[% column.name %]_value" name="[% column.name %]_value">
201
		[% FOREACH value IN column.values %]
201
        [% FOREACH value IN column.values %]
202
			<option value="[% value.availablevalues %]">[% value.availablevalues %]</option>
202
            <option value="[% value.availablevalues %]">[% value.availablevalues %]</option>
203
		[% END %]
203
        [% END %]
204
	</select></li>
204
    </select></li>
205
[% END %]
205
[% END %]
206
[% IF ( column.date ) %]
206
[% IF ( column.date ) %]
207
    <li class="radio">
207
    <li class="radio">
Lines 235-243 Link Here
235
235
236
[% IF ( step_5 ) %]
236
[% IF ( step_5 ) %]
237
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
237
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
238
<input type="hidden" name="area" value="[% area %]" />    
238
<input type="hidden" name="area" value="[% area %]" />
239
<input type="hidden" name="definition_name" value="[% definition_name %]" />           
239
<input type="hidden" name="definition_name" value="[% definition_name | html %]" />
240
<input type="hidden" name="definition_description" value="[% definition_description %]" />
240
<input type="hidden" name="definition_description" value="[% definition_description | html %]" />
241
<input type="hidden" name="columnstring" value="[% columnstring %]" />
241
<input type="hidden" name="columnstring" value="[% columnstring %]" />
242
242
243
<h3>Add new definition</h3>
243
<h3>Add new definition</h3>
Lines 246-255 Link Here
246
  <legend>Step 5 of 5: Confirm details</legend>
246
  <legend>Step 5 of 5: Confirm details</legend>
247
  <ol>
247
  <ol>
248
    <li>
248
    <li>
249
      <span class="label">Name:</span>[%- definition_name -%]
249
      <span class="label">Name:</span>[%- definition_name | html -%]
250
    </li>
250
    </li>
251
    <li>
251
    <li>
252
      <span class="label">Description:</span>[%- definition_description -%]
252
      <span class="label">Description:</span>[%- definition_description | html -%]
253
    </li>
253
    </li>
254
    <li>
254
    <li>
255
      <span class="label">Area:</span>[%- PROCESS area_name area=area -%]
255
      <span class="label">Area:</span>[%- PROCESS area_name area=area -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-3 / +2 lines)
Lines 931-937 $(document).ready(function() { Link Here
931
<legend>Create report from SQL</legend>
931
<legend>Create report from SQL</legend>
932
<ol>
932
<ol>
933
    <li><label for="reportname" class="required">Report name:</label>
933
    <li><label for="reportname" class="required">Report name:</label>
934
        [% IF ( reportname ) %]<input type="text" class="required" required="required" id="reportname" name="reportname" value="[% reportname %]" size="50"/>
934
        [% IF ( reportname ) %]<input type="text" class="required" required="required" id="reportname" name="reportname" value="[% reportname | html %]" size="50"/>
935
        [% ELSE %]<input type="text" class="required" required="required" id="reportname" name="reportname" size="50" />[% END %] <span class="required">Required</span>
935
        [% ELSE %]<input type="text" class="required" required="required" id="reportname" name="reportname" size="50" />[% END %] <span class="required">Required</span>
936
    </li>
936
    </li>
937
    [% PROCESS group_and_subgroup_selection %]
937
    [% PROCESS group_and_subgroup_selection %]
Lines 1023-1029 Sub report:<select name="subreport"> Link Here
1023
<fieldset class="rows">
1023
<fieldset class="rows">
1024
<legend>Edit SQL report</legend>
1024
<legend>Edit SQL report</legend>
1025
<ol>
1025
<ol>
1026
<li><label for="reportname" class="required">Report name: </label><input type="text" id="reportname" name="reportname" value="[% reportname %]" size="50" class="required" required="required" /> <span class="required">Required</span></li>
1026
<li><label for="reportname" class="required">Report name: </label><input type="text" id="reportname" name="reportname" value="[% reportname | html %]" size="50" class="required" required="required" /> <span class="required">Required</span></li>
1027
[% PROCESS group_and_subgroup_selection %]
1027
[% PROCESS group_and_subgroup_selection %]
1028
[% IF (public) %]
1028
[% IF (public) %]
1029
  <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0">No (default)</option> <option value="1" selected="selected">Yes</option> </select></li>
1029
  <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0">No (default)</option> <option value="1" selected="selected">Yes</option> </select></li>
1030
- 

Return to bug 11235