Koha/reports/dictionary.pl
Jonathan Druart bb6658c2e6 Bug 2669: Change checkboxes to radio buttons on dictionary
On creating new dictionary for report, the choice between "All dates"
and "Date range" should be a real radio button, not 2 radio buttons with
different names (which means they could be selected altogether...)

Note that I don't understand what means 'All dates', there is no
condition generated for the dictionary. We should not have to select a
field if we don't want to add a condition on it :)

Test plan:
Create a new dictionary for the Patron module, then a date field
(dateenrolled or birthdate, etc.)

Confirm that the radio buttons now behave as radio buttons...

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

Looks so much nicer too!

Radio buttons display as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-01-27 02:42:46 +00:00

227 lines
7.2 KiB
Perl
Executable file

#!/usr/bin/perl
# Copyright 2007 Liblime ltd
#
# 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 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.
#
# 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 C4::Auth;
use CGI qw ( -utf8 );
use C4::Output;
use C4::Reports::Guided;
use Koha::DateUtils;
=head1 NAME
Script to control the guided report creation
=head1 DESCRIPTION
=cut
my $input = new CGI;
my $referer = $input->referer();
my $phase = $input->param('phase') || 'View Dictionary';
my $definition_name = $input->param('definition_name');
my $definition_description = $input->param('definition_description');
my $area = $input->param('area') || '';
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(
{ template_name => "reports/dictionary.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
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 $definitions = get_from_dictionary($area);
$template->param(
'areas' => areas( $area ),
'start_dictionary' => 1,
'definitions' => $definitions,
);
} elsif ( $phase eq 'Add New Definition' ) {
# display form allowing them to add a new definition
$template->param( 'new_dictionary' => 1, );
}
elsif ( $phase eq 'New Term step 2' ) {
# Choosing the area
$template->param(
'step_2' => 1,
'areas' => areas( $area ),
'definition_name' => $definition_name,
'definition_description' => $definition_description,
);
}
elsif ( $phase eq 'New Term step 3' ) {
# Choosing the columns
my $columns = get_columns( $area, $input );
$template->param(
'step_3' => 1,
'area' => $area,
'columns' => $columns,
'definition_name' => $definition_name,
'definition_description' => $definition_description,
);
}
elsif ( $phase eq 'New Term step 4' ) {
# Choosing the values
my @columns = $input->param('columns');
my $columnstring = join( ',', @columns );
my @column_loop;
foreach my $column (@columns) {
my %tmp_hash;
$tmp_hash{'name'} = $column;
my $type = get_column_type($column);
if ( $type eq 'distinct' ) {
my $values = get_distinct_values($column);
$tmp_hash{'values'} = $values;
$tmp_hash{'distinct'} = 1;
}
if ( $type eq 'DATE' || $type eq 'DATETIME' ) {
$tmp_hash{'date'} = 1;
}
if ($type eq 'TEXT' || $type eq 'MEDIUMTEXT'){
$tmp_hash{'text'} = 1;
}
# else {
# warn $type;#
# }
push @column_loop, \%tmp_hash;
}
$template->param( 'step_4' => 1,
'area' => $area,
'definition_name' => $definition_name,
'definition_description' => $definition_description,
'columns' => \@column_loop,
'columnstring' => $columnstring,
);
}
elsif ( $phase eq 'New Term step 5' ) {
# Confirmation screen
my $columnstring = $input->param('columnstring');
my @criteria = $input->param('criteria_column');
my $query_criteria;
my @criteria_loop;
foreach my $crit (@criteria) {
my $value = $input->param( $crit . "_value" );
if ($value) {
my %tmp_hash;
$tmp_hash{'name'} = $crit;
$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 ( 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'";
}
}
# else we want all dates
}
}
$template->param(
'step_5' => 1,
'area' => $area,
'definition_name' => $definition_name,
'definition_description' => $definition_description,
'query' => $query_criteria,
'columnstring' => $columnstring,
'criteria_loop' => \@criteria_loop,
);
}
elsif ( $phase eq 'New Term step 6' ) {
# Saving
my $area = $input->param('area');
my $sql = $input->param('sql');
save_dictionary( $definition_name, $definition_description, $sql, $area );
$no_html = 1;
print $input->redirect("/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary");
} elsif ( $phase eq 'Delete Definition' ) {
$no_html = 1;
my $id = $input->param('id');
delete_definition($id);
print $input->redirect("/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary");
}
$template->param( 'referer' => $referer );
if (!$no_html){
output_html_with_http_headers $input, $cookie, $template->output;
}
sub areas {
my $selected = shift;
my $areas = get_report_areas();
my @a;
foreach my $area ( @$areas ) {
push @a, {
id => $area,
selected => ( $area eq $selected )
};
}
return \@a;
}