DigitaleSignatur centered

app/Actions/Generate/Pdf/DigitaleSignatur.php

@@ -6,8 +6,13 @@ use App\Actions\Generate\PdfGenerator;
 
 class DigitaleSignatur
 {
-    public static function load($projekte_id)
+    public static function load($projekte_id, $textblock)
     {
-        return '<div style="margin-right:2cm; height:4cm; background-repeat: no-repeat; background-position: right; background-size: contain; background-image: url(\''.public_path().'/storage/'.PdfGenerator::$gutachter->digitale_signatur_stempel.'\');"></div>';
+        $html = '<table style="width:100%;"><tr style="height:5cm;">';
+        $html .= '<td style="vertical-align: middle; text-align:center; padding:auto;"><b>'.$textblock.'</b></td>';
+        $html .= '<td style="vertical-align: middle; text-align:center; padding:auto;"><img style="height:4cm; width:4cm;" src="'.public_path().'/storage/'.PdfGenerator::$gutachter->digitale_signatur_stempel.'"/></td>';
+        $html .= '</tr></table>';
+
+        return $html;
     }
 }

app/Actions/Generate/PdfGenerator.php

@@ -117,7 +117,7 @@ class PdfGenerator
             if ($inhalt->textblock) {
                 $textblock = Platzhalter::replace($platzhalter, $inhalt->textblock);
                 $textblock = Format::fix_str($textblock);
-                if ($inhalt->inhaltselement_id != '9') {
+                if (! in_array($inhalt->inhaltselement_id, [9, 10])) {
                     $html .= $textblock;
                 }
             }
@@ -155,7 +155,7 @@ class PdfGenerator
                     $html .= Deckblatt::load($inhalt, $textblock, $textblock2);
                     break;
                 case '10':
-                    $html .= DigitaleSignatur::load($projekte_id);
+                    $html .= DigitaleSignatur::load($projekte_id, $textblock);
                     break;
             }
 

app/Actions/Generate/Tabellen/Allgemeinflaechen.php

@@ -24,13 +24,13 @@ class Allgemeinflaechen
             if (isset($value[0])) {
                 $html .= Html::td($value[0]['geschoss'], 'bl bb');
                 $html .= Html::td($value[0]['raumart'], 'bl bb');
-                $html .= Html::td($value[0]['flaeche'].' m²', 'bl bb br right');
+                $html .= Html::td(number_format($value[0]['flaeche'], 2, ',').' m²', 'bl bb br right');
                 $html .= '<td style="background:white"></td>';
             }
             if (isset($value[1])) {
                 $html .= Html::td($value[1]['geschoss'], 'bl bb');
                 $html .= Html::td($value[1]['raumart'], 'bl bb');
-                $html .= Html::td($value[1]['flaeche'].' m&sup2;', 'bl bb br right');
+                $html .= Html::td(number_format($value[0]['flaeche'], 2, ',').' m&sup2;', 'bl bb br right');
             }
             $html .= '</tr>';
         }