tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed warnings and font chart for pdf report

Browse Source
This commit is contained in:
daniel 2018-11-27 17:43:59 +01:00
parent ad743d332e
commit 0460b465f0
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['height'],
$params['water_mark_url'], $params['water_mark_url'],
$params['font'], $params['font'],
$params['font_size'], $config['font_size'],
$params['legend_position'], $params['legend_position'],
$params['colors'], $params['colors'],
$params['hide_labels'] $params['hide_labels']
@ -142,7 +142,7 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
$params['water_mark_url'], $params['water_mark_url'],
$params['homedir'], $params['homedir'],
$params['font'], $params['font'],
$params['font_size'], $config['font_size'],
$params['from_ux'], $params['from_ux'],
$params['from_wux'], $params['from_wux'],
$params['backgroundColor'], $params['backgroundColor'],
@ -156,7 +156,7 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
$params['height'], $params['height'],
$params['water_mark_url'], $params['water_mark_url'],
$params['font'], $params['font'],
$params['font_size'], $config['font_size'],
$params['backgroundColor'], $params['backgroundColor'],
$params['tick_color'], $params['tick_color'],
$params['val_min'], $params['val_min'],
@ -176,7 +176,7 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
'', '',
$params['water_mark'], $params['water_mark'],
$params['font'], $params['font'],
$params['font_size'], $config['font_size'],
$params['unit'], $params['unit'],
$params['ttl'], $params['ttl'],
$params['homeurl'], $params['homeurl'],

6
pandora_console/include/web2image.js
View File

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