Changeset 902 for trunk/Packages/Common

Timestamp:

Feb 18, 2021, 1:59:28 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved generation of contracts.

Location:

trunk/Packages/Common

Files:

• Pdf.php (modified) (2 diffs)
• PrefixMultiplier.php (modified) (2 diffs)

trunk/Packages/Common/Pdf.php

@@ -4 +4 @@
 {
   public bool $Checked = false;
+  public string $BorderTop = '';
+  public string $BorderLeft = '';
+  public string $BorderRight = '';
+  public string $BorderBottom = '';
+  public int $FontSize = 0;
+  public string $OutputFormat = 'pdf';
+  public string $Charset = '8859-2';
 
   function GenerateHTML(): string
@@ -24 +31 @@
       } else throw new Exception('htmldoc is not installed.');
     }
+    $Parameters = '--no-numbered --footer . --webpage --no-embedfonts --charset '.$this->Charset.' -t '.$this->OutputFormat;
+    if ($this->FontSize > 0) $Parameters .= ' --fontsize '.$this->FontSize;
+    if ($this->BorderLeft != '') $Parameters .= ' --left '.$this->BorderLeft;
+    if ($this->BorderTop != '') $Parameters .= ' --top '.$this->BorderTop;
+    if ($this->BorderRight != '') $Parameters .= ' --right '.$this->BorderRight;
+    if ($this->BorderBottom != '') $Parameters .= ' --bottom '.$this->BorderBottom;
     $Output = shell_exec('echo "'.addslashes($Encoding->FromUTF8($HtmlCode)).
-      '"|htmldoc --no-numbered --webpage --no-embedfonts --charset 8859-2 -t pdf -');
+      '"|htmldoc '.$Parameters.' -');
     return $Output;
   }

trunk/Packages/Common/PrefixMultiplier.php

@@ -72 +72 @@
 class PrefixMultiplier
 {
-  function TruncateDigits($Value, $Digits = 4)
+  function TruncateDigits($Value, $Digits = 4): string
   {
     for ($II = 2; $II > -6; $II--)
@@ -87 +87 @@
   }
 
-  function Add($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal')
+  function Add($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal'): string
   {
     global $PrefixMultipliers;