Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

borr_issues_top : adapting to old_issues changes 

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
3.0.x
Henri-Damien LAURENT 16 years ago
committed by Joshua Ferraro
parent
ad767716dc
commit
1bd019a86c
1 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      reports/bor_issues_top.pl

34
reports/bor_issues_top.pl
View File

@ -229,7 +229,7 @@ sub calculate {
my $colfield;
my $colorder;
if ($column){
$column = "issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/));
$column = "old_issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/));
$column = "biblioitems.".$column if $column=~/itemtype/;
$column = "borrowers.".$column if $column=~/categorycode/;
my @colfilter ;
@ -249,17 +249,17 @@ sub calculate {
# loop cols.
if ($column eq "Day") {
#Display by day
$column = "issues.timestamp";
$column = "old_issues.timestamp";
$colfield .="dayname($column)";
$colorder .="weekday($column)";
} elsif ($column eq "Month") {
#Display by Month
$column = "issues.timestamp";
$column = "old_issues.timestamp";
$colfield .="monthname($column)";
$colorder .="month($column)";
} elsif ($column eq "Year") {
#Display by Year
$column = "issues.timestamp";
$column = "old_issues.timestamp";
$colfield .="Year($column)";
$colorder .= $column;
} else {
@ -269,9 +269,9 @@ sub calculate {
my $strsth2;
$strsth2 .= "SELECT DISTINCTROW $colfield
FROM `issues`
LEFT JOIN borrowers ON issues.borrowernumber=borrowers.borrowernumber
LEFT JOIN items ON issues.itemnumber=items.itemnumber
FROM `old_issues`
LEFT JOIN borrowers ON old_issues.borrowernumber=borrowers.borrowernumber
LEFT JOIN items ON old_issues.itemnumber=items.itemnumber
LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber)
WHERE returndate is not null";
if (($column=~/timestamp/) or ($column=~/returndate/)){
@ -323,32 +323,32 @@ sub calculate {
# Processing average loanperiods
$strcalc .= "SELECT CONCAT(borrowers.surname , \"\\t\",borrowers.firstname), COUNT(*) AS RANK, borrowers.borrowernumber AS ID";
$strcalc .= " , $colfield " if ($colfield);
$strcalc .= " FROM `issues`
$strcalc .= " FROM `old_issues`
LEFT JOIN borrowers ON borrowers.borrowernumber
LEFT JOIN items ON items.itemnumber=issues.itemnumber
LEFT JOIN items ON items.itemnumber=old_issues.itemnumber
LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber)
WHERE returndate is not null";
@$filters[0]=~ s/\*/%/g if (@$filters[0]);
$strcalc .= " AND issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] );
$strcalc .= " AND old_issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] );
@$filters[1]=~ s/\*/%/g if (@$filters[1]);
$strcalc .= " AND issues.timestamp < '" . @$filters[1] ."'" if ( @$filters[1] );
$strcalc .= " AND old_issues.timestamp < '" . @$filters[1] ."'" if ( @$filters[1] );
@$filters[2]=~ s/\*/%/g if (@$filters[2]);
$strcalc .= " AND issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] );
$strcalc .= " AND old_issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] );
@$filters[3]=~ s/\*/%/g if (@$filters[3]);
$strcalc .= " AND issues.returndate < '" . @$filters[3] ."'" if ( @$filters[3] );
$strcalc .= " AND old_issues.returndate < '" . @$filters[3] ."'" if ( @$filters[3] );
@$filters[4]=~ s/\*/%/g if (@$filters[4]);
$strcalc .= " AND issues.branchcode like '" . @$filters[4] ."'" if ( @$filters[4] );
$strcalc .= " AND old_issues.branchcode like '" . @$filters[4] ."'" if ( @$filters[4] );
@$filters[5]=~ s/\*/%/g if (@$filters[5]);
$strcalc .= " AND biblioitems.itemtype like '" . @$filters[5] ."'" if ( @$filters[5] );
@$filters[6]=~ s/\*/%/g if (@$filters[6]);
$strcalc .= " AND borrowers.categorycode like '" . @$filters[6] ."'" if ( @$filters[6] );
@$filters[7]=~ s/\*/%/g if (@$filters[7]);
$strcalc .= " AND dayname(issues.timestamp) like '" . @$filters[7]."'" if (@$filters[7]);
$strcalc .= " AND dayname(old_issues.timestamp) like '" . @$filters[7]."'" if (@$filters[7]);
@$filters[8]=~ s/\*/%/g if (@$filters[8]);
$strcalc .= " AND monthname(issues.timestamp) like '" . @$filters[8]."'" if (@$filters[8]);
$strcalc .= " AND monthname(old_issues.timestamp) like '" . @$filters[8]."'" if (@$filters[8]);
@$filters[9]=~ s/\*/%/g if (@$filters[9]);
$strcalc .= " AND year(issues.timestamp) like '" . @$filters[9] ."'" if ( @$filters[9] );
$strcalc .= " AND year(old_issues.timestamp) like '" . @$filters[9] ."'" if ( @$filters[9] );
$strcalc .= " group by borrowers.borrowernumber";
$strcalc .= ", $colfield" if ($column);

Write Preview
Loading…
Cancel
Save