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

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

Return to bug 17801