Bugzilla – Attachment 5110 Details for
Bug 3431
Catalog by itemtype report pulling from holdingbranch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix
0001-Fix-for-Bug-3431-Catalog-by-itemtype-report-pulling-.patch (text/plain), 6.31 KB, created by
Owen Leonard
on 2011-08-23 19:37:48 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2011-08-23 19:37:48 UTC
Size:
6.31 KB
patch
obsolete
>From 9e2d585af6a731e06c4285b1cf9669c252afa45b Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 23 Aug 2011 15:33:34 -0400 >Subject: [PATCH] Fix for Bug 3431 - Catalog by itemtype report pulling from holdingbranch >Content-Type: text/plain; charset="utf-8" > >Plus several other fixes for this report no one uses: > >- Clarifying titles and breadcrumbs >- Correcting terminology: branch -> library >- Sorting library select field by library name >- Displaying library name instead of code on output >- Sorting results by itemtype description >- Adding tablesorter to results >--- > .../prog/en/modules/reports/itemtypes.tt | 38 +++++++++++++------ > reports/itemtypes.plugin | 20 +++++++--- > 2 files changed, 40 insertions(+), 18 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >index 65fa34e..26199e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -1,12 +1,20 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Item Types</title> >+<title>Koha › Reports › Catalog by Item Types</title> > [% INCLUDE 'doc-head-close.inc' %] >+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript"> >+//<![CDATA[ >+$(document).ready(function() { >+ $("#itemtypest").tablesorter(); >+}); >+//]]> >+</script> > </head> > <body> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>[% IF ( do_it ) %] › <a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Item Types</a> › Results[% ELSE %] › Item Types[% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>[% IF ( do_it ) %] › <a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by Item Type</a> › Results[% ELSE %] › Catalog by Item Type[% END %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -16,29 +24,35 @@ > > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h1>Reports on item types [% IF ( mainloo.branch ) %] for branch = [% mainloo.branch %][% END %]</h1> >- <table> >+ <h1>Reports on item types [% IF ( mainloo.branchname ) %] held at [% mainloo.branchname %][% END %]</h1> >+ <table id="itemtypest"> >+ <thead> > <tr> > <th>Item type</th> >- <th>count</th> >+ <th>Count</th> > </tr> >+ </thead> >+ <tfoot> >+ <tr> >+ <th>TOTAL</th> >+ <th>[% mainloo.total %]</th> >+ </tr> >+ </tfoot> >+ <tbody> > [% FOREACH loopitemtyp IN mainloo.loopitemtype %] > <tr> > <td>[% loopitemtyp.itemtype %]</td> > <td>[% loopitemtyp.count %]</td> > </tr> > [% END %] >- <tr> >- <th>TOTAL</th> >- <th>[% mainloo.total %]</th> >- </tr> >+ </tbody> > </table> > [% END %] > [% ELSE %] >- >+ <h3>View a count of items held at your library grouped by item type</h3> > <form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes"> >- <fieldset class="rows"><legend>View catalog group by item types</legend><ol><li><label for="value">Select a branch</label> [% CGIbranch %] >- <span class="tip">Select none to see all branches</span></li></ol></fieldset> >+ <fieldset class="rows"><ol><li><label for="value">Select a library</label> [% CGIbranch %] >+ <span class="tip">Select none to see all libraries</span></li></ol></fieldset> > <fieldset class="action"><input type="submit" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name %]" /> > <input type="hidden" name="do_it" value="1" /></fieldset> >diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin >index d541429..248be42 100755 >--- a/reports/itemtypes.plugin >+++ b/reports/itemtypes.plugin >@@ -36,20 +36,23 @@ sub set_parameters { > my $dbh = C4::Context->dbh; > my $branches=GetBranches(); > my @branches; >+ my $default; > my @select_branch; > my %select_branches; > push @select_branch,""; > $select_branches{""} = ""; >- foreach my $branch (keys %$branches) { >+ for my $branch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) { > push @select_branch, $branch; > $select_branches{$branch} = $branches->{$branch}->{'branchname'}; >+ $default = C4::Context->userenv->{'branch'} if (C4::Context->userenv && C4::Context->userenv->{'branch'}); > } > my $CGIbranch=CGI::scrolling_list( -name => 'value', > -id => 'value', > -values => \@select_branch, > -labels => \%select_branches, > -size => 1, >- -multiple => 0 ); >+ -multiple => 0, >+ -default => $default, ); > $template->param(CGIbranch => $CGIbranch); > return $template; > } >@@ -66,7 +69,8 @@ sub calculate { > FROM itemtypes,items > WHERE items.itype=itemtypes.itemtype > AND items.holdingbranch=? >- GROUP BY items.itype"); >+ GROUP BY items.itype >+ ORDER BY itemtypes.description"); > > } > else { >@@ -76,7 +80,8 @@ sub calculate { > WHERE biblioitems.itemtype=itemtypes.itemtype > AND items.biblioitemnumber=biblioitems.biblioitemnumber > AND items.holdingbranch=? >- GROUP BY biblioitems.itemtype"); >+ GROUP BY biblioitems.itemtype >+ ORDER BY itemtypes.description"); > } > $sth->execute($branch); > } else { >@@ -85,14 +90,16 @@ sub calculate { > SELECT description,items.itype AS itemtype, COUNT(*) AS total > FROM itemtypes,items > WHERE items.itype=itemtypes.itemtype >- GROUP BY items.itype"); >+ GROUP BY items.itype >+ ORDER BY itemtypes.description"); > } > else { > $sth = $dbh->prepare("SELECT description, biblioitems.itemtype, COUNT(*) AS total > FROM itemtypes, biblioitems,items > WHERE biblioitems.itemtype=itemtypes.itemtype > AND biblioitems.biblioitemnumber = items.biblioitemnumber >- GROUP BY biblioitems.itemtype"); >+ GROUP BY biblioitems.itemtype >+ ORDER BY itemtypes.description"); > } > $sth->execute; > } >@@ -117,6 +124,7 @@ sub calculate { > $globalline{loopitemtype} = \@results; > $globalline{total} = $grantotal; > $globalline{branch} = $branch; >+ $globalline{branchname} = GetBranchName($branch); > push @mainloop,\%globalline; > return \@mainloop; > } >-- >1.7.3 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=5110">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 3431
:
5110
|
6715