Browse Source

Bug 13190: Refactor the checkouts table template code

This code is duplicated and should be centralised.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
3.18.x
Jonathan Druart 8 years ago
committed by Tomas Cohen Arazi
parent
commit
2aebc84cc8
  1. 70
      koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
  2. 72
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
  3. 74
      koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt

70
koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc

@ -0,0 +1,70 @@
<div id="checkouts">
[% IF ( issuecount ) %]
<div id="issues-table-loading-message">
<p>
<a id="issues-table-load-now-button" href="#" class="btn"><i class="icon-book"></i> Show checkouts</a>
</p>
</div>
<form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post" class="checkboxed">
<table id="issues-table" style="width: 100% !Important;">
<thead>
<tr>
<th scope="col">&nbsp;</th>
<th scope="col">&nbsp;</th>
<th scope="col">Due date</th>
<th scope="col">Due date</th>
<th scope="col">Title</th>
<th scope="col">Item type</th>
<th scope="col">Checked out on</th>
<th scope="col">Checked out from</th>
<th scope="col">Call no</th>
<th scope="col">Charge</th>
<th scope="col">Price</th>
<th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllRenewals">select all</a> | <a href="#" id="UncheckAllRenewals">none</a></p></th>
<th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllCheckins">select all</a> | <a href="#" id="UncheckAllCheckins">none</a></p></th>
<th scope="col">Export <p class="column-tool"><a href="#" id="CheckAllExports">select all</a> | <a href="#" id="UncheckAllExports">none</a></p></th>
</tr>
</thead>
[% INCLUDE 'checkouts-table-footer.inc' %]
</table>
<label for="issues-table-load-immediately">Always show checkouts immediately</label>
<input id="issues-table-load-immediately" type="checkbox" />
<div id="issues-table-actions">
<fieldset class="action">
[% IF ( CAN_user_circulate_override_renewals ) %]
[% IF ( AllowRenewalLimitOverride ) %]
<label for="override_limit">Override renewal limit:</label>
<input type="checkbox" name="override_limit" id="override_limit" value="1" />
[% END %]
[% END %]
<button class="btn" id="RenewCheckinChecked"><i class="icon-check"></i> Renew or return checked items</button>
<button class="btn" id="RenewAll"><i class="icon-book"></i> Renew all</button>
</fieldset>
[% IF ( exports_enabled ) %]
<fieldset>
<label for="output_format"><b>Export checkouts using format:</b></label>
<select name="output_format" id="output_format">
<option value="iso2709_995">ISO2709 with items</option>
<option value="iso2709">ISO2709 without items</option>
[% IF Koha.Preference('ExportWithCsvProfile') %]
<option value="csv">CSV</option>
[% END %]
</select>
<label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" />
<input type="hidden" name="op" value="export" />
<input type="hidden" id="output_format" name="output_format" value="iso2709" />
<input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
<input type="hidden" id="record_type" name="record_type" value="bibs" />
<button class="btn btn-small" id="export_submit"><i class="icon-download-alt"></i> Export</button>
</fieldset>
[% END %]
</div>
</form>
[% ELSE %]
<p>Patron has nothing checked out.</p>
[% END %]
</div>

72
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt

