Attachment 71433 Details for Bug 19671 – Bug 19671: Map itemtypes to hash for correct display in issues_stats.pl

[patch] Bug 19671: Map itemtypes to hash for correct display in issues_stats.pl

Bug-19671-Map-itemtypes-to-hash-for-correct-displa.patch (text/plain), 2.90 KB, created by Claire Gravely on 2018-02-12 10:43:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Claire Gravely

Created: 2018-02-12 10:43:25 UTC

Size: 2.90 KB

patch

obsolete

>From 0873e442e23426070c5d9daf3b8f80de6cea9bfa Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 20 Dec 2017 13:17:50 -0300
>Subject: [PATCH] Bug 19671: Map itemtypes to hash for correct display in
> issues_stats.pl
>
>To test:
>1 - Run the circulation wizard with itemtypes as columns, shelving
>locations as rows - display on screen
>2 - Note all itemtype values are blank
>3 - Switch rows/columns - same issue
>4 - Apply patch
>5 - Re-run reports
>6 - Itemtypes should display correctly
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>---
> reports/issues_stats.pl | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl
>index 2da53d8..3c1ba1f 100755
>--- a/reports/issues_stats.pl
>+++ b/reports/issues_stats.pl
>@@ -87,6 +87,8 @@ $sep = "\t" if ($sep eq 'tabulation');
> $template->param(do_it => $do_it,
> );
> 
>+our $itemtypes = Koha::ItemTypes->search_with_localization->unblessed;
>+
> our @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
> 
> our $locations = { map { ( $_->{authorised_value} => $_->{lib} ) } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.location' }, { order_by => ['description'] } ) };
>@@ -150,9 +152,6 @@ my @values;
> my %labels;
> my %select;
> 
>-# create itemtype arrayref for <select>.
>-our $itemtypes = Koha::ItemTypes->search_with_localization;
>-
>     # location list
> my @locations;
> foreach (sort keys %$locations) {
>@@ -354,12 +353,13 @@ sub calculate {
>         $sth->execute;
>     }
> 
>+    my $itemtypes_map = { map { $_->{itemtype} => $_ } @{ $itemtypes } };
>     while ( my ($celvalue) = $sth->fetchrow ) {
>         my %cell = ( rowtitle => $celvalue, totalrow => 0 );    # we leave 'rowtitle' as hash key (used when filling the table), and add coltitle_display
>         $cell{rowtitle_display} =
>             ( $line =~ /ccode/ )    ? $ccodes->{$celvalue}
>           : ( $line =~ /location/ ) ? $locations->{$celvalue}
>-          : ( $line =~ /itemtype/ ) ? $itemtypes->{$celvalue}->{description}
>+          : ( $line =~ /itemtype/ ) ? $itemtypes_map->{$celvalue}->{translated_description}
>           :                           $celvalue;                               # default fallback
>         if ( $line =~ /sort1/ ) {
>             foreach (@$Bsort1) {
>@@ -448,7 +448,7 @@ sub calculate {
>         $cell{coltitle_display} =
>             ( $column =~ /ccode/ )    ? $ccodes->{$celvalue}
>           : ( $column =~ /location/ ) ? $locations->{$celvalue}
>-          : ( $column =~ /itemtype/ ) ? $itemtypes->{$celvalue}->{description}
>+          : ( $column =~ /itemtype/ ) ? $itemtypes_map->{$celvalue}->{translated_description}
>           :                             $celvalue;                               # default fallback
>         if ( $column =~ /sort1/ ) {
>             foreach (@$Bsort1) {
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19671: 69247 | 69951 | 71433 | 71535