Attachment 28468 Details for Bug 7683 – Bug 7683: Remove use of items.statisticvalue and DHTMLcalendar()

[patch] Bug 7683: Remove use of items.statisticvalue and DHTMLcalendar()

Bug-7683-Remove-use-of-itemsstatisticvalue-and-DHT.patch (text/plain), 8.08 KB, created by Julian Maurice on 2014-05-23 12:26:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2014-05-23 12:26:42 UTC

Size: 8.08 KB

patch

obsolete

>From 37da3534f6c3e0cd4988ea29a921ba7076baa7fb Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Mon, 23 Sep 2013 13:34:15 +0200
>Subject: [PATCH] Bug 7683: Remove use of items.statisticvalue and
> DHTMLcalendar()
>
>Also fix indexes of @filters array
>---
> .../prog/en/modules/reports/catalogue_stats.tt     |   25 ---------
> reports/catalogue_stats.pl                         |   54 +++++++++-----------
> 2 files changed, 23 insertions(+), 56 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 @@
>                     <td colspan="4"><input type="hidden" name="Filter" /></td>
>                 </tr>
>             [% END %]
>-            [% IF (statisticvalue) %]
>-                <tr>
>-                    <td>[% statisticvalue_label %]</td>
>-                    <td><input type="radio" name="Line"   value="items.statisticvalue" /></td>
>-                    <td><input type="radio" name="Column" value="items.statisticvalue" /></td>
>-                    <td>
>-                        [% IF (statisticvalue_avlist) %]
>-                            <select name="Filter" id="statisticvalue">
>-                                <option value="">&nbsp;</option>
>-                                [% FOREACH av IN statisticvalue_avlist %]
>-                                    <option value="[% av.authorised_value %]">
>-                                        [% av.lib %]
>-                                    </option>
>-                                [% END %]
>-                            </select>
>-                        [% ELSE %]
>-                            <input type="text" name="Filter" id="statisticvalue" />
>-                        [% END %]
>-                    </td>
>-                </tr>
>-            [% ELSE %]
>-                <tr style="display:none">
>-                    <td colspan="4"><input type="hidden" name="Filter" /></td>
>-                </tr>
>-            [% END %]
>             <tr>
>                 <td colspan="3">Filter barcode</td>
>                 <td>
>diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl
>index 643497e..54ae927 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(),
>     );
> 
> }
>@@ -234,7 +233,7 @@ sub calculate {
>     my @loopfilter;
>     for ( my $i = 0 ; $i <= @$filters ; $i++ ) {
>         my %cell;
>-        if ( defined @$filters[$i] and @$filters[$i] ne '' and $i != 16 ) {
>+        if ( defined @$filters[$i] and @$filters[$i] ne '' and $i != 15 ) {
>             if ( ( ( $i == 1 ) or ( $i == 3 ) or ( $i == 5 ) or ( $i == 9 ) ) and ( @$filters[ $i - 1 ] ) ) {
>                 $cell{err} = 1 if ( @$filters[$i] < @$filters[ $i - 1 ] );
>             }
>@@ -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;
>@@ -294,11 +292,10 @@ sub calculate {
>     $linefilter[0] = @$filters[12] if ( $line =~ /items\.ccode/ );
>     $linefilter[0] = @$filters[13] if ( $line =~ /items\.notforloan/ );
>     $linefilter[0] = @$filters[14] if ( $line =~ /items\.materials/ );
>-    $linefilter[0] = @$filters[15] if ( $line =~ /items\.statisticvalue/ );
>-    $linefilter[0] = @$filters[18] if ( $line =~ /items\.dateaccessioned/ );
>-    $linefilter[1] = @$filters[19] if ( $line =~ /items\.dateaccessioned/ );
>-    $linefilter[0] = @$filters[20] if ( $line =~ /deleteditems\.timestamp/ );
>-    $linefilter[1] = @$filters[21] if ( $line =~ /deleteditems\.timestamp/ );
>+    $linefilter[0] = @$filters[17] if ( $line =~ /items\.dateaccessioned/ );
>+    $linefilter[1] = @$filters[18] if ( $line =~ /items\.dateaccessioned/ );
>+    $linefilter[0] = @$filters[19] if ( $line =~ /deleteditems\.timestamp/ );
>+    $linefilter[1] = @$filters[20] if ( $line =~ /deleteditems\.timestamp/ );
> 
>     my @colfilter;
>     $colfilter[0] = @$filters[0] if ( $column =~ /dewey/ );
>@@ -320,11 +317,10 @@ sub calculate {
>     $colfilter[0] = @$filters[12] if ( $column =~ /items\.ccode/ );
>     $colfilter[0] = @$filters[13] if ( $column =~ /items\.notforloan/ );
>     $colfilter[0] = @$filters[14] if ( $column =~ /items\.materials/ );
>-    $colfilter[0] = @$filters[15] if ( $column =~ /items\.statisticvalue/ );
>-    $colfilter[0] = @$filters[18] if ( $column =~ /items.dateaccessioned/ );
>-    $colfilter[1] = @$filters[19] if ( $column =~ /items\.dateaccessioned/ );
>-    $colfilter[0] = @$filters[20] if ( $column =~ /deleteditems\.timestamp/ );
>-    $colfilter[1] = @$filters[21] if ( $column =~ /deleteditems\.timestamp/ );
>+    $colfilter[0] = @$filters[17] if ( $column =~ /items.dateaccessioned/ );
>+    $colfilter[1] = @$filters[18] if ( $column =~ /items\.dateaccessioned/ );
>+    $colfilter[0] = @$filters[19] if ( $column =~ /deleteditems\.timestamp/ );
>+    $colfilter[1] = @$filters[20] if ( $column =~ /deleteditems\.timestamp/ );
> 
>     # 1st, loop rows.
>     my $origline = $line;
>@@ -540,25 +536,21 @@ sub calculate {
>         @$filters[14] =~ s/\*/%/g;
>         $strcalc .= " AND $itemstable.materials  LIKE '" . @$filters[14] . "'";
>     }
>-    if ( defined @$filters[15] and @$filters[15] ne '' ) {
>-        @$filters[15] =~ s/\*/%/g;
>-        $strcalc .= " AND $itemstable.statisticvalue  LIKE '" . @$filters[15] . "'";
>+    if ( @$filters[17] ) {
>+        @$filters[17] =~ s/\*/%/g;
>+        $strcalc .= " AND $itemstable.dateaccessioned >= '@$filters[17]' ";
>     }
>     if ( @$filters[18] ) {
>         @$filters[18] =~ s/\*/%/g;
>-        $strcalc .= " AND $itemstable.dateaccessioned >= '@$filters[18]' ";
>+        $strcalc .= " AND $itemstable.dateaccessioned <= '@$filters[18]' ";
>     }
>-    if ( @$filters[19] ) {
>+    if ( $cellvalue eq 'deleteditems' and @$filters[19] ) {
>         @$filters[19] =~ s/\*/%/g;
>-        $strcalc .= " AND $itemstable.dateaccessioned <= '@$filters[19]' ";
>+        $strcalc .= " AND DATE(deleteditems.timestamp) >= '@$filters[19]' ";
>     }
>     if ( $cellvalue eq 'deleteditems' and @$filters[20] ) {
>         @$filters[20] =~ s/\*/%/g;
>-        $strcalc .= " AND DATE(deleteditems.timestamp) >= '@$filters[20]' ";
>-    }
>-    if ( $cellvalue eq 'deleteditems' and @$filters[21] ) {
>-        @$filters[21] =~ s/\*/%/g;
>-        $strcalc .= " AND DATE(deleteditems.timestamp) <= '@$filters[21]' ";
>+        $strcalc .= " AND DATE(deleteditems.timestamp) <= '@$filters[20]' ";
>     }
>     $strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
>     $debug and warn "SQL: $strcalc";
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 7683: 12762 | 12785 | 12940 | 14399 | 14466 | 16327 | 16328 | 16329 | 16367 | 16775 | 20241 | 20242 | 20243 | 20244 | 20245 | 21357 | 21358 | 23683 | 23684 | 23685 | 23686 | 23687 | 23688 | 23689 | 23690 | 23691 | 25072 | 25073 | 25091 | 25092 | 25093 | 25094 | 25095 | 25096 | 25097 | 25098 | 25099 | 25100 | 26678 | 26679 | 26680 | 26681 | 26682 | 28466 | 28467 | 28468 | 28469 | 28470 | 36489 | 36490 | 36491 | 36492 | 36493 | 39129 | 39130 | 39131 | 39132 | 39133 | 41821 | 41829 | 44651 | 44652 | 44653 | 44654 | 44655 | 45238 | 45239 | 45240 | 45241 | 45242