This should make saved reports more manageable. Group/Subgroup hierarchy is stored in authorised_values, categories REPORT_GROUP and REPORT_SUBGROUP, connected by REPORT_SUBGROUP.lib_opac -> REPORT_GROUP.authorised_value Database changes: * authorised_values: expanded category to 16 chars * created default set of REPORT_GROUP authorised values to match hardcoded report areas * reports_dictionary: replaced area int with report_area text, converted values * saved_sql: added report_area, report_group and report_subgroup; report_area is not currently used, saved for the record C4/Reports/Guided.pm: * Replaced Area numeric values with the mnemonic codes * get_report_areas(): returns hardcoded areas list * created get_report_areas(): returns full hierarchy (groups with belonging subgroups) * save_report(): changed iterface, accepts fields hashref as input * update_sql(): changed iterface, accepts id and fields hashref as input * get_saved_reports():] - join to authorised_values to pick group and subgroup name - accept group and subgroup filter params * get_saved_report(): - changed iterface, return record hashref - join to authorised_values to pick group and subgroup name * build_authorised_value_list(): new sub, moved code from reports/guided_reports.pl * Updated interfaces in: cronjobs/runreport.pl, svc/report, opac/svc/report: get_saved_report() reports/dictionary.pl: get_report_areas() reports/guided_reports.pl reports/guided_reports_start.tt: * Reports list: - added group/subgroup filter - display area/group/subgroup for the reports * Create report wizard: - carry area to the end - select group and subgroup when saving the report; group defaults to area, useful when report groups match areas * Update report and Create from SQL: added group/subgroup * Amended reports/guided_reports.pl accordingly Conflicts: C4/Reports/Guided.pm admin/authorised_values.pl installer/data/mysql/kohastructure.sql installer/data/mysql/updatedatabase.pl koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl misc/cronjobs/runreport.pl reports/dictionary.pl reports/guided_reports.pl Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
238 lines
9.9 KiB
Perl
Executable file
238 lines
9.9 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# 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 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.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI;
|
|
use C4::Auth;
|
|
use C4::Context;
|
|
use C4::Koha;
|
|
use C4::Output;
|
|
|
|
|
|
sub AuthorizedValuesForCategory {
|
|
my ($searchstring) = shift or return;
|
|
my $dbh = C4::Context->dbh;
|
|
$searchstring=~ s/\'/\\\'/g;
|
|
my @data=split(' ',$searchstring);
|
|
my $sth=$dbh->prepare('
|
|
SELECT id, category, authorised_value, lib, lib_opac, imageurl
|
|
FROM authorised_values
|
|
WHERE (category = ?)
|
|
ORDER BY category, authorised_value
|
|
');
|
|
$sth->execute("$data[0]");
|
|
return $sth->fetchall_arrayref({});
|
|
}
|
|
|
|
my $input = new CGI;
|
|
my $id = $input->param('id');
|
|
my $op = $input->param('op') || '';
|
|
our $offset = $input->param('offset') || 0;
|
|
our $searchfield = $input->param('searchfield');
|
|
$searchfield = '' unless defined $searchfield;
|
|
$searchfield =~ s/\,//g;
|
|
our $script_name = "/cgi-bin/koha/admin/authorised_values.pl";
|
|
our $dbh = C4::Context->dbh;
|
|
|
|
our ($template, $borrowernumber, $cookie)= get_template_and_user({
|
|
template_name => "admin/authorised_values.tmpl",
|
|
authnotrequired => 0,
|
|
flagsrequired => {parameters => 'parameters_remaining_permissions'},
|
|
query => $input,
|
|
type => "intranet",
|
|
debug => 1,
|
|
});
|
|
|
|
$template->param( script_name => $script_name,
|
|
($op||'else') => 1 );
|
|
################## ADD_FORM ##################################
|
|
# called by default. Used to create form to add or modify a record
|
|
if ($op eq 'add_form') {
|
|
my $data;
|
|
if ($id) {
|
|
my $sth=$dbh->prepare("select id, category, authorised_value, lib, lib_opac, imageurl from authorised_values where id=?");
|
|
$sth->execute($id);
|
|
$data=$sth->fetchrow_hashref;
|
|
} else {
|
|
$data->{'category'} = $input->param('category');
|
|
}
|
|
if ($id) {
|
|
$template->param(action_modify => 1);
|
|
$template->param('heading_modify_authorized_value_p' => 1);
|
|
} elsif ( ! $data->{'category'} ) {
|
|
$template->param(action_add_category => 1);
|
|
$template->param('heading_add_new_category_p' => 1);
|
|
} else {
|
|
$template->param(action_add_value => 1);
|
|
$template->param('heading_add_authorized_value_p' => 1);
|
|
}
|
|
$template->param('use_heading_flags_p' => 1);
|
|
$template->param( category => $data->{'category'},
|
|
authorised_value => $data->{'authorised_value'},
|
|
lib => $data->{'lib'},
|
|
lib_opac => $data->{'lib_opac'},
|
|
id => $data->{'id'},
|
|
imagesets => C4::Koha::getImageSets( checked => $data->{'imageurl'} ),
|
|
offset => $offset,
|
|
);
|
|
|
|
################## ADD_VALIDATE ##################################
|
|
# called by add_form, used to insert/modify data in DB
|
|
} elsif ($op eq 'add_validate') {
|
|
my $new_authorised_value = $input->param('authorised_value');
|
|
my $new_category = $input->param('category');
|
|
my $imageurl = $input->param( 'imageurl' ) || '';
|
|
$imageurl = '' if $imageurl =~ /removeImage/;
|
|
my $duplicate_entry = 0;
|
|
|
|
if ( $id ) { # Update
|
|
my $sth = $dbh->prepare( "SELECT category, authorised_value FROM authorised_values WHERE id = ? ");
|
|
$sth->execute($id);
|
|
my ($category, $authorised_value) = $sth->fetchrow_array();
|
|
if ( $authorised_value ne $new_authorised_value ) {
|
|
my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " .
|
|
"WHERE category = ? AND authorised_value = ? and id <> ? ");
|
|
$sth->execute($new_category, $new_authorised_value, $id);
|
|
($duplicate_entry) = $sth->fetchrow_array();
|
|
}
|
|
unless ( $duplicate_entry ) {
|
|
my $sth=$dbh->prepare( 'UPDATE authorised_values
|
|
SET category = ?,
|
|
authorised_value = ?,
|
|
lib = ?,
|
|
lib_opac = ?,
|
|
imageurl = ?
|
|
WHERE id=?' );
|
|
my $lib = $input->param('lib');
|
|
my $lib_opac = $input->param('lib_opac');
|
|
undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
|
|
undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string
|
|
$sth->execute($new_category, $new_authorised_value, $lib, $lib_opac, $imageurl, $id);
|
|
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."&offset=$offset\"></html>";
|
|
exit;
|
|
}
|
|
}
|
|
else { # Insert
|
|
my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " .
|
|
"WHERE category = ? AND authorised_value = ? ");
|
|
$sth->execute($new_category, $new_authorised_value);
|
|
($duplicate_entry) = $sth->fetchrow_array();
|
|
unless ( $duplicate_entry ) {
|
|
my $sth=$dbh->prepare( 'INSERT INTO authorised_values
|
|
( id, category, authorised_value, lib, lib_opac, imageurl )
|
|
values (?, ?, ?, ?, ?, ?)' );
|
|
my $lib = $input->param('lib');
|
|
my $lib_opac = $input->param('lib_opac');
|
|
undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
|
|
undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string
|
|
$sth->execute($id, $new_category, $new_authorised_value, $lib, $lib_opac, $imageurl );
|
|
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."&offset=$offset\"></html>";
|
|
exit;
|
|
}
|
|
}
|
|
if ( $duplicate_entry ) {
|
|
$template->param(duplicate_category => $new_category,
|
|
duplicate_value => $new_authorised_value,
|
|
else => 1);
|
|
default_form();
|
|
}
|
|
|
|
################## DELETE_CONFIRM ##################################
|
|
# called by default form, used to confirm deletion of data in DB
|
|
} elsif ($op eq 'delete_confirm') {
|
|
my $sth=$dbh->prepare("select category,authorised_value,lib,lib_opac from authorised_values where id=?");
|
|
$sth->execute($id);
|
|
my $data=$sth->fetchrow_hashref;
|
|
$id = $input->param('id') unless $id;
|
|
$template->param(searchfield => $searchfield,
|
|
Tlib => $data->{'lib'},
|
|
Tlib_opac => $data->{'lib_opac'},
|
|
Tvalue => $data->{'authorised_value'},
|
|
id =>$id,
|
|
);
|
|
|
|
# END $OP eq DELETE_CONFIRM
|
|
################## DELETE_CONFIRMED ##################################
|
|
# called by delete_confirm, used to effectively confirm deletion of data in DB
|
|
} elsif ($op eq 'delete_confirmed') {
|
|
my $id = $input->param('id');
|
|
my $sth=$dbh->prepare("delete from authorised_values where id=?");
|
|
$sth->execute($id);
|
|
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=$searchfield&offset=$offset\"></html>";
|
|
exit;
|
|
# END $OP eq DELETE_CONFIRMED
|
|
################## DEFAULT ##################################
|
|
} else { # DEFAULT
|
|
default_form();
|
|
} #---- END $OP eq DEFAULT
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|
|
exit 0;
|
|
|
|
sub default_form {
|
|
# build categories list
|
|
my $sth = $dbh->prepare("select distinct category from authorised_values");
|
|
$sth->execute;
|
|
my @category_list;
|
|
my %categories; # a hash, to check that some hardcoded categories exist.
|
|
while ( my ($category) = $sth->fetchrow_array ) {
|
|
push( @category_list, $category );
|
|
$categories{$category} = 1;
|
|
}
|
|
|
|
# push koha system categories
|
|
foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP)) {
|
|
push @category_list, $_ unless $categories{$_};
|
|
}
|
|
|
|
#reorder the list
|
|
@category_list = sort {$a cmp $b} @category_list;
|
|
my $tab_list = CGI::scrolling_list(-name=>'searchfield',
|
|
-id=>'searchfield',
|
|
-values=> \@category_list,
|
|
-default=>"",
|
|
-size=>1,
|
|
-multiple=>0,
|
|
);
|
|
if (!$searchfield) {
|
|
$searchfield=$category_list[0];
|
|
}
|
|
my ($results) = AuthorizedValuesForCategory($searchfield);
|
|
my $count = scalar(@$results);
|
|
my @loop_data = ();
|
|
# builds value list
|
|
for (my $i=0; $i < $count; $i++){
|
|
my %row_data; # get a fresh hash for the row data
|
|
$row_data{category} = $results->[$i]{'category'};
|
|
$row_data{authorised_value} = $results->[$i]{'authorised_value'};
|
|
$row_data{lib} = $results->[$i]{'lib'};
|
|
$row_data{lib_opac} = $results->[$i]{'lib_opac'};
|
|
$row_data{imageurl} = getitemtypeimagelocation( 'intranet', $results->[$i]{'imageurl'} );
|
|
$row_data{edit} = "$script_name?op=add_form&id=".$results->[$i]{'id'}."&offset=$offset";
|
|
$row_data{delete} = "$script_name?op=delete_confirm&searchfield=$searchfield&id=".$results->[$i]{'id'}."&offset=$offset";
|
|
push(@loop_data, \%row_data);
|
|
}
|
|
|
|
$template->param( loop => \@loop_data,
|
|
tab_list => $tab_list,
|
|
category => $searchfield );
|
|
}
|
|
|