#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use CGI::Carp qw(fatalsToBrowser warningsToBrowser);
-use strict;
-use warnings;
+use Modern::Perl;
use C4::Auth;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Output;
use C4::Reports::Guided;
-use C4::Dates;
+use Koha::DateUtils;
=head1 NAME
elsif ( $phase eq 'New Term step 4' ) {
# Choosing the values
- my @columns = $input->param('columns');
+ my @columns = $input->multi_param('columns');
my $columnstring = join( ',', @columns );
my @column_loop;
foreach my $column (@columns) {
elsif ( $phase eq 'New Term step 5' ) {
# Confirmation screen
my $columnstring = $input->param('columnstring');
- my @criteria = $input->param('criteria_column');
+ my @criteria = $input->multi_param('criteria_column');
my $query_criteria;
my @criteria_loop;
$tmp_hash{'name'} = $crit;
$tmp_hash{'value'} = $value;
push @criteria_loop, \%tmp_hash;
- if ( $value =~ C4::Dates->regexp( C4::Context->preference('dateformat') ) ) {
- my $date = C4::Dates->new($value);
- $value = $date->output("iso");
- }
+ my $value_dt = eval { dt_from_string( $value ) };
+ $value = output_pref( { dt => $value_dt, dateonly => 1, dateformat => 'iso' } )
+ if ( $value_dt );
+
$query_criteria .= " AND $crit='$value'";
}
- $value = $input->param( $crit . "_start_value" );
- if ($value) {
- my %tmp_hash;
- $tmp_hash{'name'} = "$crit Start";
- $tmp_hash{'value'} = $value;
- push @criteria_loop, \%tmp_hash;
- if ( $value =~ C4::Dates->regexp( C4::Context->preference('dateformat') ) ) {
- my $date = C4::Dates->new($value);
- $value = $date->output("iso");
- }
- $query_criteria .= " AND $crit >= '$value'";
- }
- $value = $input->param( $crit . "_end_value" );
- if ($value) {
- my %tmp_hash;
- $tmp_hash{'name'} = "$crit End";
- $tmp_hash{'value'} = $value;
- push @criteria_loop, \%tmp_hash;
- if ( $value =~ C4::Dates->regexp( C4::Context->preference('dateformat') ) ) {
- my $date = C4::Dates->new($value);
- $value = $date->output("iso");
+
+ if ( my $date_type_value = $input->param( $crit . "_date_type_value" ) ) {
+ if ( $date_type_value eq 'range' ) {
+ if ( $value = $input->param( $crit . "_start_value" ) ) {
+ my %tmp_hash;
+ $tmp_hash{'name'} = "$crit Start";
+ $tmp_hash{'value'} = $value;
+ push @criteria_loop, \%tmp_hash;
+ my $value_dt = eval { dt_from_string( $value ) };
+ $value = output_pref( { dt => $value_dt, dateonly => 1, dateformat => 'iso' } )
+ if ( $value_dt );
+
+ $query_criteria .= " AND $crit >= '$value'";
+ }
+
+ if ( $value = $input->param( $crit . "_end_value" ) ) {
+ my %tmp_hash;
+ $tmp_hash{'name'} = "$crit End";
+ $tmp_hash{'value'} = $value;
+ push @criteria_loop, \%tmp_hash;
+ my $value_dt = eval { dt_from_string( $value ) };
+ $value = output_pref( { dt => $value_dt, dateonly => 1, dateformat => 'iso' } )
+ if ( $value_dt );
+
+ $query_criteria .= " AND $crit <= '$value'";
+ }
}
- $query_criteria .= " AND $crit <= '$value'";
+ # else we want all dates
}
}
$template->param(