Corrected: Fix for Bug 4529, columns on circ history all screwy
- fix formatting of last renew date - Add table zebra striping - Other markup structure changes - Revised template assumes that issues.branchcode == checkout library and displays that value instead of issues.issuingbranch (which is always empty, see Bug 2806) issues.branchcode seems to reflect the item's holding branch *after* having been updated as part of the checkout transaction. Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This commit is contained in:
parent
d6e6d920b5
commit
ed2348dd95
2 changed files with 21 additions and 26 deletions
|
@ -67,6 +67,7 @@ foreach (@$issues){
|
||||||
$_->{date_due} = format_date($_->{date_due});
|
$_->{date_due} = format_date($_->{date_due});
|
||||||
$_->{issuedate} = format_date($_->{issuedate});
|
$_->{issuedate} = format_date($_->{issuedate});
|
||||||
$_->{returndate} = format_date($_->{returndate});
|
$_->{returndate} = format_date($_->{returndate});
|
||||||
|
$_->{lastreneweddate} = format_date($_->{lastreneweddate});
|
||||||
}
|
}
|
||||||
$template->param(
|
$template->param(
|
||||||
total => scalar @$issues,
|
total => scalar @$issues,
|
||||||
|
|
|
@ -15,29 +15,26 @@
|
||||||
<div id="yui-main">
|
<div id="yui-main">
|
||||||
<div class="yui-b">
|
<div class="yui-b">
|
||||||
|
|
||||||
<h1>Checkout history for <!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF --> </h1>
|
<h1>Checkout history for <!-- TMPL_VAR NAME="title" escape="html" --></h1>
|
||||||
|
<!-- TMPL_IF NAME="author" --><h3>by <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF -->
|
||||||
|
|
||||||
<div class="searchresults">
|
<div class="searchresults">
|
||||||
<!-- TMPL_IF NAME="issues" -->
|
<!-- TMPL_IF NAME="issues" -->
|
||||||
<p><b>Has been checked out <!-- TMPL_VAR NAME="total" --> times</b></p>
|
<h4>Checked out <!-- TMPL_VAR NAME="total" --> times</h4>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<thead><tr>
|
||||||
<th>Patron</th>
|
<th>Patron</th>
|
||||||
<th>Barcode</th>
|
<th>Barcode</th>
|
||||||
<th>Library</th>
|
<th>Checked out from</th>
|
||||||
<th>Issuing library</th>
|
|
||||||
<th>Renewed</th>
|
<th>Renewed</th>
|
||||||
<th>Checkout on</th>
|
<th>Checkout on</th>
|
||||||
<th>Due date</th>
|
<th>Due date</th>
|
||||||
<th>Checkin on</th>
|
<th>Checkin on</th>
|
||||||
</tr>
|
</tr></thead>
|
||||||
|
<tbody>
|
||||||
<!-- TMPL_LOOP NAME="issues" -->
|
<!-- TMPL_LOOP NAME="issues" -->
|
||||||
<tr>
|
<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE
|
||||||
<td><!-- TMPL_IF NAME="issuedate" -->
|
--><tr><!-- /TMPL_UNLESS -->
|
||||||
<!-- TMPL_VAR NAME="issuedate" -->
|
|
||||||
<!-- TMPL_ELSE -->
|
|
||||||
|
|
||||||
<!-- /TMPL_IF --></td>
|
|
||||||
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --><!-- TMPL_IF NAME="firstname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --></a></td>
|
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --><!-- TMPL_IF NAME="firstname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --></a></td>
|
||||||
<td><!-- TMPL_IF NAME="barcode" -->
|
<td><!-- TMPL_IF NAME="barcode" -->
|
||||||
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a>
|
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a>
|
||||||
|
@ -49,21 +46,17 @@
|
||||||
<!-- TMPL_ELSE -->
|
<!-- TMPL_ELSE -->
|
||||||
|
|
||||||
<!-- /TMPL_IF --></td>
|
<!-- /TMPL_IF --></td>
|
||||||
<td><!-- TMPL_IF NAME="issuingbranch" -->
|
<td><!-- TMPL_IF NAME="renewals"-->
|
||||||
<!-- TMPL_VAR NAME="issuingbranch" -->
|
Yes<!-- TMPL_IF NAME="lastreneweddate" -->, <small>last on: <!-- TMPL_VAR NAME="lastreneweddate" --></small>
|
||||||
|
<!-- /TMPL_IF -->
|
||||||
|
<!-- TMPL_ELSE -->
|
||||||
|
No
|
||||||
|
<!-- /TMPL_IF --></td>
|
||||||
|
<td><!-- TMPL_IF NAME="issuedate" -->
|
||||||
|
<!-- TMPL_VAR NAME="issuedate" -->
|
||||||
<!-- TMPL_ELSE -->
|
<!-- TMPL_ELSE -->
|
||||||
|
|
||||||
<!-- /TMPL_IF --></td>
|
<!-- /TMPL_IF --></td>
|
||||||
<td><!-- TMPL_IF NAME="renewals"-->
|
|
||||||
YES<br />
|
|
||||||
<small>
|
|
||||||
<!-- TMPL_IF NAME="lastreneweddate" -->
|
|
||||||
last on: <!-- TMPL_VAR NAME="lastreneweddate" -->
|
|
||||||
<!-- /TMPL_IF -->
|
|
||||||
</small>
|
|
||||||
<!-- TMPL_ELSE -->
|
|
||||||
NO
|
|
||||||
<!-- /TMPL_IF --></td>
|
|
||||||
<td><!-- TMPL_IF NAME="date_due" -->
|
<td><!-- TMPL_IF NAME="date_due" -->
|
||||||
<!-- TMPL_VAR NAME="date_due" -->
|
<!-- TMPL_VAR NAME="date_due" -->
|
||||||
<!-- TMPL_ELSE -->
|
<!-- TMPL_ELSE -->
|
||||||
|
@ -76,10 +69,11 @@
|
||||||
<!-- /TMPL_IF --></td>
|
<!-- /TMPL_IF --></td>
|
||||||
</tr>
|
</tr>
|
||||||
<!-- /TMPL_LOOP -->
|
<!-- /TMPL_LOOP -->
|
||||||
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<!-- TMPL_ELSE -->
|
<!-- TMPL_ELSE -->
|
||||||
<p>
|
<div class="dialog message"><p>
|
||||||
<b><!-- TMPL_VAR NAME="title" escape="html" -->(<!-- TMPL_VAR NAME="author" -->)</b> <span class="problem">has never been checked out.</span></p>
|
<b><!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></b> has never been checked out.</p></div>
|
||||||
|
|
||||||
<!-- /TMPL_IF -->
|
<!-- /TMPL_IF -->
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue