Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Follow-up fix for Bug 5952, Shows member relatives in issues list

Browse source 
- Moving columns around to match display of patron's own checkouts
- Correcting terminology (issues, borrowers)
- Hiding columns added in previous patch which do not display in
  the standard checkout list: materials, stock number, collection.
  If these are to be added they should be added to all displays.

[edit] Adding display of relative's cardnumber alongside their name

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Owen Leonard 2011-04-13 14:38:25 -04:00 committed by Chris Cormack
parent d4f2bde054
commit 49af98afd7
4 changed files with 26 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
circ/circulation.pl
View file

@ -421,7 +421,7 @@ sub build_issue_data {
# Getting borrower details
my $memberdetails = GetMemberDetails($it->{'borrowernumber'});
$it->{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};
$it->{'cardnumber'} = $memberdetails->{'cardnumber'};
# set itemtype per item-level_itype syspref - FIXME this is an ugly hack
$it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};

37
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
View file

@ -645,7 +645,7 @@ No patron matched <span class="ex">[% message %]</span>
<a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
[% END %]</li>
[% IF ( displayrelissues ) %]
<li><a href="/cgi-bin/koha/circ/circulation.pl#relissues">Relatives Issues</a></li>
<li><a href="/cgi-bin/koha/circ/circulation.pl#relissues">Relatives' Checkouts</a></li>
[% END %]
<li>[% IF ( countreserv ) %]
<a href="/cgi-bin/koha/circ/circulation.pl#reserves">[% countreserv %] Hold(s)</a>
@ -668,7 +668,7 @@ No patron matched <span class="ex">[% message %]</span>
<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 on</th>
<th scope="col">Call no</th>
<th scope="col">Charge</th>
<th scope="col">Price</th>
@ -830,18 +830,17 @@ No patron matched <span class="ex">[% message %]</span>
[% IF ( displayrelissues ) %]
<div id="relissues">
<h2>Relatives issues</h2>
<table id="relissuest">
<thead>
<tr>
<th scope="col">Due date</th>
<th scope="col">Title</th>
<th scope="col">Item Type</th>
<th scope="col">Branch</th>
<th scope="col">Checked out on</th>
<th scope="col">Checked out on</th>
<th scope="col">Call no</th>
<th scope="col">Charge</th>
<th scope="col">Borrower</th>
<th scope="col">Material</th>
<th scope="col">Price</th>
<th scope="col">Patron</th>
</tr>
</thead>
[% IF ( relissues ) %] <tbody>
@ -856,13 +855,11 @@ No patron matched <span class="ex">[% message %]</span>
[% relissue.dd %]</td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
<td>[% relissue.branchdisplay %]
[% IF ( relissue.itemcallnumber ) %]([% relissue.itemcallnumber %])[% END %]</td>
<td>[% relissue.displaydate %]</td>
<td>[% relissue.charge %]</td>
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.borrowername %]</a></td>
<td>[% relissue.materials %]</td>
</tr>
<td>[% relissue.itemcallnumber %]</td>
<td>[% relissue.charge %]</td>
<td>[% relissue.replacementprice %]</td><td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.borrowername %] ([% relissue.cardnumber %])</a></td>
</tr>
[% END %] <!-- /loop todayissues -->
<!-- /if todayissues -->[% END %]
[% IF ( relprevissues ) %]
@ -877,16 +874,14 @@ No patron matched <span class="ex">[% message %]</span>
[% relprevissue.dd %]
</td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
<td>
[% relprevissue.itemtype %]
</td>
<td>[% relprevissue.branchdisplay %]
[% IF ( relprevissue.itemcallnumber ) %]([% relprevissue.itemcallnumber %])[% END %]</td>
<td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
<td>[% relprevissue.displaydate %]</td>
<td>[% relprevissue.itemcallnumber %]</td>
[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.borrowername %]</td>[% END %]
<td>[% relprevissue.charge %]</td>
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.borrowername %]</a></td>
<td>[% relprevissue.materials %]</td>
<td>[% relprevissue.replacementprice %]</td>
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.borrowername %] ([% relprevissue.cardnumber %])</a></td>
</tr>
<!-- /loop previssues -->[% END %]
<!--/if previssues -->[% END %]
@ -895,7 +890,7 @@ No patron matched <span class="ex">[% message %]</span>
</form>
</div>
[% END %]<!-- end displayrelissues -->
[% END %]<!-- end displayrelissues -->
<div id="reserves">

23
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
View file

@ -397,7 +397,7 @@ function validate1(date) {
<ul>
<li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issuecount %] Checkout(s)</a></li>
[% IF ( relissuecount ) %]
<li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives issues</a></li>
<li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives' Checkouts</a></li>
[% END %]
<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
<li>[% IF ( countreserv ) %]
@ -518,21 +518,17 @@ function validate1(date) {
[% IF ( relissuecount ) %]
<div id="relissues">
<h2>Relatives issues</h2>
<table id="relissuest">
<thead>
<tr>
<th scope="col">Due date</th>
<th scope="col">Title</th>
<th scope="col">Collection</th>
<th scope="col">Stock number</th>
<th scope="col">Barcode</th>
<th scope="col">Item Type</th>
<th scope="col">Checked out on</th>
<th scope="col">Borrower</th>
<th scope="col">Call no</th>
<th scope="col">Call no</th>
<th scope="col">Charge</th>
<th scope="col">Price</th>
<th scope="col">Patron</th>
</tr>
</thead>
<tbody>
@ -551,16 +547,13 @@ function validate1(date) {
<span class="dmg">[% relissueloo.itemdamaged %]</span>
[% END %]
</td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF ( relissueloo.author ) %], by [% relissueloo.author %][% END %] [% IF ( relissueloo.publishercode ) %]; [% relissueloo.publishercode %] [% END %] [% IF ( relissueloo.publicationyear ) %], [% relissueloo.publicationyear %][% END %]</td>
<td>[% relissueloo.collection %]</td>
<td>[% relissueloo.stocknumber %]</td>
<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
<td>[% relissueloo.issuedate %]</td>
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %]</a></td>
<td>[% relissueloo.itemcallnumber %]</td>
<td>[% relissueloo.charge %]</td>
<td>[% relissueloo.replacementprice %]</td>
<td>[% relissueloo.itemcallnumber %]</td>
<td>[% relissueloo.charge %]</td>
<td>[% relissueloo.replacementprice %]</td>
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %] ([% relissueloo.cardnumber %])</a></td>
</tr>
[% END %]
</tbody>

2
members/moremember.pl
View file

@ -265,7 +265,7 @@ sub build_issue_data {
# Getting borrower details
my $memberdetails = GetMemberDetails($issue->[$i]{'borrowernumber'});
$issue->[$i]{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};
$issue->[$i]{'cardnumber'} = $memberdetails->{'cardnumber'};
my $datedue = $issue->[$i]{'date_due'};
my $issuedate = $issue->[$i]{'issuedate'};
$issue->[$i]{'date_due'} = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref');