Lines 39-54
my $borflagsfilter = $input->param('borflag') || '';
Link Here
|
39 |
my $branchfilter = $input->param('branch') || ''; |
39 |
my $branchfilter = $input->param('branch') || ''; |
40 |
my $homebranchfilter = $input->param('homebranch') || ''; |
40 |
my $homebranchfilter = $input->param('homebranch') || ''; |
41 |
my $holdingbranchfilter = $input->param('holdingbranch') || ''; |
41 |
my $holdingbranchfilter = $input->param('holdingbranch') || ''; |
|
|
42 |
my $dateduefrom = $input->param('dateduefrom'); |
43 |
my $datedueto = $input->param('datedueto'); |
42 |
my $op = $input->param('op') || ''; |
44 |
my $op = $input->param('op') || ''; |
43 |
|
45 |
|
44 |
my ($dateduefrom, $datedueto); |
46 |
if ( $dateduefrom ) { |
45 |
if ( $dateduefrom = $input->param('dateduefrom') ) { |
|
|
46 |
$dateduefrom = dt_from_string( $dateduefrom ); |
47 |
$dateduefrom = dt_from_string( $dateduefrom ); |
47 |
} |
48 |
} |
48 |
if ( $datedueto = $input->param('datedueto') ) { |
49 |
if ( $datedueto ) { |
49 |
$datedueto = dt_from_string( $datedueto )->set_hour(23)->set_minute(59); |
50 |
$datedueto = dt_from_string( $datedueto )->set_hour(23)->set_minute(59); |
50 |
} |
51 |
} |
51 |
|
52 |
|
|
|
53 |
my $filters = { |
54 |
itemtype => $itemtypefilter, |
55 |
borname => $bornamefilter, |
56 |
borcat => $borcatfilter, |
57 |
itemtype => $itemtypefilter, |
58 |
borflag => $borflagsfilter, |
59 |
branch => $branchfilter, |
60 |
homebranch => $homebranchfilter, |
61 |
holdingbranch => $holdingbranchfilter, |
62 |
dateduefrom => $dateduefrom, |
63 |
datedueto => $datedueto, |
64 |
}; |
65 |
|
52 |
my $isfiltered = $op =~ /apply/i && $op =~ /filter/i; |
66 |
my $isfiltered = $op =~ /apply/i && $op =~ /filter/i; |
53 |
my $noreport = C4::Context->preference('FilterBeforeOverdueReport') && ! $isfiltered && $op ne "csv"; |
67 |
my $noreport = C4::Context->preference('FilterBeforeOverdueReport') && ! $isfiltered && $op ne "csv"; |
54 |
|
68 |
|
Lines 179-196
if (@patron_attr_filter_loop) {
Link Here
|
179 |
} |
193 |
} |
180 |
|
194 |
|
181 |
|
195 |
|
|
|
196 |
use Data::Printer colored => 1; warn p $filters; |
182 |
$template->param( |
197 |
$template->param( |
183 |
patron_attr_header_loop => [ map { { header => $_->{description} } } grep { ! $_->{isclone} } @patron_attr_filter_loop ], |
198 |
patron_attr_header_loop => [ map { { header => $_->{description} } } grep { ! $_->{isclone} } @patron_attr_filter_loop ], |
184 |
branchfilter => $branchfilter, |
199 |
filters => $filters, |
185 |
homebranchfilter => $homebranchfilter, |
|
|
186 |
holdingbranchfilter => $holdingbranchfilter, |
187 |
borcatloop=> \@borcatloop, |
200 |
borcatloop=> \@borcatloop, |
188 |
itemtypeloop => \@itemtypeloop, |
201 |
itemtypeloop => \@itemtypeloop, |
189 |
patron_attr_filter_loop => \@patron_attr_filter_loop, |
202 |
patron_attr_filter_loop => \@patron_attr_filter_loop, |
190 |
borname => $bornamefilter, |
|
|
191 |
showall => $showall, |
203 |
showall => $showall, |
192 |
dateduefrom => $dateduefrom, |
|
|
193 |
datedueto => $datedueto, |
194 |
); |
204 |
); |
195 |
|
205 |
|
196 |
if ($noreport) { |
206 |
if ($noreport) { |
Lines 346-355
if ($noreport) {
Link Here
|
346 |
# generate parameter list for CSV download link |
356 |
# generate parameter list for CSV download link |
347 |
my $new_cgi = CGI->new($input); |
357 |
my $new_cgi = CGI->new($input); |
348 |
$new_cgi->delete('op'); |
358 |
$new_cgi->delete('op'); |
349 |
my $csv_param_string = $new_cgi->query_string(); |
|
|
350 |
|
359 |
|
351 |
$template->param( |
360 |
$template->param( |
352 |
csv_param_string => $csv_param_string, |
|
|
353 |
todaysdate => output_pref($today_dt), |
361 |
todaysdate => output_pref($today_dt), |
354 |
overdueloop => \@overduedata, |
362 |
overdueloop => \@overduedata, |
355 |
nnoverdue => scalar(@overduedata), |
363 |
nnoverdue => scalar(@overduedata), |