Tomas Cohen Arazi
3f2dda2f33
This patch removes hardcoded descriptions and sets them in the templates
using the variable content as id.
To test, create a new guided report and verify the 'module to report on' dropdown
shows as usual [1]. Functionality shouldn't get changed.
The patch also changes the dictionary pages where 'area' should be displayed/selectable
with the same strings as the guided reports. Try all the possible disctionary pages.
The last page when creating a dictionary now shows the 'area description' instead of the
code. The same happens to the dictionary list once you have dictionaries saved.
[1] The following texts get changed:
Catalogue -> Catalog
Acquisition -> Acquisitions
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
315 lines
12 KiB
Text
315 lines
12 KiB
Text
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Reports › Guided reports › Dictionary</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
<style type="text/css">fieldset.rows table { clear: none; margin: 0;}</style>
|
|
</head>
|
|
<body id="rep_dictionary" class="rep">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'circ-search.inc' %]
|
|
|
|
[%- BLOCK area_name -%]
|
|
[%- SWITCH area -%]
|
|
[%- CASE 'CIRC' -%]Circulation
|
|
[%- CASE 'CAT' -%]Catalog
|
|
[%- CASE 'PAT' -%]Patrons
|
|
[%- CASE 'ACQ' -%]Acquisitions
|
|
[%- CASE 'ACC' -%]Accounts
|
|
[%- END -%]
|
|
[%- END -%]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a>
|
|
[% IF ( new_dictionary ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Name the new definition</strong>
|
|
[% ELSIF ( step_2 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 2: Choose the area </strong>
|
|
[% ELSIF ( step_3 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 3: Choose columns </strong>
|
|
[% ELSIF ( step_4 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 4: Specify a value </strong>
|
|
[% ELSIF ( step_5 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 5: Confirm definition</strong>
|
|
[% ELSE %] › <strong> Dictionary </strong>[% END %]</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
[% IF ( start_dictionary ) %]
|
|
<div id="toolbar">
|
|
<ul class="toolbar">
|
|
<li><a id="newdictionary" class="btn btn-small" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="icon-plus"></i> New definition</a></li>
|
|
</ul>
|
|
</div>
|
|
[% END %]
|
|
<h1>Dictionary</h1>
|
|
[% IF ( start_dictionary ) %]
|
|
<p>Use the dictionary to define custom criteria for reporting.</p>
|
|
|
|
[% IF ( definitions ) %]
|
|
<h2>Current terms</h2>
|
|
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
|
|
<input type="hidden" name="phase" value="View Dictionary" />
|
|
[% IF ( areas ) %]
|
|
Filter by area
|
|
<select name="area">
|
|
<option value="">All</option>
|
|
[% FOREACH area IN areas %]
|
|
[%- IF ( area.selected ) -%]
|
|
<option value="[% area.id %]" selected="selected">[%- PROCESS area_name area=area.id -%]</option>
|
|
[%- ELSE -%]
|
|
<option value="[% area.id %]">[%- PROCESS area_name area=area.id -%]</option>
|
|
[%- END -%]
|
|
[% END %]
|
|
</select>
|
|
<input name="submit" value="Go" type="submit" />
|
|
[% END %]
|
|
</form>
|
|
<br />
|
|
<table border="1" cellspacing="0" cellpadding="5">
|
|
<tr>
|
|
<th>Name</th>
|
|
<th>Description</th>
|
|
<th>Area</th>
|
|
<th>Definition</th>
|
|
<th> </th>
|
|
</tr>
|
|
[% FOREACH definition IN definitions %]
|
|
[% UNLESS ( loop.odd ) %]
|
|
<tr class="highlight" valign="top">
|
|
[% ELSE %]
|
|
<tr valign="top">
|
|
[% END %]
|
|
<td>[% definition.name %]</td>
|
|
<td>[% definition.description %]</td>
|
|
<td>[% definition.areaname %]</td>
|
|
<td>[% definition.saved_sql %]</td>
|
|
<td><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">
|
|
<input type="hidden" name="id" value="[% definition.id %]" />
|
|
<input type="hidden" name="phase" value="Delete Definition" />
|
|
<input type="submit" name="submit" value="Delete Definition" />
|
|
</form></td>
|
|
</tr>
|
|
[% END %]
|
|
</table>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% IF ( new_dictionary ) %]
|
|
<h3>Add new definition</h3>
|
|
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
|
|
<fieldset class="rows"><legend>Step 1 of 5: Name the new definition</legend><ol>
|
|
<li>
|
|
<label for="definition_name">Definition name:</label>
|
|
<input type="text" id="definition_name" name="definition_name" />
|
|
</li>
|
|
<li>
|
|
<label for="definition_description">Definition description:</label>
|
|
<textarea name="definition_description" id="definition_description" rows="3" cols="20"></textarea>
|
|
</li>
|
|
</ol></fieldset>
|
|
|
|
<fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" />
|
|
<input name="submit" value="Next" type="submit" /></fieldset>
|
|
</form>
|
|
[% END %]
|
|
|
|
[%- IF ( step_2 ) -%]
|
|
<h3>Add new definition</h3>
|
|
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
|
|
<fieldset class="rows">
|
|
<legend>Step 2 of 5: Choose the area</legend>
|
|
<ol>
|
|
<li>
|
|
<input type="hidden" name="phase" value="New Term step 3" />
|
|
<input type="hidden" name="definition_name" value="[% definition_name %]" />
|
|
<input type="hidden" name="definition_description" value="[% definition_description %]" />
|
|
<label for="area">Select table </label><select name="area" id="area">
|
|
[%- FOREACH area IN areas -%]
|
|
<option value="[%- area.id -%]">[%- PROCESS area_name area=area.id -%]</option>
|
|
[%- END -%]
|
|
</select>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action"><input name="submit" value="Next" type="submit" /></fieldset>
|
|
</form>
|
|
[%- END -%]
|
|
|
|
[% IF ( step_3 ) %]
|
|
<h3>Add new definition</h3>
|
|
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
|
|
<fieldset class="rows">
|
|
<legend>Step 3 of 5: Choose columns</legend>
|
|
<input type="hidden" name="area" value="[% area %]" />
|
|
<input type="hidden" name="definition_name" value="[% definition_name %]" />
|
|
<input type="hidden" name="definition_description" value="[% definition_description %]" />
|
|
|
|
<table style="border: 0;margin:1em;"><tr>
|
|
<td style="border: 0;"><select id="availableColumns" name="oldcolumns2" size="25" style="width:200px;height:300px;">
|
|
[% FOREACH column IN columns %]
|
|
[% IF ( column.table ) %]
|
|
[% IF ( loop.first ) %]
|
|
[% ELSE %]
|
|
</optgroup>
|
|
[% END %]
|
|
|
|
<optgroup label="[% column.table %]">
|
|
[% ELSE %]
|
|
<option value="[% column.name %]">
|
|
[% IF ( column.description ) %][% column.description %]
|
|
[% ELSE %]
|
|
[% column.name %]
|
|
[% END %]
|
|
</option>
|
|
[% END %]
|
|
[% END %]
|
|
</optgroup>
|
|
</select></td>
|
|
|
|
<td style="border: 0;"><input type="button" name="Add" value="Add" class="button" style="width : 6em; margin-bottom : .5em;" onclick="addColumn()" /><br /><input type="button" name="delete" value="<< Delete" class="button" style="width : 6em;" onclick="delColumn()" /> </td>
|
|
|
|
<td style="border: 0;"><select id="selectedColumns" name="columns" size="25" style="width:200px;height:300px;"></select> </td> </tr></table>
|
|
|
|
<input type="hidden" name="phase" value="New Term step 4" />
|
|
</fieldset>
|
|
<fieldset class="action"><input type="submit" name="submit" value="Next" /></fieldset>
|
|
</form>
|
|
[% END %]
|
|
|
|
[% IF ( step_4 ) %]
|
|
<h3>Add new definition</h3>
|
|
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
|
|
<fieldset class="rows">
|
|
<legend>Step 4 of 5: Specify a value</legend>
|
|
<input type="hidden" name="area" value="[% area %]" />
|
|
<input type="hidden" name="definition_name" value="[% definition_name %]" />
|
|
<input type="hidden" name="definition_description" value="[% definition_description %]" />
|
|
<input type="hidden" name="columnstring" value="[% columnstring %]" />
|
|
|
|
[% FOREACH column IN columns %]
|
|
<input type="hidden" name="criteria_column" value="[% column.name %]" />
|
|
<ol><li><span class="label">Column: </span> [% column.name %]</li>
|
|
[% IF ( column.distinct ) %]
|
|
<li><label for="[% column.name %]_value">Choose: </label> <select id="[% column.name %]_value" name="[% column.name %]_value">
|
|
[% FOREACH value IN column.values %]
|
|
<option value="[% value.availablevalues %]">[% value.availablevalues %]</option>
|
|
[% END %]
|
|
</select></li>
|
|
[% END %]
|
|
[% IF ( column.date ) %]
|
|
<li><span class="label">Choose: </span><table>
|
|
<tr valign="top">
|
|
<td><input type="radio" name="[% column.name %]_all" value="all" />All dates</td>
|
|
<td>OR</td>
|
|
<td><input type="radio" name="dates" value="range" />Date range<br />
|
|
<table>
|
|
<tr>
|
|
<td>Start of date range</td>
|
|
<td><input type="text" size="10" id="from" name="[% column.name %]_start_value" value="" class="datepickerfrom" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td>End of date range</td>
|
|
<td>
|
|
<input type="text" size="10" id="to" name="[% column.name %]_end_value" value="" class="datepickerto" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</td>
|
|
</tr>
|
|
</table></td>
|
|
</tr>
|
|
</table></li>
|
|
[% END %]
|
|
[% IF ( column.text ) %]
|
|
<li><label for="[% column.name %]_value">Search string matches: </label> <input type="text" size="13" name="[% column.name %]_value" /></li>
|
|
[% END %]
|
|
|
|
[% END %]
|
|
</ol>
|
|
<input type="hidden" name="phase" value="New Term step 5" />
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<input type="submit" name="submit" value="Next" />
|
|
</fieldset>
|
|
</form>
|
|
[% END %]
|
|
|
|
[% IF ( step_5 ) %]
|
|
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
|
|
<input type="hidden" name="area" value="[% area %]" />
|
|
<input type="hidden" name="definition_name" value="[% definition_name %]" />
|
|
<input type="hidden" name="definition_description" value="[% definition_description %]" />
|
|
<input type="hidden" name="columnstring" value="[% columnstring %]" />
|
|
|
|
<h3>Add new definition</h3>
|
|
|
|
<fieldset class="rows">
|
|
<legend>Step 5 of 5: Confirm details</legend>
|
|
<ol>
|
|
<li>
|
|
<span class="label">Name:</span>[%- definition_name -%]
|
|
</li>
|
|
<li>
|
|
<span class="label">Description:</span>[%- definition_description -%]
|
|
</li>
|
|
<li>
|
|
<span class="label">Area:</span>[%- PROCESS area_name area=area -%]
|
|
</li>
|
|
<li>
|
|
<span class="label">Data:</span>
|
|
<table>
|
|
<tr>
|
|
<th>Columns</th>
|
|
<th>Values</th>
|
|
</tr>
|
|
[%- FOREACH criteria_loo IN criteria_loop -%]
|
|
<tr>
|
|
<td>[%- criteria_loo.name -%]</td>
|
|
<td>[%- criteria_loo.value -%]</td>
|
|
</tr>
|
|
[%- END -%]
|
|
</table>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
|
|
<fieldset class="action"><input type="hidden" name="sql" value="[% query %]" />
|
|
<input type="hidden" name="phase" value="New Term step 6" />
|
|
<input type="submit" name="submit" value="Save" /> </fieldset>
|
|
|
|
</form>
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'guided-reports-view.inc' %]
|
|
</div>
|
|
</div>
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
function setObjects() {
|
|
selectedColumnsObj=document.getElementById('selectedColumns');
|
|
availableColumnsObj=document.getElementById('availableColumns');
|
|
}
|
|
setObjects();
|
|
|
|
function addColumn() {
|
|
for (i=0;i<availableColumnsObj.length;i++) {
|
|
if (availableColumnsObj.options[i].selected==true) {
|
|
var newColumnObj=document.createElement("OPTION");
|
|
newColumnObj.value=availableColumnsObj.options[i].value;
|
|
newColumnObj.text=availableColumnsObj.options[i].text;
|
|
selectedColumnsObj.appendChild(newColumnObj);
|
|
newColumnObj.selected=true;
|
|
}
|
|
}
|
|
}
|
|
|
|
function delColumn() {
|
|
for (i=0;i<=selectedColumnsObj.options.length;i++) {
|
|
if (selectedColumnsObj.options.selectedIndex>=0) {
|
|
selectedColumnsObj.remove(selectedColumnsObj.options.selectedIndex)
|
|
}
|
|
}
|
|
}
|
|
//]]>
|
|
</script>
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|