Lines 286-301
elsif ( $phase eq 'Report on this Area' ) {
Link Here
|
286 |
'areas' => get_report_areas(), |
286 |
'areas' => get_report_areas(), |
287 |
'cache_expiry' => $cache_expiry, |
287 |
'cache_expiry' => $cache_expiry, |
288 |
'usecache' => $usecache, |
288 |
'usecache' => $usecache, |
289 |
'public' => $input->param('public'), |
289 |
'public' => scalar $input->param('public'), |
290 |
); |
290 |
); |
291 |
} else { |
291 |
} else { |
292 |
# they have choosen a new report and the area to report on |
292 |
# they have choosen a new report and the area to report on |
293 |
$template->param( |
293 |
$template->param( |
294 |
'build2' => 1, |
294 |
'build2' => 1, |
295 |
'area' => $input->param('area'), |
295 |
'area' => scalar $input->param('area'), |
296 |
'types' => get_report_types(), |
296 |
'types' => get_report_types(), |
297 |
'cache_expiry' => $cache_expiry, |
297 |
'cache_expiry' => $cache_expiry, |
298 |
'public' => $input->param('public'), |
298 |
'public' => scalar $input->param('public'), |
299 |
); |
299 |
); |
300 |
} |
300 |
} |
301 |
} |
301 |
} |
Lines 310-317
elsif ( $phase eq 'Choose this type' ) {
Link Here
|
310 |
'area' => $area, |
310 |
'area' => $area, |
311 |
'type' => $type, |
311 |
'type' => $type, |
312 |
columns => get_columns($area,$input), |
312 |
columns => get_columns($area,$input), |
313 |
'cache_expiry' => $input->param('cache_expiry'), |
313 |
'cache_expiry' => scalar $input->param('cache_expiry'), |
314 |
'public' => $input->param('public'), |
314 |
'public' => scalar $input->param('public'), |
315 |
); |
315 |
); |
316 |
} |
316 |
} |
317 |
|
317 |
|
Lines 330-341
elsif ( $phase eq 'Choose these columns' ) {
Link Here
|
330 |
'column' => $column, |
330 |
'column' => $column, |
331 |
definitions => get_from_dictionary($area), |
331 |
definitions => get_from_dictionary($area), |
332 |
criteria => get_criteria($area,$input), |
332 |
criteria => get_criteria($area,$input), |
333 |
'public' => $input->param('public'), |
333 |
'public' => scalar $input->param('public'), |
334 |
); |
334 |
); |
335 |
if ( $usecache ) { |
335 |
if ( $usecache ) { |
336 |
$template->param( |
336 |
$template->param( |
337 |
cache_expiry => $input->param('cache_expiry'), |
337 |
cache_expiry => scalar $input->param('cache_expiry'), |
338 |
cache_expiry_units => $input->param('cache_expiry_units'), |
338 |
cache_expiry_units => scalar $input->param('cache_expiry_units'), |
339 |
); |
339 |
); |
340 |
} |
340 |
} |
341 |
|
341 |
|
Lines 395-406
elsif ( $phase eq 'Choose these criteria' ) {
Link Here
|
395 |
'column' => $column, |
395 |
'column' => $column, |
396 |
'definition' => $definition, |
396 |
'definition' => $definition, |
397 |
'criteriastring' => $query_criteria, |
397 |
'criteriastring' => $query_criteria, |
398 |
'public' => $input->param('public'), |
398 |
'public' => scalar $input->param('public'), |
399 |
); |
399 |
); |
400 |
if ( $usecache ) { |
400 |
if ( $usecache ) { |
401 |
$template->param( |
401 |
$template->param( |
402 |
cache_expiry => $input->param('cache_expiry'), |
402 |
cache_expiry => scalar $input->param('cache_expiry'), |
403 |
cache_expiry_units => $input->param('cache_expiry_units'), |
403 |
cache_expiry_units => scalar $input->param('cache_expiry_units'), |
404 |
); |
404 |
); |
405 |
} |
405 |
} |
406 |
|
406 |
|
Lines 442-449
elsif ( $phase eq 'Choose these operations' ) {
Link Here
|
442 |
'criteriastring' => $criteria, |
442 |
'criteriastring' => $criteria, |
443 |
'totals' => $totals, |
443 |
'totals' => $totals, |
444 |
'definition' => $definition, |
444 |
'definition' => $definition, |
445 |
'cache_expiry' => $input->param('cache_expiry'), |
445 |
'cache_expiry' => scalar $input->param('cache_expiry'), |
446 |
'public' => $input->param('public'), |
446 |
'public' => scalar $input->param('public'), |
447 |
); |
447 |
); |
448 |
|
448 |
|
449 |
# get columns |
449 |
# get columns |
Lines 495-502
elsif ( $phase eq 'Build report' ) {
Link Here
|
495 |
'area' => $area, |
495 |
'area' => $area, |
496 |
'sql' => $sql, |
496 |
'sql' => $sql, |
497 |
'type' => $type, |
497 |
'type' => $type, |
498 |
'cache_expiry' => $input->param('cache_expiry'), |
498 |
'cache_expiry' => scalar $input->param('cache_expiry'), |
499 |
'public' => $input->param('public'), |
499 |
'public' => scalar $input->param('public'), |
500 |
); |
500 |
); |
501 |
} |
501 |
} |
502 |
|
502 |
|
Lines 510-517
elsif ( $phase eq 'Save' ) {
Link Here
|
510 |
'area' => $area, |
510 |
'area' => $area, |
511 |
'sql' => $sql, |
511 |
'sql' => $sql, |
512 |
'type' => $type, |
512 |
'type' => $type, |
513 |
'cache_expiry' => $input->param('cache_expiry'), |
513 |
'cache_expiry' => scalar $input->param('cache_expiry'), |
514 |
'public' => $input->param('public'), |
514 |
'public' => scalar $input->param('public'), |
515 |
'groups_with_subgroups' => groups_with_subgroups($area), # in case we have a report group that matches area |
515 |
'groups_with_subgroups' => groups_with_subgroups($area), # in case we have a report group that matches area |
516 |
); |
516 |
); |
517 |
} |
517 |
} |
Lines 912-920
elsif ( $phase eq 'Create report from SQL' ) {
Link Here
|
912 |
$group = $input->param('report_group'); |
912 |
$group = $input->param('report_group'); |
913 |
$subgroup = $input->param('report_subgroup'); |
913 |
$subgroup = $input->param('report_subgroup'); |
914 |
$template->param( |
914 |
$template->param( |
915 |
'sql' => $input->param('sql') // '', |
915 |
'sql' => scalar $input->param('sql') // '', |
916 |
'reportname' => $input->param('reportname') // '', |
916 |
'reportname' => scalar $input->param('reportname') // '', |
917 |
'notes' => $input->param('notes') // '', |
917 |
'notes' => scalar $input->param('notes') // '', |
918 |
); |
918 |
); |
919 |
} |
919 |
} |
920 |
$template->param( |
920 |
$template->param( |