Lines 36-41
my $order = $input->param('order') || '';
Link Here
|
36 |
my $startdate = $input->param('from'); |
36 |
my $startdate = $input->param('from'); |
37 |
my $enddate = $input->param('to'); |
37 |
my $enddate = $input->param('to'); |
38 |
my $ratio = $input->param('ratio'); |
38 |
my $ratio = $input->param('ratio'); |
|
|
39 |
my $include_on_order_items = $input->param('include_on_order_items'); |
40 |
my $include_will_be_available = $input->param('include_will_be_available'); |
39 |
|
41 |
|
40 |
my ( $template, $loggedinuser, $cookie ) = get_template_and_user( |
42 |
my ( $template, $loggedinuser, $cookie ) = get_template_and_user( |
41 |
{ |
43 |
{ |
Lines 101-106
if ($order eq "biblio") {
Link Here
|
101 |
} else { |
103 |
} else { |
102 |
$sqlorderby = " ORDER BY reservecount DESC "; |
104 |
$sqlorderby = " ORDER BY reservecount DESC "; |
103 |
} |
105 |
} |
|
|
106 |
|
107 |
my $on_order_sql = ( $include_on_order_items ) ? "+ aqorders.quantity" : ""; |
108 |
my $not_for_loan_comparison = ( $include_will_be_available ) ? "<=" : "="; |
109 |
|
104 |
my $strsth = |
110 |
my $strsth = |
105 |
"SELECT reservedate, |
111 |
"SELECT reservedate, |
106 |
reserves.borrowernumber as borrowernumber, |
112 |
reserves.borrowernumber as borrowernumber, |
Lines 117-133
my $strsth =
Link Here
|
117 |
ORDER BY items.itemnumber SEPARATOR '<br/>') as l_location, |
123 |
ORDER BY items.itemnumber SEPARATOR '<br/>') as l_location, |
118 |
GROUP_CONCAT(DISTINCT items.itype |
124 |
GROUP_CONCAT(DISTINCT items.itype |
119 |
ORDER BY items.itemnumber SEPARATOR '<br/>') as l_itype, |
125 |
ORDER BY items.itemnumber SEPARATOR '<br/>') as l_itype, |
120 |
notes, |
126 |
biblio.notes, |
121 |
reserves.found, |
127 |
reserves.found, |
122 |
biblio.title, |
128 |
biblio.title, |
123 |
biblio.author, |
129 |
biblio.author, |
124 |
count(DISTINCT reserves.borrowernumber) as reservecount, |
130 |
count(DISTINCT reserves.borrowernumber) as reservecount, |
125 |
count(DISTINCT items.itemnumber) as itemcount |
131 |
count(DISTINCT items.itemnumber) $on_order_sql as itemcount |
126 |
FROM reserves |
132 |
FROM reserves |
127 |
LEFT JOIN items ON items.biblionumber=reserves.biblionumber |
133 |
LEFT JOIN items ON items.biblionumber=reserves.biblionumber |
128 |
LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber |
134 |
LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber |
|
|
135 |
LEFT JOIN aqorders ON reserves.biblionumber=aqorders.biblionumber |
129 |
WHERE |
136 |
WHERE |
130 |
notforloan = 0 AND damaged = 0 AND itemlost = 0 AND wthdrawn = 0 |
137 |
notforloan $not_for_loan_comparison 0 AND damaged = 0 AND itemlost = 0 AND wthdrawn = 0 |
131 |
$sqldatewhere |
138 |
$sqldatewhere |
132 |
"; |
139 |
"; |
133 |
|
140 |
|
Lines 157-163
while ( my $data = $sth->fetchrow_hashref ) {
Link Here
|
157 |
priority => $data->{priority}, |
164 |
priority => $data->{priority}, |
158 |
name => $data->{borrower}, |
165 |
name => $data->{borrower}, |
159 |
title => $data->{title}, |
166 |
title => $data->{title}, |
160 |
subtitle => $data->{subtitle}, |
167 |
subtitle => $data->{subtitle}, |
161 |
author => $data->{author}, |
168 |
author => $data->{author}, |
162 |
notes => $data->{notes}, |
169 |
notes => $data->{notes}, |
163 |
itemnum => $data->{itemnumber}, |
170 |
itemnum => $data->{itemnumber}, |
Lines 185-191
$template->param(
Link Here
|
185 |
to => $enddate, |
192 |
to => $enddate, |
186 |
ratio => $ratio, |
193 |
ratio => $ratio, |
187 |
reserveloop => \@reservedata, |
194 |
reserveloop => \@reservedata, |
188 |
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), |
195 |
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), |
|
|
196 |
include_on_order_items => $include_on_order_items, |
197 |
include_will_be_available => $include_will_be_available, |
189 |
); |
198 |
); |
190 |
|
199 |
|
191 |
output_html_with_http_headers $input, $cookie, $template->output; |
200 |
output_html_with_http_headers $input, $cookie, $template->output; |