mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-04-08 18:55:09 +02:00
Reports PDFS changes
This commit is contained in:
parent
80076434b3
commit
10c0d95f34
@ -38,7 +38,7 @@ table.header_table tr td {
|
|||||||
}
|
}
|
||||||
|
|
||||||
table thead tr th {
|
table thead tr th {
|
||||||
background-color: #919191;
|
background-color: #e5e5e5;
|
||||||
}
|
}
|
||||||
|
|
||||||
table thead tr th.title_table_pdf {
|
table thead tr th.title_table_pdf {
|
||||||
|
@ -286,6 +286,9 @@ class FontVariables
|
|||||||
"unbatang" => [/* Korean */
|
"unbatang" => [/* Korean */
|
||||||
'R' => "UnBatang_0613.ttf",
|
'R' => "UnBatang_0613.ttf",
|
||||||
],
|
],
|
||||||
|
"lato" => [/* lato */
|
||||||
|
'R' => 'Lato-Regular.ttf',
|
||||||
|
],
|
||||||
],
|
],
|
||||||
|
|
||||||
// Add fonts to this array if they contain characters in the SIP or SMP Unicode planes
|
// Add fonts to this array if they contain characters in the SIP or SMP Unicode planes
|
||||||
@ -296,6 +299,7 @@ class FontVariables
|
|||||||
"dejavuserifcondensed",
|
"dejavuserifcondensed",
|
||||||
"dejavuserif",
|
"dejavuserif",
|
||||||
"dejavusansmono",
|
"dejavusansmono",
|
||||||
|
"lato",
|
||||||
],
|
],
|
||||||
|
|
||||||
// These next 3 arrays do two things:
|
// These next 3 arrays do two things:
|
||||||
@ -321,6 +325,8 @@ class FontVariables
|
|||||||
'mono_fonts' => ['dejavusansmono', 'mono', 'monospace', 'freemono', 'liberationmono', 'courier', 'ocrb', 'ocr-b', 'lucidaconsole',
|
'mono_fonts' => ['dejavusansmono', 'mono', 'monospace', 'freemono', 'liberationmono', 'courier', 'ocrb', 'ocr-b', 'lucidaconsole',
|
||||||
'couriernew', 'monotypecorsiva'
|
'couriernew', 'monotypecorsiva'
|
||||||
],
|
],
|
||||||
|
|
||||||
|
'lato' => ['lato'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
25
pandora_console/vendor/mpdf/mpdf/src/Mpdf.php
vendored
25
pandora_console/vendor/mpdf/mpdf/src/Mpdf.php
vendored
@ -468,6 +468,7 @@ class Mpdf implements \Psr\Log\LoggerAwareInterface
|
|||||||
var $serif_fonts;
|
var $serif_fonts;
|
||||||
var $mono_fonts;
|
var $mono_fonts;
|
||||||
var $defaultSubsFont;
|
var $defaultSubsFont;
|
||||||
|
var $lato;
|
||||||
|
|
||||||
// List of ALL available CJK fonts (incl. styles) (Adobe add-ons) hw removed
|
// List of ALL available CJK fonts (incl. styles) (Adobe add-ons) hw removed
|
||||||
var $available_CJK_fonts;
|
var $available_CJK_fonts;
|
||||||
@ -1478,15 +1479,31 @@ class Mpdf implements \Psr\Log\LoggerAwareInterface
|
|||||||
$default_font = $this->defaultCSS['BODY']['FONT-FAMILY'];
|
$default_font = $this->defaultCSS['BODY']['FONT-FAMILY'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($default_font) {
|
||||||
|
$this->SetDefaultFont($default_font);
|
||||||
|
}
|
||||||
|
|
||||||
if (!$default_font_size) {
|
if (!$default_font_size) {
|
||||||
$mmsize = $this->sizeConverter->convert($this->defaultCSS['BODY']['FONT-SIZE']);
|
$mmsize = $this->sizeConverter->convert($this->defaultCSS['BODY']['FONT-SIZE']);
|
||||||
$default_font_size = $mmsize * (Mpdf::SCALE);
|
$default_font_size = $mmsize * (Mpdf::SCALE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($default_font) {
|
if ($_SESSION['font_size_report']) {
|
||||||
$this->SetDefaultFont($default_font);
|
// DefaultCss.
|
||||||
}
|
$this->defaultCSS['BODY']['FONT-SIZE'] = $_SESSION['font_size_report'].'px';
|
||||||
if ($default_font_size) {
|
$this->defaultCSS['TABLE']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
|
||||||
|
$this->defaultCSS['THEAD']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
|
||||||
|
$this->defaultCSS['TH']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
|
||||||
|
$this->defaultCSS['TD']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
|
||||||
|
// CssManager.
|
||||||
|
$this->cssManager->CSS['BODY']['FONT-SIZE'] = $_SESSION['font_size_report'].'px';
|
||||||
|
$this->cssManager->CSS['TABLE']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
|
||||||
|
$this->cssManager->CSS['THEAD']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
|
||||||
|
$this->cssManager->CSS['TH']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
|
||||||
|
$this->cssManager->CSS['TD']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
|
||||||
|
|
||||||
|
} elseif ($default_font_size) {
|
||||||
$this->SetDefaultFontSize($default_font_size);
|
$this->SetDefaultFontSize($default_font_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user