tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3155-Pete_de_permisos_en_cron_job' into 'develop' 

fixed warnings and font chart for pdf report

See merge request artica/pandorafms!2020
This commit is contained in:
vgilc 2018-11-27 17:49:20 +01:00
parent ad743d332e 0460b465f0
commit 9db7bb6b17
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/chart_generator.php
View File

@ -123,7 +123,7 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
$params['height'],
$params['water_mark_url'],
$params['font'],
$params['font_size'],
$config['font_size'],
$params['legend_position'],
$params['colors'],
$params['hide_labels']
@ -142,7 +142,7 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
$params['water_mark_url'],
$params['homedir'],
$params['font'],
$params['font_size'],
$config['font_size'],
$params['from_ux'],
$params['from_wux'],
$params['backgroundColor'],
@ -156,7 +156,7 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
$params['height'],
$params['water_mark_url'],
$params['font'],
$params['font_size'],
$config['font_size'],
$params['backgroundColor'],
$params['tick_color'],
$params['val_min'],
@ -176,7 +176,7 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
'',
$params['water_mark'],
$params['font'],
$params['font_size'],
$config['font_size'],
$params['unit'],
$params['ttl'],
$params['homeurl'],

8
pandora_console/include/web2image.js
View File

@ -51,14 +51,18 @@ page.open(url, 'POST', post_data, function start(status) {
page.onLoadFinished = function (status) {
if(!base_64){
page.render(output_filename, {format: 'png'});
setTimeout(function() {
page.render(output_filename, {format: 'png'});
phantom.exit();
}, 200);
}
else{
var base64 = page.renderBase64('png');
//XXXX
console.log(base64);
phantom.exit();
}
phantom.exit();
}