tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5191-fuentes-informes-custom-report-front' into 'develop'

Browse Source 
report font not depending of custom report front enabled

See merge request artica/pandorafms!2980
This commit is contained in:
Daniel Rodriguez 2020-01-13 18:21:48 +01:00
commit b19881d84b
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -1207,8 +1207,7 @@ switch ($action) {
$report_id_user = get_parameter('report_id_user'); $report_id_user = get_parameter('report_id_user');
$non_interactive = get_parameter('non_interactive', 0); $non_interactive = get_parameter('non_interactive', 0);
// Pretty font by default for pdf. $custom_font = $config['custom_report_front_font'];
$custom_font = 'FreeSans.ttf';
switch ($type_access_selected) { switch ($type_access_selected) {
case 'group_view': case 'group_view':
@ -1284,7 +1283,6 @@ switch ($action) {
$metaconsole_report = (int) is_metaconsole(); $metaconsole_report = (int) is_metaconsole();
if ($config['custom_report_front']) { if ($config['custom_report_front']) {
$custom_font = $config['custom_report_front_font'];
$logo = $config['custom_report_front_logo']; $logo = $config['custom_report_front_logo'];
$header = $config['custom_report_front_header']; $header = $config['custom_report_front_header'];
$first_page = $config['custom_report_front_firstpage']; $first_page = $config['custom_report_front_firstpage'];

28
pandora_console/godmode/setup/setup_visuals.php
View File

@ -1048,6 +1048,20 @@ $row++;
$row++; $row++;
$table_report->data[$row][0] = __('PDF font family');
$table_report->data[$row][1] = html_print_select(
$fonts,
'custom_report_front_font',
$config['custom_report_front_font'],
false,
__('Default'),
'',
true
);
$row++;
$table_report->data[$row][0] = __('Graph image height for HTML reports'); $table_report->data[$row][0] = __('Graph image height for HTML reports');
$table_report->data[$row][0] .= ui_print_help_tip( $table_report->data[$row][0] .= ui_print_help_tip(
__('This is the height in pixels of the module graph or custom graph in the reports (only: HTML)'), __('This is the height in pixels of the module graph or custom graph in the reports (only: HTML)'),
@ -1078,18 +1092,6 @@ $row++;
} }
} }
// Font
$table_report->data['custom_report_front-font'][0] = __('Custom report front').' - '.__('Font family');
$table_report->data['custom_report_front-font'][1] = html_print_select(
$fonts,
'custom_report_front_font',
$config['custom_report_front_font'],
false,
__('Default'),
'',
true
);
// Logo // Logo
$table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip( $table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip(
__("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."),
@ -1397,7 +1399,6 @@ function edit_csv_divider () {
function display_custom_report_front (show,table) { function display_custom_report_front (show,table) {
if (show == true) { if (show == true) {
$('tr#'+table+'-custom_report_front-font').show();
$('tr#'+table+'-custom_report_front-logo').show(); $('tr#'+table+'-custom_report_front-logo').show();
$('tr#'+table+'-custom_report_front-preview').show(); $('tr#'+table+'-custom_report_front-preview').show();
$('tr#'+table+'-custom_report_front-header').show(); $('tr#'+table+'-custom_report_front-header').show();
@ -1405,7 +1406,6 @@ function display_custom_report_front (show,table) {
$('tr#'+table+'-custom_report_front-footer').show(); $('tr#'+table+'-custom_report_front-footer').show();
} }
else { else {
$('tr#'+table+'-custom_report_front-font').hide();
$('tr#'+table+'-custom_report_front-logo').hide(); $('tr#'+table+'-custom_report_front-logo').hide();
$('tr#'+table+'-custom_report_front-preview').hide(); $('tr#'+table+'-custom_report_front-preview').hide();
$('tr#'+table+'-custom_report_front-header').hide(); $('tr#'+table+'-custom_report_front-header').hide();