@ -766,78 +766,8 @@ No patron matched <span class="ex">[% message %]</span>
</ul>
<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
<div id="checkouts">
[% IF ( issuecount ) %]
<div id="issues-table-loading-message">
<p>
<a id="issues-table-load-now-button" href="#" class="btn"><i class="icon-book"></i> Show checkouts</a>
</p>
</div>
<form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post" class="checkboxed">
<table id="issues-table">
<thead>
<tr>
<th scope="col">&nbsp;</th>
<th scope="col">&nbsp;</th>
<th scope="col">Due date</th>
<th scope="col">Due date</th>
<th scope="col">Title</th>
<th scope="col">Item type</th>
<th scope="col">Checked out on</th>
<th scope="col">Checked out from</th>
<th scope="col">Call no</th>
<th scope="col">Charge</th>
<th scope="col">Price</th>
<th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllRenewals">select all</a> | <a href="#" id="UncheckAllRenewals">none</a></p></th>
<th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllCheckins">select all</a> | <a href="#" id="UncheckAllCheckins">none</a></p></th>
<th scope="col">Export <p class="column-tool"><a href="#" id="CheckAllExports">select all</a> | <a href="#" id="UncheckAllExports">none</a></p></th>
</tr>
</thead>
[% INCLUDE 'checkouts-table-footer.inc' %]
</table>
<label for="issues-table-load-immediately">Always show checkouts immediately</label>
<input id="issues-table-load-immediately" type="checkbox" />
<fieldset id="issues-table-actions" class="action">
[% IF ( CAN_user_circulate_override_renewals ) %]
[% IF ( AllowRenewalLimitOverride ) %]
<label for="override_limit">Override renewal limit:</label>
<input type="checkbox" name="override_limit" id="override_limit" value="1" />
[% END %]
[% END %]
<button class="btn" id="RenewCheckinChecked"><i class="icon-check"></i> Renew or return checked items</button>
<button class="btn" id="RenewAll"><i class="icon-book"></i> Renew all</button>
</fieldset>
[% IF issuecount %]
[% IF ( exports_enabled ) %]
<fieldset>
<label for="output_format"><b>Export checkouts using format:</b></label>
<select name="output_format" id="output_format">
<option value="iso2709_995">ISO2709 with items</option>
<option value="iso2709">ISO2709 without items</option>
[% IF Koha.Preference('ExportWithCsvProfile') %]
<option value="csv">CSV</option>
[% END %]
</select>
<label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" />
<input type="hidden" name="op" value="export" />
<input type="hidden" id="output_format" name="output_format" value="iso2709" />
<input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
<input type="hidden" id="record_type" name="record_type" value="bibs" />
<button class="btn btn-small" id="export_submit"><i class="icon-download-alt"></i> Export</button>
</fieldset>
[% END %]
[% END %]
</form>
[% ELSE %]
<p>Patron has nothing checked out.</p>
[% END %]
</div>
[% INCLUDE "checkouts-table.inc" %]
[% IF ( relatives_issues_count ) %]
<div id="relatives-issues">

74
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt

@ -417,79 +417,7 @@ function validate1(date) {
<li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
</ul>
<div id="checkouts">
[% IF ( issuecount ) %]
<div id="issues-table-loading-message">
<p>
<a id="issues-table-load-now-button" href="#" class="btn"><i class="icon-book"></i> Show checkouts</a>
</p>
</div>
<form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post" class="checkboxed">
<table id="issues-table" style="width: 100% !Important;">
<thead>
<tr>
<th scope="col">&nbsp;</th>
<th scope="col">&nbsp;</th>
<th scope="col">Due date</th>
<th scope="col">Due date</th>
<th scope="col">Title</th>
<th scope="col">Item type</th>
<th scope="col">Checked out on</th>
<th scope="col">Checked out from</th>
<th scope="col">Call no</th>
<th scope="col">Charge</th>
<th scope="col">Price</th>
<th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllRenewals">select all</a> | <a href="#" id="UncheckAllRenewals">none</a></p></th>
<th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllCheckins">select all</a> | <a href="#" id="UncheckAllCheckins">none</a></p></th>
<th scope="col">Export <p class="column-tool"><a href="#" id="CheckAllExports">select all</a> | <a href="#" id="UncheckAllExports">none</a></p></th>
</tr>
</thead>
[% INCLUDE 'checkouts-table-footer.inc' %]
</table>
<label for="issues-table-load-immediately">Always show checkouts immediately</label>
<input id="issues-table-load-immediately" type="checkbox" />
[% IF ( issuecount ) %]
<div id="issues-table-actions">
<fieldset class="action">
[% IF ( CAN_user_circulate_override_renewals ) %]
[% IF ( AllowRenewalLimitOverride ) %]
<label for="override_limit">Override renewal limit:</label>
<input type="checkbox" name="override_limit" id="override_limit" value="1" />
[% END %]
[% END %]
<button class="btn" id="RenewCheckinChecked"><i class="icon-check"></i> Renew or return checked items</button>
<button class="btn" id="RenewAll"><i class="icon-book"></i> Renew all</button>
</fieldset>
[% IF ( exports_enabled ) %]
<fieldset>
<label for="output_format"><b>Export checkouts using format:</b></label>
<select name="output_format" id="output_format">
<option value="iso2709_995">ISO2709 with items</option>
<option value="iso2709">ISO2709 without items</option>
[% IF Koha.Preference('ExportWithCsvProfile') %]
<option value="csv">CSV</option>
[% END %]
</select>
<label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" />
<input type="hidden" name="op" value="export" />
<input type="hidden" id="output_format" name="output_format" value="iso2709" />
<input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
<input type="hidden" id="record_type" name="record_type" value="bibs" />
<button class="btn btn-small" id="export_submit"><i class="icon-download-alt"></i> Export</button>
</fieldset>
[% END %]
</div>
[% END %]
</form>
[% ELSE %]
<p>Patron has nothing checked out.</p>
[% END %]
</div>
[% INCLUDE "checkouts-table.inc" %]
[% IF ( relatives_issues_count ) %]
<div id="relatives-issues">

Loading…
Cancel
Save