Lines 42-47
use Koha::Notice::Templates;
Link Here
|
42 |
use Koha::TemplateUtils qw( process_tt ); |
42 |
use Koha::TemplateUtils qw( process_tt ); |
43 |
use C4::ClassSource qw( GetClassSources ); |
43 |
use C4::ClassSource qw( GetClassSources ); |
44 |
use C4::Scrubber; |
44 |
use C4::Scrubber; |
|
|
45 |
use Data::Dumper; |
45 |
|
46 |
|
46 |
=head1 NAME |
47 |
=head1 NAME |
47 |
|
48 |
|
Lines 57-62
my $input = CGI->new;
Link Here
|
57 |
my $usecache = Koha::Caches->get_instance->memcached_cache; |
58 |
my $usecache = Koha::Caches->get_instance->memcached_cache; |
58 |
|
59 |
|
59 |
my $op = $input->param('op') // ''; |
60 |
my $op = $input->param('op') // ''; |
|
|
61 |
print STDERR "DEBUG op: $op\n"; |
62 |
|
63 |
# my @branches = grep { $_ ne q{} } $input->multi_param('branches'); |
60 |
my $flagsrequired; |
64 |
my $flagsrequired; |
61 |
if ( ( $op eq 'add_form' ) |
65 |
if ( ( $op eq 'add_form' ) |
62 |
|| ( $op eq 'add_form_sql' ) |
66 |
|| ( $op eq 'add_form_sql' ) |
Lines 127-133
if ( !$op ) {
Link Here
|
127 |
'showsql' => 1, |
131 |
'showsql' => 1, |
128 |
'mana_success' => scalar $input->param('mana_success'), |
132 |
'mana_success' => scalar $input->param('mana_success'), |
129 |
'mana_id' => $report->{mana_id}, |
133 |
'mana_id' => $report->{mana_id}, |
130 |
'mana_comments' => $report->{comments} |
134 |
'mana_comments' => $report->{comments}, |
131 |
); |
135 |
); |
132 |
|
136 |
|
133 |
} elsif ( $op eq 'edit_form' ) { |
137 |
} elsif ( $op eq 'edit_form' ) { |
Lines 136-141
if ( !$op ) {
Link Here
|
136 |
my $group = $report->report_group; |
140 |
my $group = $report->report_group; |
137 |
my $subgroup = $report->report_subgroup; |
141 |
my $subgroup = $report->report_subgroup; |
138 |
my $tables = get_tables(); |
142 |
my $tables = get_tables(); |
|
|
143 |
|
139 |
$template->param( |
144 |
$template->param( |
140 |
'sql' => $report->savedsql, |
145 |
'sql' => $report->savedsql, |
141 |
'reportname' => $report->report_name, |
146 |
'reportname' => $report->report_name, |
Lines 148-158
if ( !$op ) {
Link Here
|
148 |
'editsql' => 1, |
153 |
'editsql' => 1, |
149 |
'mana_id' => $report->{mana_id}, |
154 |
'mana_id' => $report->{mana_id}, |
150 |
'mana_comments' => $report->{comments}, |
155 |
'mana_comments' => $report->{comments}, |
151 |
'tables' => $tables |
156 |
'tables' => $tables, |
|
|
157 |
'report' => $report, |
152 |
); |
158 |
); |
153 |
|
159 |
|
154 |
} elsif ( $op eq 'cud-update_sql' || $op eq 'cud-update_and_run_sql' ) { |
160 |
} elsif ( $op eq 'cud-update_sql' || $op eq 'cud-update_and_run_sql' ) { |
155 |
my $id = $input->param('id'); |
161 |
my $id = $input->param('id'); |
|
|
162 |
my $report = Koha::Reports->find($id); |
156 |
my $sql = $input->param('sql'); |
163 |
my $sql = $input->param('sql'); |
157 |
my $reportname = $input->param('reportname'); |
164 |
my $reportname = $input->param('reportname'); |
158 |
my $group = $input->param('group'); |
165 |
my $group = $input->param('group'); |
Lines 163-171
if ( !$op ) {
Link Here
|
163 |
my $public = $input->param('public'); |
170 |
my $public = $input->param('public'); |
164 |
my $save_anyway = $input->param('save_anyway'); |
171 |
my $save_anyway = $input->param('save_anyway'); |
165 |
my @errors; |
172 |
my @errors; |
166 |
my $tables = get_tables(); |
173 |
my $tables = get_tables(); |
|
|
174 |
my @branches = grep { $_ ne q{} } $input->multi_param('branches'); |
167 |
|
175 |
|
168 |
# if we have the units, then we came from creating a report from SQL and thus need to handle converting units |
|
|
169 |
if ($cache_expiry_units) { |
176 |
if ($cache_expiry_units) { |
170 |
if ( $cache_expiry_units eq "minutes" ) { |
177 |
if ( $cache_expiry_units eq "minutes" ) { |
171 |
$cache_expiry *= 60; |
178 |
$cache_expiry *= 60; |
Lines 211-216
if ( !$op ) {
Link Here
|
211 |
'problematic_authvals' => $problematic_authvals, |
218 |
'problematic_authvals' => $problematic_authvals, |
212 |
'warn_authval_problem' => 1, |
219 |
'warn_authval_problem' => 1, |
213 |
'phase_update' => 1, |
220 |
'phase_update' => 1, |
|
|
221 |
'branches' => @branches, |
222 |
'report' => $report, |
214 |
); |
223 |
); |
215 |
|
224 |
|
216 |
} else { |
225 |
} else { |
Lines 226-234
if ( !$op ) {
Link Here
|
226 |
notes => $notes, |
235 |
notes => $notes, |
227 |
public => $public, |
236 |
public => $public, |
228 |
cache_expiry => $cache_expiry, |
237 |
cache_expiry => $cache_expiry, |
|
|
238 |
|
239 |
# report => $report, |
229 |
} |
240 |
} |
230 |
); |
241 |
); |
231 |
|
242 |
|
|
|
243 |
$report->store; |
244 |
$report->replace_library_limits( \@branches ); |
245 |
|
232 |
my $editsql = 1; |
246 |
my $editsql = 1; |
233 |
if ( $op eq 'cud-update_and_run_sql' ) { |
247 |
if ( $op eq 'cud-update_and_run_sql' ) { |
234 |
$editsql = 0; |
248 |
$editsql = 0; |
Lines 245-251
if ( !$op ) {
Link Here
|
245 |
'cache_expiry' => $cache_expiry, |
259 |
'cache_expiry' => $cache_expiry, |
246 |
'public' => $public, |
260 |
'public' => $public, |
247 |
'usecache' => $usecache, |
261 |
'usecache' => $usecache, |
248 |
'tables' => $tables |
262 |
'tables' => $tables, |
|
|
263 |
|
264 |
# 'branches' => @branches, |
265 |
'report' => $report, |
249 |
); |
266 |
); |
250 |
logaction( "REPORTS", "MODIFY", $id, "$reportname | $sql" ) if C4::Context->preference("ReportsLog"); |
267 |
logaction( "REPORTS", "MODIFY", $id, "$reportname | $sql" ) if C4::Context->preference("ReportsLog"); |
251 |
} |
268 |
} |
Lines 489-494
if ( !$op ) {
Link Here
|
489 |
my $area = $input->param('area'); |
506 |
my $area = $input->param('area'); |
490 |
my $sql = $input->param('sql'); |
507 |
my $sql = $input->param('sql'); |
491 |
my $type = $input->param('type'); |
508 |
my $type = $input->param('type'); |
|
|
509 |
|
492 |
$template->param( |
510 |
$template->param( |
493 |
'save' => 1, |
511 |
'save' => 1, |
494 |
'area' => $area, |
512 |
'area' => $area, |
Lines 514-519
if ( !$op ) {
Link Here
|
514 |
my $public = $input->param('public'); |
532 |
my $public = $input->param('public'); |
515 |
my $save_anyway = $input->param('save_anyway'); |
533 |
my $save_anyway = $input->param('save_anyway'); |
516 |
my $tables = get_tables(); |
534 |
my $tables = get_tables(); |
|
|
535 |
my @branches = grep { $_ ne q{} } $input->multi_param('branches'); |
517 |
|
536 |
|
518 |
# if we have the units, then we came from creating a report from SQL and thus need to handle converting units |
537 |
# if we have the units, then we came from creating a report from SQL and thus need to handle converting units |
519 |
if ($cache_expiry_units) { |
538 |
if ($cache_expiry_units) { |
Lines 591-596
if ( !$op ) {
Link Here
|
591 |
public => $public, |
610 |
public => $public, |
592 |
} |
611 |
} |
593 |
); |
612 |
); |
|
|
613 |
my $report = Koha::Reports->find($id); |
614 |
$report->replace_library_limits( \@branches ); |
615 |
|
594 |
logaction( "REPORTS", "ADD", $id, "$name | $sql" ) if C4::Context->preference("ReportsLog"); |
616 |
logaction( "REPORTS", "ADD", $id, "$name | $sql" ) if C4::Context->preference("ReportsLog"); |
595 |
$template->param( |
617 |
$template->param( |
596 |
'save_successful' => 1, |
618 |
'save_successful' => 1, |
Lines 603-609
if ( !$op ) {
Link Here
|
603 |
'cache_expiry' => $cache_expiry, |
625 |
'cache_expiry' => $cache_expiry, |
604 |
'public' => $public, |
626 |
'public' => $public, |
605 |
'usecache' => $usecache, |
627 |
'usecache' => $usecache, |
606 |
'tables' => $tables |
628 |
'tables' => $tables, |
|
|
629 |
'report' => $report, |
607 |
); |
630 |
); |
608 |
} |
631 |
} |
609 |
} |
632 |
} |
Lines 746-765
if ( !$op ) {
Link Here
|
746 |
|
769 |
|
747 |
} elsif ( $op eq 'add_form_sql' || $op eq 'duplicate' ) { |
770 |
} elsif ( $op eq 'add_form_sql' || $op eq 'duplicate' ) { |
748 |
|
771 |
|
749 |
my ( $group, $subgroup, $sql, $reportname, $notes ); |
772 |
my ( $group, $subgroup, $sql, $reportname, $notes, @branches, $report ); |
750 |
if ( $input->param('sql') ) { |
773 |
if ( $input->param('sql') ) { |
751 |
$group = $input->param('report_group'); |
774 |
$group = $input->param('report_group'); |
752 |
$subgroup = $input->param('report_subgroup'); |
775 |
$subgroup = $input->param('report_subgroup'); |
753 |
$sql = $input->param('sql') // ''; |
776 |
$sql = $input->param('sql') // ''; |
754 |
$reportname = $input->param('reportname') // ''; |
777 |
$reportname = $input->param('reportname') // ''; |
755 |
$notes = $input->param('notes') // ''; |
778 |
$notes = $input->param('notes') // ''; |
|
|
779 |
@branches = grep { $_ ne q{} } $input->multi_param('branches'); |
780 |
|
756 |
} elsif ( my $report_id = $input->param('id') ) { |
781 |
} elsif ( my $report_id = $input->param('id') ) { |
757 |
my $report = Koha::Reports->find($report_id); |
782 |
$report = Koha::Reports->find($report_id); |
758 |
$group = $report->report_group; |
783 |
$group = $report->report_group; |
759 |
$subgroup = $report->report_subgroup; |
784 |
$subgroup = $report->report_subgroup; |
760 |
$sql = $report->savedsql // ''; |
785 |
$sql = $report->savedsql // ''; |
761 |
$reportname = $report->report_name // ''; |
786 |
$reportname = $report->report_name // ''; |
762 |
$notes = $report->notes // ''; |
787 |
$notes = $report->notes // ''; |
|
|
788 |
@branches = grep { $_ ne q{} } $input->multi_param('branches'); |
789 |
|
763 |
} |
790 |
} |
764 |
|
791 |
|
765 |
my $tables = get_tables(); |
792 |
my $tables = get_tables(); |
Lines 775-780
if ( !$op ) {
Link Here
|
775 |
'usecache' => $usecache, |
802 |
'usecache' => $usecache, |
776 |
'tables' => $tables, |
803 |
'tables' => $tables, |
777 |
|
804 |
|
|
|
805 |
# 'branches' => \@branches, |
806 |
'report' => $report, |
807 |
|
778 |
); |
808 |
); |
779 |
} |
809 |
} |
780 |
|
810 |
|
Lines 1081-1104
if ( $op eq 'list' || $op eq 'convert' ) {
Link Here
|
1081 |
my $subgroup = $input->param('subgroup'); |
1111 |
my $subgroup = $input->param('subgroup'); |
1082 |
$filter->{group} = $group; |
1112 |
$filter->{group} = $group; |
1083 |
$filter->{subgroup} = $subgroup; |
1113 |
$filter->{subgroup} = $subgroup; |
1084 |
my $reports = get_saved_reports($filter); |
1114 |
|
1085 |
my $has_obsolete_reports; |
1115 |
my $pref_enable_filtering_reports = C4::Context->preference("EnableFilteringReports"); |
1086 |
for my $report (@$reports) { |
1116 |
if ( $pref_enable_filtering_reports == "1" ) { |
1087 |
$report->{results} = C4::Reports::Guided::get_results( $report->{id} ); |
1117 |
my $reports_with_library_limits_results = |
1088 |
if ( $report->{savedsql} =~ m|biblioitems| and $report->{savedsql} =~ m|marcxml| ) { |
1118 |
Koha::Reports->search_with_library_limits( {}, {}, C4::Context::mybranch() ); |
1089 |
$report->{seems_obsolete} = 1; |
1119 |
my $reports_list = $reports_with_library_limits_results->unblessed; |
1090 |
$has_obsolete_reports++; |
1120 |
my $has_obsolete_reports; |
|
|
1121 |
while ( my $report = $reports_with_library_limits_results->next ) { |
1122 |
$report->{results} = C4::Reports::Guided::get_results( $report->{id} ); |
1123 |
if ( $report->{savedsql} =~ m|biblioitems| and $report->{savedsql} =~ m|marcxml| ) { |
1124 |
$report->{seems_obsolete} = 1; |
1125 |
$has_obsolete_reports++; |
1126 |
} |
1127 |
$template->param( |
1128 |
'manamsg' => $input->param('manamsg') || '', |
1129 |
'saved1' => 1, |
1130 |
'savedreports' => $reports_list, |
1131 |
'usecache' => $usecache, |
1132 |
'groups_with_subgroups' => groups_with_subgroups( $group, $subgroup ), |
1133 |
filters => $filter, |
1134 |
has_obsolete_reports => $has_obsolete_reports, |
1135 |
); |
1091 |
} |
1136 |
} |
|
|
1137 |
} else { |
1138 |
|
1139 |
my $reports = get_saved_reports($filter); |
1140 |
my $has_obsolete_reports; |
1141 |
|
1142 |
for my $report (@$reports) { |
1143 |
$report->{results} = C4::Reports::Guided::get_results( $report->{id} ); |
1144 |
if ( $report->{savedsql} =~ m|biblioitems| and $report->{savedsql} =~ m|marcxml| ) { |
1145 |
$report->{seems_obsolete} = 1; |
1146 |
$has_obsolete_reports++; |
1147 |
} |
1148 |
} |
1149 |
$template->param( |
1150 |
'manamsg' => $input->param('manamsg') || '', |
1151 |
'saved1' => 1, |
1152 |
'savedreports' => $reports, |
1153 |
'usecache' => $usecache, |
1154 |
'groups_with_subgroups' => groups_with_subgroups( $group, $subgroup ), |
1155 |
filters => $filter, |
1156 |
has_obsolete_reports => $has_obsolete_reports, |
1157 |
); |
1092 |
} |
1158 |
} |
1093 |
$template->param( |
|
|
1094 |
'manamsg' => $input->param('manamsg') || '', |
1095 |
'saved1' => 1, |
1096 |
'savedreports' => $reports, |
1097 |
'usecache' => $usecache, |
1098 |
'groups_with_subgroups' => groups_with_subgroups( $group, $subgroup ), |
1099 |
filters => $filter, |
1100 |
has_obsolete_reports => $has_obsolete_reports, |
1101 |
); |
1102 |
} |
1159 |
} |
1103 |
|
1160 |
|
1104 |
# pass $sth, get back an array of names for the column headers |
1161 |
# pass $sth, get back an array of names for the column headers |