Bugzilla – Attachment 5480 Details for
Bug 6887
Show "checked out from" column on current checkouts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Enh 6887: Add 'checked out from' column to issued items display tables
SIGNED-OFF-Enh-6887-Add-checked-out-from-column-to.patch (text/plain), 10.03 KB, created by
Nicole C. Engard
on 2011-09-20 16:07:25 UTC
(
hide
)
Description:
[SIGNED-OFF] Enh 6887: Add 'checked out from' column to issued items display tables
Filename:
MIME Type:
Creator:
Nicole C. Engard
Created:
2011-09-20 16:07:25 UTC
Size:
10.03 KB
patch
obsolete
>From 08a4606bdc15d0f32b69f460f5d53b7cdda587d9 Mon Sep 17 00:00:00 2001 >From: Ian Walls <ian.walls@bywatersolutions.com> >Date: Tue, 20 Sep 2011 11:50:25 -0400 >Subject: [PATCH] [SIGNED-OFF] Enh 6887: Add 'checked out from' column to issued items display tables > >Adds "checked out from" column to the right of "checked out on" on both >circ/circulation.pl and members/moremembers.pl. Columns are sortable with tablesort >(though only on circ/circulation.pl if syspref enabled). > >The branch name is sourced from issues.branchcode. > >Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> >--- > circ/circulation.pl | 1 + > .../prog/en/includes/checkouts-table-footer.inc | 2 +- > .../prog/en/modules/circ/circulation.tt | 6 ++++++ > .../prog/en/modules/members/moremember.tt | 4 ++++ > members/moremember.pl | 1 + > 5 files changed, 13 insertions(+), 1 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index da4878f..fff32a2 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -438,6 +438,7 @@ sub build_issue_data { > $it->{'can_confirm'} = !$can_renew && !$restype; > $it->{'renew_error'} = $restype; > $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref'); >+ $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'}); > > $totalprice += $it->{'replacementprice'}; > $it->{'itemtype'} = $itemtypeinfo->{'description'}; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc >index 4cf58c4..5638710 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc >@@ -1,6 +1,6 @@ > <tfoot> > <tr> >- <td colspan="5" style="text-align: right; font-weight:bold;">Totals:</td> >+ <td colspan="6" style="text-align: right; font-weight:bold;">Totals:</td> > <td>[% totaldue %]</td> > <td>[% totalprice %]</td> > <td colspan="2"> >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 dd77fcc..724818f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -678,6 +678,7 @@ No patron matched <span class="ex">[% message %]</span> > <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> >@@ -701,6 +702,7 @@ No patron matched <span class="ex">[% message %]</span> > <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td> > <td>[% todayissue.checkoutdate %]</td> > [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.borrowername %]</td>[% END %] >+ <td>[% todayissue.issuingbranchname %]</td> > <td>[% todayissue.itemcallnumber %]</td> > <td>[% todayissue.charge %]</td> > <td>[% todayissue.replacementprice %]</td> >@@ -775,6 +777,7 @@ No patron matched <span class="ex">[% message %]</span> > </td> > <td>[% previssue.displaydate %]</td> > [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.borrowername %]</td>[% END %] >+ <td>[% previssue.issuingbranchname %]</td> > <td>[% previssue.itemcallnumber %]</td> > <td>[% previssue.charge %]</td> > <td>[% previssue.replacementprice %]</td> >@@ -859,6 +862,7 @@ No patron matched <span class="ex">[% message %]</span> > <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> >@@ -878,6 +882,7 @@ No patron matched <span class="ex">[% message %]</span> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&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 %]&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.displaydate %]</td> >+ <td>[% relissue.issuingbranchname %]</td> > <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> >@@ -898,6 +903,7 @@ No patron matched <span class="ex">[% message %]</span> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&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 %]&itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></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.issuingbranchname %]</td> > <td>[% relprevissue.itemcallnumber %]</td> > [% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.borrowername %]</td>[% END %] > <td>[% relprevissue.charge %]</td> >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 db9ae4d..60a6cb4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -422,6 +422,7 @@ function validate1(date) { > <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> >@@ -453,6 +454,7 @@ function validate1(date) { > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issueloo.biblionumber %]"><strong>[% issueloo.title |html %]</strong></a>[% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issueloo.biblionumber %]&itemnumber=[% issueloo.itemnumber %]#item[% issueloo.itemnumber %]">[% issueloo.barcode %]</a></td> > <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td> > <td>[% issueloo.issuedate %]</td> >+ <td>[% issueloo.issuingbranchname %]</td> > <td>[% issueloo.itemcallnumber %]</td> > <td>[% issueloo.charge %]</td> > <td>[% issueloo.replacementprice %]</td> >@@ -529,6 +531,7 @@ function validate1(date) { > <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> >@@ -559,6 +562,7 @@ function validate1(date) { > <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 %]&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>[% relissueloo.issuingbranchname %]</td> > <td>[% relissueloo.itemcallnumber %]</td> > <td>[% relissueloo.charge %]</td> > <td>[% relissueloo.replacementprice %]</td> >diff --git a/members/moremember.pl b/members/moremember.pl >index bfaa402..a76652f 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -268,6 +268,7 @@ sub build_issue_data { > $issue->[$i]{'date_due'} = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref'); > $issue->[$i]{'issuedate'} = C4::Dates->new($issue->[$i]{'issuedate'},'iso')->output('syspref'); > my $biblionumber = $issue->[$i]{'biblionumber'}; >+ $issue->[$i]{'issuingbranchname'} = GetBranchName($issue->[$i]{'branchcode'}); > my %row = %{ $issue->[$i] }; > $totalprice += $issue->[$i]{'replacementprice'}; > $row{'replacementprice'} = $issue->[$i]{'replacementprice'}; >-- >1.7.2.3
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6887
:
5480
|
5482