2013-10-08 Sergio Martin <sergio.martin@artica.es>

* include/help/en/help_reporting_advanced_tab.php
	include/help/es/help_reporting_advanced_tab.php: Add info
	in the report macros help with new feature

	* images/custom_logo/none.png
	images/custom_logo/artica_logo.jpg
	images/custom_logo/artica_logo.png
	images/custom_logo/sourceforge.png
	images/custom_logo/pandora_logo_head.png
	images/custom_logo/none.jpg: Clean and create new files for
	pdf header

	* godmode/reporting/reporting_builder.php: Set FreeSans as
	default font in reports



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8869 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-10-08 11:26:43 +00:00
parent 090b2e7fb3
commit b372f9b041
10 changed files with 24 additions and 3 deletions

View File

@ -1,3 +1,20 @@
2013-10-08 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_reporting_advanced_tab.php
include/help/es/help_reporting_advanced_tab.php: Add info
in the report macros help with new feature
* images/custom_logo/none.png
images/custom_logo/artica_logo.jpg
images/custom_logo/artica_logo.png
images/custom_logo/sourceforge.png
images/custom_logo/pandora_logo_head.png
images/custom_logo/none.jpg: Clean and create new files for
pdf header
* godmode/reporting/reporting_builder.php: Set FreeSans as
default font in reports
2013-10-08 Sergio Martin <sergio.martin@artica.es> 2013-10-08 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php * include/functions_alerts.php

View File

@ -523,6 +523,9 @@ switch ($action) {
$id_group_edit_param = (int)get_parameter('id_group_edit', 0); $id_group_edit_param = (int)get_parameter('id_group_edit', 0);
$report_id_user = get_parameter('report_id_user'); $report_id_user = get_parameter('report_id_user');
// Pretty font by default for pdf
$custom_font = 'FreeSans.ttf';
switch ($type_access_selected) { switch ($type_access_selected) {
case 'group_view': case 'group_view':
$id_group_edit = 0; $id_group_edit = 0;
@ -590,7 +593,8 @@ switch ($action) {
'private' => $private, 'private' => $private,
'id_group_edit' => $id_group_edit, 'id_group_edit' => $id_group_edit,
'id_user' => $config['id_user'], 'id_user' => $config['id_user'],
'metaconsole' => $metaconsole_report)); 'metaconsole' => $metaconsole_report,
'custom_font' => $custom_font));
if ($idOrResult !== false) if ($idOrResult !== false)
db_pandora_audit( "Report management", "Create report #$idOrResult"); db_pandora_audit( "Report management", "Create report #$idOrResult");
else else

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

View File

@ -5,7 +5,7 @@
?> ?>
<h1>Advanced reporting</h1> <h1>Advanced reporting</h1>
<p> <p>
You can use only a macro in the first page: <br><br> You can use a macro in the first page, header and footer: <br><br>
<b>(_DATETIME_)</b> will be replaced by the current date and time in the moment of generating the PDF.<br> <b>(_DATETIME_)</b> will be replaced by the current date and time in the moment of generating the PDF.<br>
<b>(_REPORT_NAME_)</b> will be replaced by the current name of report. <b>(_REPORT_NAME_)</b> will be replaced by the current name of report.
<br><br> <br><br>

View File

@ -5,7 +5,7 @@
?> ?>
<h1>Opciones avanzadas</h1> <h1>Opciones avanzadas</h1>
<p> <p>
Puede usar una macro en la portada:<br><br> Puede usar una macro en la portada, la cabecera y el pie de pagina:<br><br>
<b>(_DATETIME_)</b> este token será reemplazado por la fecha y hora actual en el momento de generar el PDF. <b>(_DATETIME_)</b> este token será reemplazado por la fecha y hora actual en el momento de generar el PDF.
<b>(_REPORT_NAME_)</b> este token será reemplazado por el nombre del informe. <b>(_REPORT_NAME_)</b> este token será reemplazado por el nombre del informe.
<br><br> <br><br>