# Suite 330, Boston, MA 02111-1307 USA
use CGI::Carp qw(fatalsToBrowser warningsToBrowser);
use strict;
+use warnings;
use C4::Auth;
use CGI;
use C4::Output;
-use C4::Reports;
+use C4::Reports::Guided;
+use C4::Dates;
=head1 NAME
my $input = new CGI;
my $referer = $input->referer();
-my $phase = $input->param('phase');
+my $phase = $input->param('phase') || 'View Dictionary';
+my $area = $input->param('areas') || '';
my $no_html = 0; # this will be set if we dont want to print out an html::template
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { editcatalogue => 1 },
+ flagsrequired => { reports => '*' },
debug => 1,
}
);
if ($phase eq 'View Dictionary'){
# view the dictionary we use to set up abstract variables such as all borrowers over fifty who live in a certain town
- my $areas = C4::Reports::get_report_areas();
- my $definitions = get_from_dictionary();
+ my $areas = get_report_areas();
+ foreach (@{ $areas }) {
+ $_->{selected} = 1 if $_->{id} eq $area; # mark active area
+ }
+ my $definitions = get_from_dictionary($area);
$template->param( 'areas' => $areas ,
'start_dictionary' => 1,
'definitions' => $definitions,
elsif ($phase eq 'New Term step 2'){
# Choosing the area
- my $areas = C4::Reports::get_report_areas();
+ my $areas = C4::Reports::Guided::get_report_areas();
my $definition_name=$input->param('definition_name');
my $definition_description=$input->param('definition_description');
$template->param( 'step_2' => 1,
'definition_description' => $definition_description,
'columns' => \@column_loop,
'columnstring' => $columnstring,
-
+ 'DHTMLcalendar_dateformat' => C4::Dates->DHTMLcalendar(),
);
}
elsif ($phase eq 'New Term step 5'){
# Confirmation screen
- my $areas = C4::Reports::get_report_areas();
+ my $areas = C4::Reports::Guided::get_report_areas();
my $area = $input->param('area');
my $areaname = $areas->[$area - 1]->{'name'};
my $columnstring = $input->param('columnstring');
foreach my $crit (@criteria) {
my $value = $input->param( $crit . "_value" );
if ($value) {
- $query_criteria .= " AND $crit='$value'";
- my %tmp_hash;
- $tmp_hash{'name'}=$crit;
- $tmp_hash{'value'} = $value;
- push @criteria_loop,\%tmp_hash;
+ my %tmp_hash;
+ $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");
+ }
+ $query_criteria .= " AND $crit='$value'";
}
-
$value = $input->param( $crit . "_start_value" );
if ($value) {
- $query_criteria .= " AND $crit > '$value'";
- my %tmp_hash;
- $tmp_hash{'name'}="$crit Start";
- $tmp_hash{'value'} = $value;
- push @criteria_loop,\%tmp_hash;
+ 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) {
- $query_criteria .= " AND $crit <= '$value'";
- my %tmp_hash;
- $tmp_hash{'name'}="$crit End";
- $tmp_hash{'value'} = $value;
- push @criteria_loop,\%tmp_hash;
+ 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");
+ }
+ $query_criteria .= " AND $crit <= '$value'";
}
}
$template->param( 'step_5' => 1,
$no_html=1;
my $id = $input->param('id');
delete_definition($id);
- print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=View%20Dictionary");
+ print $input->redirect("/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary");
}
$template->param( 'referer' => $referer );