From 49af98afd7dd0a48605a3d77dcc6b24c9b9b549c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 13 Apr 2011 14:38:25 -0400 Subject: [PATCH] Follow-up fix for Bug 5952, Shows member relatives in issues list - 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 --- circ/circulation.pl | 2 +- .../prog/en/modules/circ/circulation.tt | 37 ++++++++----------- .../prog/en/modules/members/moremember.tt | 23 ++++-------- members/moremember.pl | 2 +- 4 files changed, 26 insertions(+), 38 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index bcda99fd09..8c359b1ca8 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -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'}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index f383c21d67..ce75b6fa55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -645,7 +645,7 @@ No patron matched [% message %] 0 Checkouts [% END %] [% IF ( displayrelissues ) %] -
  • Relatives Issues
    • +
  • Relatives' Checkouts
    • [% END %]
  • [% IF ( countreserv ) %] [% countreserv %] Hold(s) @@ -668,7 +668,7 @@ No patron matched [% message %] Due date Title Item Type - Checked out on + Checked out on Call no Charge Price @@ -830,18 +830,17 @@ No patron matched [% message %] [% IF ( displayrelissues ) %]
    -

    Relatives issues

    - - + + - - + + [% IF ( relissues ) %] @@ -856,13 +855,11 @@ No patron matched [% message %] [% relissue.dd %] - - - - - + + + + [% END %] [% END %] [% IF ( relprevissues ) %] @@ -877,16 +874,14 @@ No patron matched [% message %] [% relprevissue.dd %] - - + + [% IF ( relprevissue.multiple_borrowers ) %][% END %] - - + + + [% END %] [% END %] @@ -895,7 +890,7 @@ No patron matched [% message %] -[% END %] +[% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 9fb1736a27..1b3ac7861d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -397,7 +397,7 @@ function validate1(date) {
    Due date Title Item TypeBranchChecked out onChecked out onCall no ChargeBorrowerMaterialPricePatron
    [% relissue.title |html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %] [% relissue.barcode %] [% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %][% END %][% END %][% relissue.itemtype %][% relissue.branchdisplay %] - [% IF ( relissue.itemcallnumber ) %]([% relissue.itemcallnumber %])[% END %] [% relissue.displaydate %][% relissue.charge %][% relissue.borrowername %][% relissue.materials %]
    [% relissue.itemcallnumber %][% relissue.charge %][% relissue.replacementprice %][% relissue.borrowername %] ([% relissue.cardnumber %])
    [% relprevissue.title |html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] [% relprevissue.barcode %] - [% relprevissue.itemtype %] - [% relprevissue.branchdisplay %] - [% IF ( relprevissue.itemcallnumber ) %]([% relprevissue.itemcallnumber %])[% END %][% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %][% END %][% END %][% relprevissue.itemtype %] [% relprevissue.displaydate %][% relprevissue.itemcallnumber %][% relprevissue.borrowername %][% relprevissue.charge %][% relprevissue.borrowername %][% relprevissue.materials %][% relprevissue.replacementprice %][% relprevissue.borrowername %] ([% relprevissue.cardnumber %])
    - - - - - + + @@ -551,16 +547,13 @@ function validate1(date) { [% relissueloo.itemdamaged %] [% END %] - - - - + - - - - + + + + [% END %] diff --git a/members/moremember.pl b/members/moremember.pl index d30d34e819..b766f2f9f7 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -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'); -- 2.39.5
    Due date TitleCollectionStock numberBarcode Item Type Checked out onBorrowerCall noCall no Charge PricePatron
    [% relissueloo.title |html %][% IF ( relissueloo.author ) %], by [% relissueloo.author %][% END %] [% IF ( relissueloo.publishercode ) %]; [% relissueloo.publishercode %] [% END %] [% IF ( relissueloo.publicationyear ) %], [% relissueloo.publicationyear %][% END %][% relissueloo.collection %][% relissueloo.stocknumber %][% relissueloo.barcode %][% relissueloo.title |html %][% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] [% relissueloo.barcode %] [% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %][% END %][% END %][% relissueloo.itemtype_description %] [% relissueloo.issuedate %][% relissueloo.borrowername %][% relissueloo.itemcallnumber %][% relissueloo.charge %][% relissueloo.replacementprice %][% relissueloo.itemcallnumber %][% relissueloo.charge %][% relissueloo.replacementprice %][% relissueloo.borrowername %] ([% relissueloo.cardnumber %])