View | Details | Raw Unified | Return to bug 17801
Collapse All | Expand All

(-)a/reports/cat_issues_top.pl (-16 / +15 lines)
Lines 195-208 sub calculate { Link Here
195
    my $colfield;
195
    my $colfield;
196
    my $colorder;
196
    my $colorder;
197
    if ($column){
197
    if ($column){
198
        $column = "old_issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/));
198
        $column = "old_issues.".$column if (($column=~/branchcode/) or ($column=~/issuedate/));
199
        if($column=~/itemtype/){
199
        if($column=~/itemtype/){
200
            $column = C4::Context->preference('item-level_itypes') ? "items.itype": "biblioitems.itemtype";
200
            $column = C4::Context->preference('item-level_itypes') ? "items.itype": "biblioitems.itemtype";
201
        }
201
        }
202
        $column = "borrowers.".$column if $column=~/categorycode/;
202
        $column = "borrowers.".$column if $column=~/categorycode/;
203
        my @colfilter ;
203
        my @colfilter ;
204
        $colfilter[0] = @$filters[0] if ($column =~ /timestamp/ )  ;
204
        $colfilter[0] = @$filters[0] if ($column =~ /issuedate/ )  ;
205
        $colfilter[1] = @$filters[1] if ($column =~ /timestamp/ )  ;
205
        $colfilter[1] = @$filters[1] if ($column =~ /issuedate/ )  ;
206
        $colfilter[0] = @$filters[2] if ($column =~ /returndate/ )  ;
206
        $colfilter[0] = @$filters[2] if ($column =~ /returndate/ )  ;
207
        $colfilter[1] = @$filters[3] if ($column =~ /returndate/ )  ;
207
        $colfilter[1] = @$filters[3] if ($column =~ /returndate/ )  ;
208
        $colfilter[0] = @$filters[4] if ($column =~ /branch/ )  ;
208
        $colfilter[0] = @$filters[4] if ($column =~ /branch/ )  ;
Lines 213-237 sub calculate { Link Here
213
        $colfilter[0] = @$filters[8] if ($column =~ /category/ )  ;
213
        $colfilter[0] = @$filters[8] if ($column =~ /category/ )  ;
214
      # This commented out row (sort2) was not removed when adding new filters for ccode, shelving location and call number
214
      # This commented out row (sort2) was not removed when adding new filters for ccode, shelving location and call number
215
      # $colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ;
215
      # $colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ;
216
        $colfilter[0] = @$filters[9] if ($column =~ /timestamp/ ) ;
216
        $colfilter[0] = @$filters[9] if ($column =~ /issuedate/ ) ;
217
        $colfilter[0] = @$filters[10] if ($column =~ /timestamp/ ) ;
217
        $colfilter[0] = @$filters[10] if ($column =~ /issuedate/ ) ;
218
        $colfilter[0] = @$filters[11] if ($column =~ /timestamp/ ) ;
218
        $colfilter[0] = @$filters[11] if ($column =~ /issuedate/ ) ;
219
    #warn "filtre col ".$colfilter[0]." ".$colfilter[1];
219
    #warn "filtre col ".$colfilter[0]." ".$colfilter[1];
220
                                                
220
                                                
221
    # loop cols.
221
    # loop cols.
222
        if ($column eq "Day") {
222
        if ($column eq "Day") {
223
            #Display by day
223
            #Display by day
224
            $column = "old_issues.timestamp";
224
            $column = "old_issues.issuedate";
225
            $colfield .="dayname($column)";  
225
            $colfield .="dayname($column)";  
226
            $colorder .="weekday($column)";
226
            $colorder .="weekday($column)";
227
        } elsif ($column eq "Month") {
227
        } elsif ($column eq "Month") {
228
            #Display by Month
228
            #Display by Month
229
            $column = "old_issues.timestamp";
229
            $column = "old_issues.issuedate";
230
            $colfield .="monthname($column)";  
230
            $colfield .="monthname($column)";  
231
            $colorder .="month($column)";  
231
            $colorder .="month($column)";  
232
        } elsif ($column eq "Year") {
232
        } elsif ($column eq "Year") {
233
            #Display by Year
233
            #Display by Year
234
            $column = "old_issues.timestamp";
234
            $column = "old_issues.issuedate";
235
            $colfield .="Year($column)";
235
            $colfield .="Year($column)";
236
            $colorder .= $column;
236
            $colorder .= $column;
237
        } else {
237
        } else {
Lines 246-252 sub calculate { Link Here
246
                     LEFT JOIN items ON old_issues.itemnumber=items.itemnumber 
246
                     LEFT JOIN items ON old_issues.itemnumber=items.itemnumber 
247
                     LEFT JOIN biblioitems  ON biblioitems.biblioitemnumber=items.biblioitemnumber 
247
                     LEFT JOIN biblioitems  ON biblioitems.biblioitemnumber=items.biblioitemnumber 
248
                     WHERE 1";
248
                     WHERE 1";
249
        if (($column=~/timestamp/) or ($column=~/returndate/)){
249
        if (($column=~/issuedate/) or ($column=~/returndate/)){
250
            if ($colfilter[1] and ($colfilter[0])){
250
            if ($colfilter[1] and ($colfilter[0])){
251
                $strsth2 .= " and $column between '$colfilter[0]' and '$colfilter[1]' " ;
251
                $strsth2 .= " and $column between '$colfilter[0]' and '$colfilter[1]' " ;
252
            } elsif ($colfilter[1]) {
252
            } elsif ($colfilter[1]) {
Lines 312-320 sub calculate { Link Here
312
                  WHERE 1";
312
                  WHERE 1";
313
313
314
    @$filters[0]=~ s/\*/%/g if (@$filters[0]);
314
    @$filters[0]=~ s/\*/%/g if (@$filters[0]);
315
    $strcalc .= " AND old_issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] );
315
    $strcalc .= " AND old_issues.issuedate > '" . @$filters[0] ."'" if ( @$filters[0] );
316
    @$filters[1]=~ s/\*/%/g if (@$filters[1]);
316
    @$filters[1]=~ s/\*/%/g if (@$filters[1]);
317
    $strcalc .= " AND old_issues.timestamp < '" . @$filters[1] ."'" if ( @$filters[1] );
317
    $strcalc .= " AND old_issues.issuedate < '" . @$filters[1] ."'" if ( @$filters[1] );
318
    @$filters[2]=~ s/\*/%/g if (@$filters[2]);
318
    @$filters[2]=~ s/\*/%/g if (@$filters[2]);
319
    $strcalc .= " AND old_issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] );
319
    $strcalc .= " AND old_issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] );
320
    @$filters[3]=~ s/\*/%/g if (@$filters[3]);
320
    @$filters[3]=~ s/\*/%/g if (@$filters[3]);
Lines 339-349 sub calculate { Link Here
339
    @$filters[9]=~ s/\*/%/g if (@$filters[9]);
339
    @$filters[9]=~ s/\*/%/g if (@$filters[9]);
340
    $strcalc .= " AND borrowers.categorycode like '" . @$filters[9] ."'" if ( @$filters[9] );
340
    $strcalc .= " AND borrowers.categorycode like '" . @$filters[9] ."'" if ( @$filters[9] );
341
    @$filters[10]=~ s/\*/%/g if (@$filters[10]);
341
    @$filters[10]=~ s/\*/%/g if (@$filters[10]);
342
    $strcalc .= " AND dayname(old_issues.timestamp) like '" . @$filters[10]."'" if (@$filters[10]);
342
    $strcalc .= " AND dayname(old_issues.issuedate) like '" . @$filters[10]."'" if (@$filters[10]);
343
    @$filters[11]=~ s/\*/%/g if (@$filters[11]);
343
    @$filters[11]=~ s/\*/%/g if (@$filters[11]);
344
    $strcalc .= " AND monthname(old_issues.timestamp) like '" . @$filters[11]."'" if (@$filters[11]);
344
    $strcalc .= " AND monthname(old_issues.issuedate) like '" . @$filters[11]."'" if (@$filters[11]);
345
    @$filters[12]=~ s/\*/%/g if (@$filters[12]);
345
    @$filters[12]=~ s/\*/%/g if (@$filters[12]);
346
    $strcalc .= " AND year(old_issues.timestamp) like '" . @$filters[12] ."'" if ( @$filters[12] );
346
    $strcalc .= " AND year(old_issues.issuedate) like '" . @$filters[12] ."'" if ( @$filters[12] );
347
    
347
    
348
    $strcalc .= " group by biblio.biblionumber";
348
    $strcalc .= " group by biblio.biblionumber";
349
    $strcalc .= ", $colfield" if ($column);
349
    $strcalc .= ", $colfield" if ($column);
350
- 

Return to bug 17801