diff --git a/app/Actions/Generate/Pdf/DigitaleSignatur.php b/app/Actions/Generate/Pdf/DigitaleSignatur.php index f822b57..36b9036 100644 --- a/app/Actions/Generate/Pdf/DigitaleSignatur.php +++ b/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 '
'; + $html = ''; + $html .= ''; + $html .= ''; + $html .= '
'.$textblock.'
'; + + return $html; } } diff --git a/app/Actions/Generate/PdfGenerator.php b/app/Actions/Generate/PdfGenerator.php index ffd32c2..81f4d14 100644 --- a/app/Actions/Generate/PdfGenerator.php +++ b/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; } diff --git a/app/Actions/Generate/Tabellen/Allgemeinflaechen.php b/app/Actions/Generate/Tabellen/Allgemeinflaechen.php index e483a34..a4a4470 100644 --- a/app/Actions/Generate/Tabellen/Allgemeinflaechen.php +++ b/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 .= ''; } 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²', 'bl bb br right'); + $html .= Html::td(number_format($value[0]['flaeche'], 2, ',').' m²', 'bl bb br right'); } $html .= ''; } diff --git a/bootstrap/cache/routes-v7.php b/bootstrap/cache/routes-v7.php index 1e5daed..5e01320 100644 --- a/bootstrap/cache/routes-v7.php +++ b/bootstrap/cache/routes-v7.php @@ -531,7 +531,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::yqG6TppmqI1yNrW8', + '_route' => 'generated::Oun0qX7YVuUO3PMS', ), 1 => NULL, 2 => @@ -551,7 +551,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::JiHWkR6DMbpxk9Ip', + '_route' => 'generated::4LTXK1oTWKFeD3Cb', ), 1 => NULL, 2 => @@ -609,7 +609,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::hz0HgT5M20cdqDvW', + '_route' => 'generated::7k8IXrXuhqtvdTEJ', ), 1 => NULL, 2 => @@ -629,7 +629,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::tULxti3TujxQama0', + '_route' => 'generated::wVt9Edv2JKv4tBmL', ), 1 => NULL, 2 => @@ -649,7 +649,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::lLpvehfHNgDA217s', + '_route' => 'generated::I9DObLVK6045Uijo', ), 1 => NULL, 2 => @@ -669,7 +669,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::Rxlv5CDxgAm9l8rY', + '_route' => 'generated::UX8coudeJNQNsWfJ', ), 1 => NULL, 2 => @@ -689,7 +689,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::BdbUDz0C4mIN9uRc', + '_route' => 'generated::TJE4yoFuy899QPjC', ), 1 => NULL, 2 => @@ -2757,7 +2757,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::yqG6TppmqI1yNrW8' => + 'generated::Oun0qX7YVuUO3PMS' => array ( 'methods' => array ( @@ -2769,7 +2769,7 @@ app('router')->setCompiledRoutes( array ( 'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile', 'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile', - 'as' => 'generated::yqG6TppmqI1yNrW8', + 'as' => 'generated::Oun0qX7YVuUO3PMS', ), 'fallback' => false, 'defaults' => @@ -2785,7 +2785,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::JiHWkR6DMbpxk9Ip' => + 'generated::4LTXK1oTWKFeD3Cb' => array ( 'methods' => array ( @@ -2797,7 +2797,7 @@ app('router')->setCompiledRoutes( array ( 'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps', 'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps', - 'as' => 'generated::JiHWkR6DMbpxk9Ip', + 'as' => 'generated::4LTXK1oTWKFeD3Cb', ), 'fallback' => false, 'defaults' => @@ -2899,7 +2899,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::hz0HgT5M20cdqDvW' => + 'generated::7k8IXrXuhqtvdTEJ' => array ( 'methods' => array ( @@ -2927,8 +2927,8 @@ app('router')->setCompiledRoutes( return response(\\Illuminate\\Support\\Facades\\View::file(\'/Users/hermanntelser/Sites/nutzwerte_fi4/vendor/laravel/framework/src/Illuminate/Foundation/Configuration\'.\'/../resources/health-up.blade.php\', [ \'exception\' => $exception, ]), status: $exception ? 500 : 200); - }";s:5:"scope";s:54:"Illuminate\\Foundation\\Configuration\\ApplicationBuilder";s:4:"this";N;s:4:"self";s:32:"0000000000000b460000000000000000";}}', - 'as' => 'generated::hz0HgT5M20cdqDvW', + }";s:5:"scope";s:54:"Illuminate\\Foundation\\Configuration\\ApplicationBuilder";s:4:"this";N;s:4:"self";s:32:"0000000000000f1d0000000000000000";}}', + 'as' => 'generated::7k8IXrXuhqtvdTEJ', ), 'fallback' => false, 'defaults' => @@ -2944,7 +2944,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::tULxti3TujxQama0' => + 'generated::wVt9Edv2JKv4tBmL' => array ( 'methods' => array ( @@ -2960,13 +2960,13 @@ app('router')->setCompiledRoutes( ), 'uses' => 'O:55:"Laravel\\SerializableClosure\\UnsignedSerializableClosure":1:{s:12:"serializable";O:46:"Laravel\\SerializableClosure\\Serializers\\Native":5:{s:3:"use";a:0:{}s:8:"function";s:50:"function () { return \\view(\'pages.welcome\'); -}";s:5:"scope";s:37:"Illuminate\\Routing\\RouteFileRegistrar";s:4:"this";N;s:4:"self";s:32:"00000000000023cd0000000000000000";}}', +}";s:5:"scope";s:37:"Illuminate\\Routing\\RouteFileRegistrar";s:4:"this";N;s:4:"self";s:32:"0000000000000f220000000000000000";}}', 'namespace' => NULL, 'prefix' => '', 'where' => array ( ), - 'as' => 'generated::tULxti3TujxQama0', + 'as' => 'generated::wVt9Edv2JKv4tBmL', ), 'fallback' => false, 'defaults' => @@ -2982,7 +2982,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::lLpvehfHNgDA217s' => + 'generated::I9DObLVK6045Uijo' => array ( 'methods' => array ( @@ -2998,13 +2998,13 @@ app('router')->setCompiledRoutes( ), 'uses' => 'O:55:"Laravel\\SerializableClosure\\UnsignedSerializableClosure":1:{s:12:"serializable";O:46:"Laravel\\SerializableClosure\\Serializers\\Native":5:{s:3:"use";a:0:{}s:8:"function";s:52:"function () { return \\view(\'pages.nutzwerte\'); -}";s:5:"scope";s:37:"Illuminate\\Routing\\RouteFileRegistrar";s:4:"this";N;s:4:"self";s:32:"0000000000000af40000000000000000";}}', +}";s:5:"scope";s:37:"Illuminate\\Routing\\RouteFileRegistrar";s:4:"this";N;s:4:"self";s:32:"0000000000000f260000000000000000";}}', 'namespace' => NULL, 'prefix' => '', 'where' => array ( ), - 'as' => 'generated::lLpvehfHNgDA217s', + 'as' => 'generated::I9DObLVK6045Uijo', ), 'fallback' => false, 'defaults' => @@ -3020,7 +3020,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::Rxlv5CDxgAm9l8rY' => + 'generated::UX8coudeJNQNsWfJ' => array ( 'methods' => array ( @@ -3036,13 +3036,13 @@ app('router')->setCompiledRoutes( ), 'uses' => 'O:55:"Laravel\\SerializableClosure\\UnsignedSerializableClosure":1:{s:12:"serializable";O:46:"Laravel\\SerializableClosure\\Serializers\\Native":5:{s:3:"use";a:0:{}s:8:"function";s:51:"function () { return \\view(\'pages.programm\'); -}";s:5:"scope";s:37:"Illuminate\\Routing\\RouteFileRegistrar";s:4:"this";N;s:4:"self";s:32:"0000000000001ad50000000000000000";}}', +}";s:5:"scope";s:37:"Illuminate\\Routing\\RouteFileRegistrar";s:4:"this";N;s:4:"self";s:32:"0000000000000f280000000000000000";}}', 'namespace' => NULL, 'prefix' => '', 'where' => array ( ), - 'as' => 'generated::Rxlv5CDxgAm9l8rY', + 'as' => 'generated::UX8coudeJNQNsWfJ', ), 'fallback' => false, 'defaults' => @@ -3058,7 +3058,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::BdbUDz0C4mIN9uRc' => + 'generated::TJE4yoFuy899QPjC' => array ( 'methods' => array ( @@ -3074,13 +3074,13 @@ app('router')->setCompiledRoutes( ), 'uses' => 'O:55:"Laravel\\SerializableClosure\\UnsignedSerializableClosure":1:{s:12:"serializable";O:46:"Laravel\\SerializableClosure\\Serializers\\Native":5:{s:3:"use";a:0:{}s:8:"function";s:52:"function () { return \\view(\'pages.impressum\'); -}";s:5:"scope";s:37:"Illuminate\\Routing\\RouteFileRegistrar";s:4:"this";N;s:4:"self";s:32:"00000000000028760000000000000000";}}', +}";s:5:"scope";s:37:"Illuminate\\Routing\\RouteFileRegistrar";s:4:"this";N;s:4:"self";s:32:"0000000000000f2a0000000000000000";}}', 'namespace' => NULL, 'prefix' => '', 'where' => array ( ), - 'as' => 'generated::BdbUDz0C4mIN9uRc', + 'as' => 'generated::TJE4yoFuy899QPjC', ), 'fallback' => false, 'defaults' => @@ -3226,7 +3226,7 @@ app('router')->setCompiledRoutes( $config, $isProduction ))($request, $path); - }";s:5:"scope";s:47:"Illuminate\\Filesystem\\FilesystemServiceProvider";s:4:"this";N;s:4:"self";s:32:"0000000000002b4f0000000000000000";}}', + }";s:5:"scope";s:47:"Illuminate\\Filesystem\\FilesystemServiceProvider";s:4:"this";N;s:4:"self";s:32:"0000000000000f360000000000000000";}}', 'as' => 'storage.local', ), 'fallback' => false, @@ -3259,7 +3259,7 @@ app('router')->setCompiledRoutes( $config, $isProduction ))($request, $path); - }";s:5:"scope";s:47:"Illuminate\\Filesystem\\FilesystemServiceProvider";s:4:"this";N;s:4:"self";s:32:"00000000000007640000000000000000";}}', + }";s:5:"scope";s:47:"Illuminate\\Filesystem\\FilesystemServiceProvider";s:4:"this";N;s:4:"self";s:32:"0000000000000f370000000000000000";}}', 'as' => 'storage.local.upload', ), 'fallback' => false, diff --git a/resources/css/pdf-download.css b/resources/css/pdf-download.css index dd9be48..8350eb0 100644 --- a/resources/css/pdf-download.css +++ b/resources/css/pdf-download.css @@ -147,8 +147,6 @@ p { margin-top: 0 !important; } - - .py-1 { padding-top: 1mm; padding-bottom: 1mm; diff --git a/test.html b/test.html index 8d60071..cacc2bc 100644 --- a/test.html +++ b/test.html @@ -1,102 +1,8 @@ -
3.21 TABELLE ZU + ABSCHLÄGE
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Top Nummer - GeschoßTypNutzfläche - Loggia / - sonst. Zusatzflächen - GesamtnutzflächeSonneMondSterneSumme - ProjektMerkmale - Wohnungsbewertung
W01UG2-Zi62,27
W02UG2-Zi67,03
W03UG2-Zi75,24
W04UG2-Zi73,94
W05UG2-Zi72,08
W06UG2-Zi75,42
W07UG2-Zi56,00
W08UG2-Zi54,57
W09UG2-Zi54,51
W10UG2-Zi75,29
W11UG2-Zi72,08
W12UG2-Zi72,45
W13UG2-Zi71,69
\ No newline at end of file +
3.41 DIGITALE SIGNATUR
+

+

+

Innsbruck 17. März 2026

+

+
+
\ No newline at end of file