From 4ee24e5e9d7c8bdb84689f22ded9b9f5dd67356e Mon Sep 17 00:00:00 2001 From: Garry Collum Date: Fri, 14 Aug 2009 16:07:21 -0400 Subject: [PATCH] Bug 2553: Alphabetizes library and itemtype dropdown lists in Lost Items report. Content-Type: text/plain; charset="utf-8" Form - Fixes alphabetization of dropdowns. Results - Fixes format of "Date last seen" to be the system date preference. Adds highlighting to the table. Enables warnings. Pages generated no warnings. --- .../prog/en/modules/reports/itemslost.tmpl | 4 +++ reports/itemslost.pl | 24 ++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl index acfbf91..01deccc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl @@ -42,7 +42,11 @@ Notes + + + + " title=""> diff --git a/reports/itemslost.pl b/reports/itemslost.pl index 406fbbf..adf231e 100755 --- a/reports/itemslost.pl +++ b/reports/itemslost.pl @@ -23,6 +23,8 @@ This script displays lost items. =cut use strict; +use warnings; + use CGI; use C4::Auth; use C4::Output; @@ -30,6 +32,7 @@ use C4::Biblio; use C4::Items; use C4::Koha; # GetItemTypes use C4::Branch; # GetBranches +use C4::Dates qw/format_date/; my $query = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -62,6 +65,9 @@ if ( $get_items ) { $where{$itype} = $itemtypesfilter if defined $itemtypesfilter; my $items = GetLostItems( \%where, $orderbyfilter ); + foreach my $it (@$items) { + $it->{'datelastseen'} = format_date($it->{'datelastseen'}); + } $template->param( total => scalar @$items, itemsloop => $items, @@ -71,23 +77,13 @@ if ( $get_items ) { } # getting all branches. -my $branches = GetBranches; -my $branch = C4::Context->userenv->{"branchname"}; -my @branchloop; -foreach my $thisbranch ( keys %$branches ) { - my $selected = 1 if $thisbranch eq $branch; - my %row = ( - value => $thisbranch, - selected => $selected, - branchname => $branches->{$thisbranch}->{'branchname'}, - ); - push @branchloop, \%row; -} +#my $branches = GetBranches; +#my $branch = C4::Context->userenv->{"branchname"}; # getting all itemtypes my $itemtypes = &GetItemTypes(); my @itemtypesloop; -foreach my $thisitemtype ( sort keys %$itemtypes ) { +foreach my $thisitemtype ( sort {$itemtypes->{$a}->{description} cmp $itemtypes->{$b}->{description}} keys %$itemtypes ) { my %row = ( value => $thisitemtype, description => $itemtypes->{$thisitemtype}->{'description'}, @@ -98,7 +94,7 @@ foreach my $thisitemtype ( sort keys %$itemtypes ) { # get lost statuses my $lost_status_loop = C4::Koha::GetAuthorisedValues( 'LOST' ); -$template->param( branchloop => \@branchloop, +$template->param( branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}), itemtypeloop => \@itemtypesloop, loststatusloop => $lost_status_loop, ); -- 1.5.6.5