From 3e09af5f749fe4b6409f96716ed519d04cba8188 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 23 Sep 2013 13:34:15 +0200 Subject: [PATCH] Bug 7683: Remove use of items.statisticvalue and DHTMLcalendar() --- .../prog/en/modules/reports/catalogue_stats.tt | 25 -------------------- reports/catalogue_stats.pl | 16 ++++++------- 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt index bd59319..df5bee7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt @@ -275,31 +275,6 @@ [% END %] - [% IF (statisticvalue) %] - - [% statisticvalue_label %] - - - - [% IF (statisticvalue_avlist) %] - - [% ELSE %] - - [% END %] - - - [% ELSE %] - - - - [% END %] Filter barcode diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl index 643497e..ea1c635 100755 --- a/reports/catalogue_stats.pl +++ b/reports/catalogue_stats.pl @@ -160,7 +160,7 @@ if ($do_it) { push @locations, { code => $_, description => "$_ - " . $locations->{$_} }; } - foreach my $kohafield (qw(items.notforloan items.materials items.statisticvalue)) { + foreach my $kohafield (qw(items.notforloan items.materials)) { my $subfield_structure = GetMarcSubfieldStructureFromKohaField($kohafield); if($subfield_structure) { my $avlist; @@ -191,7 +191,6 @@ if ($do_it) { CGIextChoice => \@mime, CGIsepChoice => GetDelimiterChoices, item_itype => $item_itype, - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); } @@ -255,13 +254,12 @@ sub calculate { : ( $i == 12 ) ? "Collection Code" : ( $i == 13 ) ? "Status" : ( $i == 14 ) ? "Materials" - : ( $i == 15 ) ? "Statistic value" - : ( $i == 17 and $filters->[16] == 0 ) ? "Barcode (not like)" - : ( $i == 17 and $filters->[16] == 1 ) ? "Barcode (like)" - : ( $i == 18 ) ? "Acquired date from" - : ( $i == 19 ) ? "Acquired date to" - : ( $i == 20 ) ? "Removed date from" - : ( $i == 21 ) ? "Removed date to" + : ( $i == 16 and $filters->[15] == 0 ) ? "Barcode (not like)" + : ( $i == 16 and $filters->[15] == 1 ) ? "Barcode (like)" + : ( $i == 17 ) ? "Acquired date from" + : ( $i == 18 ) ? "Acquired date to" + : ( $i == 19 ) ? "Removed date from" + : ( $i == 20 ) ? "Removed date to" : ''; push @loopfilter, \%cell; -- 1.7.10.4