diff --git a/CHANGES.md b/CHANGES.md new file mode 100644 index 0000000..c994f31 --- /dev/null +++ b/CHANGES.md @@ -0,0 +1,24 @@ +https://www.markdownguide.org/basic-syntax/ + +# TO DO + +> Nummern bei den Methoden +> Farbe Gutachten Deckblatt wählbar +> Schriftgröße Deckblatt etwas größer +> „Seite“ bei Inhaltsverzeichnis +> generell Text etwas größer +> 3.21 Titel nicht fett +> Farbe blau dunkler +> generell Überschriften größerer Schrift +> 3.30 Tabellenformatierung wie im alten +> bei Stellplätze 3.30 Typ im Header, Top Nummer und Geschoss links bündig +> §6 Tabelle linke Linie fehlt + +- Beistrich bei Eingabe statt Punkt +- Inhaltsverzeichnis Textblock +- Gutachten Pxxx WEG 2002 +- generieren wirklich? +- Überschrift nur im Inhaltsverzeichnis anzeigen +- Schriftgröße Hanno Logo +- Räume Methoden Aufstellungen Evaluieren +- Farbe excel Aufstellung heller \ No newline at end of file diff --git a/app/Actions/Generate/Pdf/Deckblatt.php b/app/Actions/Generate/Pdf/Deckblatt.php index f963e53..ad107d5 100644 --- a/app/Actions/Generate/Pdf/Deckblatt.php +++ b/app/Actions/Generate/Pdf/Deckblatt.php @@ -11,7 +11,7 @@ class Deckblatt public static function load($inhalt, $textblock, $textblock2) { // GUTACHTER - $html = '
'; + $html = '
'; $html .= '
'; if (PdfGenerator::$gutachter->logo && PdfGenerator::$gutachter->logo_anzeigen) { $html .= '
'; @@ -29,7 +29,7 @@ class Deckblatt $html .= '
'; $html .= '
'; - $html .= '

'.trim($textblock2).'

'; + $html .= '

'.trim($textblock2).'

'; $html .= '
'; // AUFTRAGGEBER diff --git a/app/Actions/Generate/Pdf/Inhalt.php b/app/Actions/Generate/Pdf/Inhalt.php index c871bbe..6601fb4 100644 --- a/app/Actions/Generate/Pdf/Inhalt.php +++ b/app/Actions/Generate/Pdf/Inhalt.php @@ -19,6 +19,7 @@ class Inhalt $html .= ''; $html .= Html::td(Format::index($inhalt->ordnungszahl), 'center'); $html .= Html::td($inhalt->name); + $html .= Html::td('Seite'); $html .= Html::td(Format::seite($inhalt->seite)); $html .= ''; } diff --git a/app/Actions/Generate/PdfGenerator.php b/app/Actions/Generate/PdfGenerator.php index 8ca715a..ed51405 100644 --- a/app/Actions/Generate/PdfGenerator.php +++ b/app/Actions/Generate/PdfGenerator.php @@ -76,6 +76,13 @@ class PdfGenerator ); $stylesheet = file_get_contents(__DIR__.'/../../../resources/css/pdf-download.css'); + + $bgcolors = []; + $bgcolors["'###BG_DECKBLATT###'"] = self::$projekt->deckblatt_bg; + $bgcolors["'###BG_HEADER###'"] = self::$projekt->schmuckfarbe_header; + $bgcolors["'###FARBE_RAHMEN###'"] = self::$projekt->farbe_borders; + $stylesheet = Platzhalter::replace($bgcolors, $stylesheet); + $mpdf->WriteHTML($stylesheet, HTMLParserMode::HEADER_CSS); $mpdf->SetTitle($filename); $mpdf->SetCreator('nutzwerte.at'); @@ -128,7 +135,7 @@ class PdfGenerator $html .= Nutzwertberechnung::load($projekte_id); break; case '7': - $html .= Zusammenstellung::load($projekte_id); + // $html .= Zusammenstellung::load($projekte_id); break; case '8': // AUFTRAGGEBER diff --git a/app/Actions/Generate/Tabellen/Nutzwertberechnung.php b/app/Actions/Generate/Tabellen/Nutzwertberechnung.php index 8eb06d6..3ea7557 100644 --- a/app/Actions/Generate/Tabellen/Nutzwertberechnung.php +++ b/app/Actions/Generate/Tabellen/Nutzwertberechnung.php @@ -18,7 +18,17 @@ class Nutzwertberechnung $html = ''; foreach ($objekte as $methoden) { - $html .= Html::table_header(['Top Nummer', 'Geschoß', 'Orientierung', 'Typ', '', 'Fläche', '', 'Faktor', '', '', 'Nutzwert'], 'page-break-inside:avoid'); + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; $summe_nutzwert = 0; /** @@ -28,13 +38,13 @@ class Nutzwertberechnung $flaeche = 0; foreach ($methoden[1] as $komponente) { $html .= ''; - $html .= Html::td($komponente['top_nummer'], 'bl bb'); - $html .= Html::td($komponente['geschoss'], 'bl bb'); - $html .= Html::td($komponente['orientierung'], 'bl bb'); - $html .= Html::td($komponente['type'], 'bl bb'); - $html .= Html::td($komponente['raumart'], 'bl bb'); - $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl bb'); - $html .= Html::td('', 'bl bb br', 5); + $html .= Html::td($komponente['top_nummer'], 'bg-user-set'); + $html .= Html::td($komponente['geschoss'], 'bl'); + $html .= Html::td($komponente['orientierung'], 'bl'); + $html .= Html::td($komponente['type'], 'bl'); + $html .= Html::td($komponente['raumart'], 'bl'); + $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl nowrap'); + $html .= Html::td('', 'bl br', 7); $flaeche += $komponente['flaeche']; $html .= ''; } @@ -42,14 +52,20 @@ class Nutzwertberechnung $faktor = (100 + $komponente['objekt_nutzwert']) / 100; $html .= ''; - $html .= Html::td('', 'bl bb', 5); - $html .= Html::td(number_format($flaeche, 2, ',', '.').' m²', 'right bl bb'); - $html .= Html::td('x', 'center bl bb'); - $html .= Html::td(number_format($faktor, 3, ',', '.'), 'center bl bb'); - $html .= Html::td('=', 'center bl bb'); - $html .= Html::td(number_format($flaeche * $faktor, 3, ',', '.'), 'right bl bb'); + $html .= Html::td('', 'bl bg-user-set'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td(number_format($flaeche, 2, ',', '.').' m²', 'right bl nowrap'); + $html .= Html::td('x', 'center bl'); + $html .= Html::td(number_format($faktor, 3, ',', '.'), 'center bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('=', 'center bl'); + $html .= Html::td(number_format($flaeche * $faktor, 3, ',', '.'), 'right bl'); $summe_nutzwert = $flaeche * $faktor; - $html .= Html::td(round($summe_nutzwert), 'center bl bb br'); + $html .= Html::td(round($summe_nutzwert), 'center bl br'); $html .= ''; } @@ -59,26 +75,38 @@ class Nutzwertberechnung if (isset($methoden[2])) { foreach ($methoden[2] as $komponente) { $html .= ''; - $html .= Html::td('', 'bl bb'); - $html .= Html::td($komponente['geschoss'], 'bl bb'); - $html .= Html::td('', 'bl bb'); - $html .= Html::td('', 'bl bb'); - $html .= Html::td($komponente['raumart'], 'bl bb'); - $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl bb'); - $html .= Html::td('x', 'center bl bb'); - $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl bb'); - $html .= Html::td('=', 'center bl bb'); + $html .= Html::td('', 'bl bg-user-set'); + $html .= Html::td($komponente['geschoss'], 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td($komponente['raumart'], 'bl'); + $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('x', 'center bl'); + $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl'); + $html .= Html::td('=', 'center bl'); $nutzwert = $komponente['flaeche'] * $komponente['faktor']; $summe_nutzwert += $nutzwert; - $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl bb'); - $html .= Html::td('', 'center bl bb br'); + $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl'); + $html .= Html::td('', 'center bl br'); $html .= ''; } $html .= ''; - $html .= Html::td('', 'bl bb', 9); - $html .= Html::td(number_format($summe_nutzwert, 3, ',', '.'), 'right bl bb'); - $html .= Html::td(round($summe_nutzwert), 'center bl bb'); + $html .= Html::td('', 'bl bg-user-set'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td(number_format($summe_nutzwert, 3, ',', '.'), 'right bl'); + $html .= Html::td(round($summe_nutzwert), 'center bl br'); $html .= ''; } $summe_nutzwert = round($summe_nutzwert); @@ -89,19 +117,21 @@ class Nutzwertberechnung if (isset($methoden[3])) { foreach ($methoden[3] as $komponente) { $html .= ''; - $html .= Html::td('', 'bl bb'); - $html .= Html::td($komponente['geschoss'], 'bl bb'); - $html .= Html::td('', 'bl bb'); - $html .= Html::td('', 'bl bb'); - $html .= Html::td($komponente['raumart'], 'bl bb'); - $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl bb'); - $html .= Html::td('x', 'center bl bb'); - $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl bb'); - $html .= Html::td('=', 'center bl bb'); + $html .= Html::td('', 'bl bg-user-set'); + $html .= Html::td($komponente['geschoss'], 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td($komponente['raumart'], 'bl'); + $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('x', 'center bl'); + $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl'); + $html .= Html::td('=', 'center bl'); $nutzwert = $komponente['flaeche'] * $komponente['faktor']; - $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl bb'); + $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl'); $nutzwert = round($nutzwert) < 1 ? 1 : round($nutzwert); - $html .= Html::td($nutzwert, 'center bl bb br'); + $html .= Html::td($nutzwert, 'center bl br'); $html .= ''; $summe_nutzwert += $nutzwert; @@ -114,19 +144,21 @@ class Nutzwertberechnung if (isset($methoden[4])) { foreach ($methoden[4] as $komponente) { $html .= ''; - $html .= Html::td('', 'bl bb'); - $html .= Html::td($komponente['geschoss'], 'bl bb'); - $html .= Html::td('', 'bl bb'); - $html .= Html::td('Zubehör', 'bl bb'); - $html .= Html::td($komponente['raumart'], 'bl bb'); - $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl bb'); - $html .= Html::td('x', 'center bl bb'); - $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl bb'); - $html .= Html::td('=', 'center bl bb'); + $html .= Html::td('', 'bl bg-user-set'); + $html .= Html::td($komponente['geschoss'], 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('Zubehör', 'bl'); + $html .= Html::td($komponente['raumart'], 'bl'); + $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('', 'bl'); + $html .= Html::td('x', 'center bl'); + $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl'); + $html .= Html::td('=', 'center bl'); $nutzwert = $komponente['flaeche'] * $komponente['faktor']; - $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl bb'); + $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl'); $nutzwert = round($nutzwert) < 1 ? 1 : round($nutzwert); - $html .= Html::td($nutzwert, 'center bl bb br'); + $html .= Html::td($nutzwert, 'center bl br'); $html .= ''; $summe_nutzwert += $nutzwert; @@ -145,24 +177,32 @@ class Nutzwertberechnung /** * Stellplätze */ - $html .= Html::table_header(['Top Nummer', 'Geschoß', '', 'Fläche', '', 'Faktor', '', '', 'Nutzwert'], 'page-break-inside:avoid'); + $html .= '
Top Nr.GeschoßOrientierungTypRaumartFlächeNutzwert
'; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; $nutzwert = 0; if (isset($methoden[5])) { foreach ($methoden[5] as $komponente) { $html .= ''; - $html .= Html::td($komponente['top_nummer'], 'bl bb'); - $html .= Html::td($komponente['geschoss'], 'bl bb'); - $html .= Html::td($komponente['raumart'], 'bl bb'); - $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl bb'); - $html .= Html::td('x', 'center bl bb'); - $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl bb'); - $html .= Html::td('=', 'center bl bb'); + $html .= Html::td($komponente['top_nummer'], 'bl bg-user-set'); + $html .= Html::td($komponente['geschoss'], 'bl'); + $html .= Html::td($komponente['raumart'], 'bl'); + $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl'); + $html .= Html::td('x', 'center bl'); + $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl'); + $html .= Html::td('=', 'center bl'); $nutzwert = $komponente['flaeche'] * $komponente['faktor']; - $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl bb'); + $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl'); $nutzwert = round($nutzwert) < 1 ? 1 : round($nutzwert); - $html .= Html::td($nutzwert, 'center bl bb br'); + $html .= Html::td($nutzwert, 'center bl br'); $html .= ''; } } diff --git a/app/Actions/Generate/Tabellen/Paragraph6.php b/app/Actions/Generate/Tabellen/Paragraph6.php index 5486572..e36e772 100644 --- a/app/Actions/Generate/Tabellen/Paragraph6.php +++ b/app/Actions/Generate/Tabellen/Paragraph6.php @@ -23,7 +23,7 @@ class Paragraph6 $element = $value?->projektobjekteimdetail->first(); $html .= ''; - $html .= Html::td($value->top_nummer, 'center br bb'); + $html .= Html::td($value->top_nummer, 'center bl br bb'); $html .= Html::td($element->geschoss, 'center br bb'); $html .= Html::td($value->orientierung?->name, 'center br bb'); $html .= Html::td($value->type, 'center br bb'); diff --git a/app/Actions/Generate/Utilities/Html.php b/app/Actions/Generate/Utilities/Html.php index 79c3a23..3cb243f 100644 --- a/app/Actions/Generate/Utilities/Html.php +++ b/app/Actions/Generate/Utilities/Html.php @@ -10,18 +10,18 @@ class Html $html = '
Top Nr.GeschoßRaumartFlächeNutzwert
'; $html .= ''; foreach ($header_row as $value) { - $html .= ''; + $html .= ''; } $html .= ''; return $html; } - public static function table_footer($nutzwert_summe, $colspan = 10) + public static function table_footer($nutzwert_summe, $colspan = 12) { $html = ''; - $html .= ''; - $html .= ''; + $html .= ''; + $html .= ''; $html .= ''; return $html; @@ -33,7 +33,7 @@ class Html $html .= ''; $mm = 190 / \count($header_row); foreach ($header_row as $value) { - $html .= ''; + $html .= ''; } $html .= ''; @@ -45,11 +45,11 @@ class Html $html = '
'.$value.''.$value.'
Nutzwert gerundet'.$nutzwert_summe.'Nutzwert gerundet'.$nutzwert_summe.'
'.$value.' '.$value.' 
'; foreach ($header_row as $value) { - $html .= ''; + $html .= ''; } $html .= ''; foreach ($header_row as $value) { - $html .= ''; + $html .= ''; } $html .= ''; diff --git a/app/Filament/Resources/Projektes/Schemas/ProjekteForm.php b/app/Filament/Resources/Projektes/Schemas/ProjekteForm.php index 308b71b..716f11f 100644 --- a/app/Filament/Resources/Projektes/Schemas/ProjekteForm.php +++ b/app/Filament/Resources/Projektes/Schemas/ProjekteForm.php @@ -31,6 +31,7 @@ class ProjekteForm ->contained(false) ->tabs([ Tab::make('Benennung') + ->icon('phosphor-article-medium') ->schema([ TextInput::make('offizieller_name') ->label('Offizieller Name') @@ -60,6 +61,10 @@ class ProjekteForm 'Als Platzhalter "###INTERNER_NAME###"', ]) ->required(), + ])->columns(2), + Tab::make('Ort & Datum') + ->icon('phosphor-calendar-check') + ->schema([ TextInput::make('ort')->required()->suffix('am') ->belowContent([ 'Als Platzhalter "###ORT###"', @@ -70,9 +75,9 @@ class ProjekteForm ->belowContent([ 'Als Platzhalter "###DATUM###"', ]), - ColorPicker::make('deckblatt_bg')->label('Deckblatt Hintegrund Farbe'), ])->columns(2), - Tab::make('Zuordnung') + Tab::make('Gutachter & Auftraggeber') + ->icon('phosphor-identification-card') ->schema([ Select::make('gutachter_id')->relationship(name: 'gutachter', titleAttribute: 'company')->required(), Select::make('auftraggeber_id') @@ -82,9 +87,11 @@ class ProjekteForm ->required(), Radio::make('status')->options(ProjektStatus::class)->required(), ]), - Tab::make('Beschreibung') + Tab::make('Notizen') + ->icon('phosphor-notebook') ->schema([ RichEditor::make('beschreibung') + ->label('Notizen') ->extraInputAttributes(['style' => 'min-height: 20rem; max-height: 50vh; overflow-y: auto;']) ->toolbarButtons([ ['bold', 'italic', 'underline', 'strike', 'subscript', 'superscript', 'link', 'textColor', 'clearFormatting'], @@ -102,6 +109,17 @@ class ProjekteForm ]) ->columnSpan(2), ]), + Tab::make('Farben') + ->icon('phosphor-palette') + ->schema([ + ColorPicker::make('deckblatt_bg')->label('Deckblatt') + ->belowContent('Farbe des Hintergrundes am Deckblatt.'), + ColorPicker::make('schmuckfarbe_header')->label('Überschriften') + ->belowContent('Farbe des Hintergrundes bei Überschriften.'), + ColorPicker::make('farbe_borders')->label('Rahmen') + ->belowContent('Farbe von Rahmen und Rändern bei Tabellen und Boxen.'), + ])->columns(3) + ->columnSpanFull(), ]), ])->columnSpanFull(), diff --git a/app/Models/Projekte.php b/app/Models/Projekte.php index d2f121e..8c89ae0 100644 --- a/app/Models/Projekte.php +++ b/app/Models/Projekte.php @@ -18,6 +18,8 @@ class Projekte extends Model 'erstellung', 'status', 'deckblatt_bg', + 'schmuckfarbe_header', + 'farbe_borders', 'evaluation_gutachten', 'bezahlt_am', ]; diff --git a/bootstrap/cache/blade-icons.php b/bootstrap/cache/blade-icons.php index fbdc385..c5e18e5 100755 --- a/bootstrap/cache/blade-icons.php +++ b/bootstrap/cache/blade-icons.php @@ -1,7 +1,7 @@ array ( - '/Users/salam/Sites/nutzwerte_fi4/resources/svg' => + '/Users/hermanntelser/Sites/nutzwerte_fi4/resources/svg' => array ( 0 => 'excel', 1 => 'logo', @@ -11,7 +11,7 @@ ), 'heroicons' => array ( - '/Users/salam/Sites/nutzwerte_fi4/vendor/blade-ui-kit/blade-heroicons/src/../resources/svg' => + '/Users/hermanntelser/Sites/nutzwerte_fi4/vendor/blade-ui-kit/blade-heroicons/src/../resources/svg' => array ( 0 => 'c-academic-cap', 1 => 'c-adjustments-horizontal', @@ -1305,7 +1305,7 @@ ), 'phosphor-icons' => array ( - '/Users/salam/Sites/nutzwerte_fi4/vendor/codeat3/blade-phosphor-icons/src/../resources/svg' => + '/Users/hermanntelser/Sites/nutzwerte_fi4/vendor/codeat3/blade-phosphor-icons/src/../resources/svg' => array ( 0 => 'acorn-bold', 1 => 'acorn-duotone', @@ -10383,7 +10383,7 @@ ), 'filament' => array ( - '/Users/salam/Sites/nutzwerte_fi4/vendor/filament/support/src/../resources/svg' => + '/Users/hermanntelser/Sites/nutzwerte_fi4/vendor/filament/support/src/../resources/svg' => array ( 0 => 'o-align-center', 1 => 'o-align-end', @@ -10420,7 +10420,7 @@ ), 'lucide' => array ( - '/Users/salam/Sites/nutzwerte_fi4/vendor/mallardduck/blade-lucide-icons/src/../resources/svg' => + '/Users/hermanntelser/Sites/nutzwerte_fi4/vendor/mallardduck/blade-lucide-icons/src/../resources/svg' => array ( 0 => 'a-arrow-down', 1 => 'a-arrow-up', diff --git a/bootstrap/cache/config.php b/bootstrap/cache/config.php index b7d820e..f9001dd 100644 --- a/bootstrap/cache/config.php +++ b/bootstrap/cache/config.php @@ -81,9 +81,9 @@ array ( 'paths' => array ( - 0 => '/Users/salam/Sites/nutzwerte_fi4/resources/views', + 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/resources/views', ), - 'compiled' => '/Users/salam/Sites/nutzwerte_fi4/storage/framework/views', + 'compiled' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/framework/views', ), 'cors' => array ( @@ -126,7 +126,7 @@ 'fallback_locale' => 'en', 'faker_locale' => 'de_AT', 'cipher' => 'AES-256-CBC', - 'key' => 'base64:zrVnUcBmUGjEV/EoAKnZCm/1FWplKu79kYBvevE2/ek=', + 'key' => 'base64:3uv/ppXplpqmYtiZ5ZyILnoOTmKfZAz27bfsnR1qmaE=', 'previous_keys' => array ( ), @@ -301,8 +301,8 @@ 'file' => array ( 'driver' => 'file', - 'path' => '/Users/salam/Sites/nutzwerte_fi4/storage/framework/cache/data', - 'lock_path' => '/Users/salam/Sites/nutzwerte_fi4/storage/framework/cache/data', + 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/framework/cache/data', + 'lock_path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/framework/cache/data', ), 'memcached' => array ( @@ -522,7 +522,7 @@ ), 'policies' => array ( - 'path' => '/Users/salam/Sites/nutzwerte_fi4/app/Policies', + 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Policies', 'merge' => true, 'generate' => true, 'methods' => @@ -610,7 +610,7 @@ 'local' => array ( 'driver' => 'local', - 'root' => '/Users/salam/Sites/nutzwerte_fi4/storage/app/private', + 'root' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/private', 'serve' => true, 'throw' => false, 'report' => false, @@ -618,7 +618,7 @@ 'public' => array ( 'driver' => 'local', - 'root' => '/Users/salam/Sites/nutzwerte_fi4/storage/app/public', + 'root' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/public', 'url' => 'http://nutzwerte_fi4.test/storage', 'visibility' => 'public', 'throw' => false, @@ -640,7 +640,7 @@ 'promotion' => array ( 'driver' => 'local', - 'root' => '/Users/salam/Sites/nutzwerte_fi4/storage/app/public/promotion', + 'root' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/public/promotion', 'url' => 'http://nutzwerte_fi4.test/storage/promotion', 'visibility' => 'public', 'throw' => false, @@ -648,7 +648,7 @@ ), 'links' => array ( - '/Users/salam/Sites/nutzwerte_fi4/public/storage' => '/Users/salam/Sites/nutzwerte_fi4/storage/app/public', + '/Users/hermanntelser/Sites/nutzwerte_fi4/public/storage' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/public', ), ), 'logging' => @@ -673,14 +673,14 @@ 'single' => array ( 'driver' => 'single', - 'path' => '/Users/salam/Sites/nutzwerte_fi4/storage/logs/laravel.log', + 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/logs/laravel.log', 'level' => 'debug', 'replace_placeholders' => true, ), 'daily' => array ( 'driver' => 'daily', - 'path' => '/Users/salam/Sites/nutzwerte_fi4/storage/logs/laravel.log', + 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/logs/laravel.log', 'level' => 'debug', 'days' => 14, 'replace_placeholders' => true, @@ -745,7 +745,7 @@ ), 'emergency' => array ( - 'path' => '/Users/salam/Sites/nutzwerte_fi4/storage/logs/laravel.log', + 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/logs/laravel.log', ), ), ), @@ -844,7 +844,7 @@ 'theme' => 'default', 'paths' => array ( - 0 => '/Users/salam/Sites/nutzwerte_fi4/resources/views/vendor/mail', + 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/resources/views/vendor/mail', ), ), ), @@ -931,7 +931,7 @@ ), 'queue' => array ( - 'default' => 'sync', + 'default' => 'database', 'connections' => array ( 'sync' => @@ -1033,7 +1033,7 @@ 'lifetime' => 120, 'expire_on_close' => false, 'encrypt' => false, - 'files' => '/Users/salam/Sites/nutzwerte_fi4/storage/framework/sessions', + 'files' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/framework/sessions', 'connection' => NULL, 'table' => 'sessions', 'store' => NULL, @@ -1081,7 +1081,7 @@ ), 'default_filesystem_disk' => 'local', 'assets_path' => NULL, - 'cache_path' => '/Users/salam/Sites/nutzwerte_fi4/bootstrap/cache/filament', + 'cache_path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/bootstrap/cache/filament', 'livewire_loading_delay' => 'default', 'file_generation' => array ( @@ -1094,7 +1094,7 @@ 'livewire' => array ( 'class_namespace' => 'App\\Livewire', - 'view_path' => '/Users/salam/Sites/nutzwerte_fi4/resources/views/livewire', + 'view_path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/resources/views/livewire', 'layout' => 'components.layouts.app', 'lazy_placeholder' => NULL, 'temporary_file_upload' => diff --git a/bootstrap/cache/filament/panels/admin.php b/bootstrap/cache/filament/panels/admin.php index 88677f0..09681c5 100644 --- a/bootstrap/cache/filament/panels/admin.php +++ b/bootstrap/cache/filament/panels/admin.php @@ -70,9 +70,9 @@ ), 'clusters' => array ( - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Clusters/Administration/AdministrationCluster.php' => 'App\\Filament\\Clusters\\Administration\\AdministrationCluster', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Clusters/Projekte/ProjekteCluster.php' => 'App\\Filament\\Clusters\\Projekte\\ProjekteCluster', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Clusters/Verwaltung/VerwaltungCluster.php' => 'App\\Filament\\Clusters\\Verwaltung\\VerwaltungCluster', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Clusters/Administration/AdministrationCluster.php' => 'App\\Filament\\Clusters\\Administration\\AdministrationCluster', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Clusters/Projekte/ProjekteCluster.php' => 'App\\Filament\\Clusters\\Projekte\\ProjekteCluster', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Clusters/Verwaltung/VerwaltungCluster.php' => 'App\\Filament\\Clusters\\Verwaltung\\VerwaltungCluster', ), 'clusteredComponents' => array ( @@ -97,7 +97,7 @@ ), 'clusterDirectories' => array ( - 0 => '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Clusters', + 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Clusters', ), 'clusterNamespaces' => array ( @@ -105,14 +105,14 @@ ), 'pages' => array ( - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Clusters/Administration/AdministrationCluster.php' => 'App\\Filament\\Clusters\\Administration\\AdministrationCluster', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Clusters/Projekte/ProjekteCluster.php' => 'App\\Filament\\Clusters\\Projekte\\ProjekteCluster', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Clusters/Verwaltung/VerwaltungCluster.php' => 'App\\Filament\\Clusters\\Verwaltung\\VerwaltungCluster', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Clusters/Administration/AdministrationCluster.php' => 'App\\Filament\\Clusters\\Administration\\AdministrationCluster', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Clusters/Projekte/ProjekteCluster.php' => 'App\\Filament\\Clusters\\Projekte\\ProjekteCluster', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Clusters/Verwaltung/VerwaltungCluster.php' => 'App\\Filament\\Clusters\\Verwaltung\\VerwaltungCluster', 0 => 'Filament\\Pages\\Dashboard', ), 'pageDirectories' => array ( - 0 => '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Pages', + 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Pages', ), 'pageNamespaces' => array ( @@ -120,23 +120,23 @@ ), 'resources' => array ( - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Auftraggebers/AuftraggeberResource.php' => 'App\\Filament\\Resources\\Auftraggebers\\AuftraggeberResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Gutachters/GutachterResource.php' => 'App\\Filament\\Resources\\Gutachters\\GutachterResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Helps/HelpResource.php' => 'App\\Filament\\Resources\\Helps\\HelpResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Inhaltsverzeichnis/InhaltsverzeichnisResource.php' => 'App\\Filament\\Resources\\Inhaltsverzeichnis\\InhaltsverzeichnisResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/KontoTextblocks/KontoTextblockResource.php' => 'App\\Filament\\Resources\\KontoTextblocks\\KontoTextblockResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Kontos/KontoResource.php' => 'App\\Filament\\Resources\\Kontos\\KontoResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Methodes/MethodeResource.php' => 'App\\Filament\\Resources\\Methodes\\MethodeResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Orientierungs/OrientierungResource.php' => 'App\\Filament\\Resources\\Orientierungs\\OrientierungResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Permissions/PermissionResource.php' => 'App\\Filament\\Resources\\Permissions\\PermissionResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Projektes/ProjekteResource.php' => 'App\\Filament\\Resources\\Projektes\\ProjekteResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Textblocks/TextblockResource.php' => 'App\\Filament\\Resources\\Textblocks\\TextblockResource', - '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources/Users/UserResource.php' => 'App\\Filament\\Resources\\Users\\UserResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Auftraggebers/AuftraggeberResource.php' => 'App\\Filament\\Resources\\Auftraggebers\\AuftraggeberResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Gutachters/GutachterResource.php' => 'App\\Filament\\Resources\\Gutachters\\GutachterResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Helps/HelpResource.php' => 'App\\Filament\\Resources\\Helps\\HelpResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Inhaltsverzeichnis/InhaltsverzeichnisResource.php' => 'App\\Filament\\Resources\\Inhaltsverzeichnis\\InhaltsverzeichnisResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/KontoTextblocks/KontoTextblockResource.php' => 'App\\Filament\\Resources\\KontoTextblocks\\KontoTextblockResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Kontos/KontoResource.php' => 'App\\Filament\\Resources\\Kontos\\KontoResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Methodes/MethodeResource.php' => 'App\\Filament\\Resources\\Methodes\\MethodeResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Orientierungs/OrientierungResource.php' => 'App\\Filament\\Resources\\Orientierungs\\OrientierungResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Permissions/PermissionResource.php' => 'App\\Filament\\Resources\\Permissions\\PermissionResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Projektes/ProjekteResource.php' => 'App\\Filament\\Resources\\Projektes\\ProjekteResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Textblocks/TextblockResource.php' => 'App\\Filament\\Resources\\Textblocks\\TextblockResource', + '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources/Users/UserResource.php' => 'App\\Filament\\Resources\\Users\\UserResource', 0 => 'BezhanSalleh\\FilamentShield\\Resources\\Roles\\RoleResource', ), 'resourceDirectories' => array ( - 0 => '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources', + 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources', ), 'resourceNamespaces' => array ( @@ -149,7 +149,7 @@ ), 'widgetDirectories' => array ( - 0 => '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Widgets', + 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Widgets', ), 'widgetNamespaces' => array ( diff --git a/bootstrap/cache/routes-v7.php b/bootstrap/cache/routes-v7.php index 5307577..7c9f54f 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::uwRpOS4msfgMPLUO', + '_route' => 'generated::3o8r6SFhHYJXudVU', ), 1 => NULL, 2 => @@ -551,7 +551,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::N99mhs2lj0LpWDwf', + '_route' => 'generated::OmrEE69cygLxgFKH', ), 1 => NULL, 2 => @@ -609,7 +609,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::VY5gvGiICTLwb0GL', + '_route' => 'generated::scp8kliSZRCopV7D', ), 1 => NULL, 2 => @@ -629,7 +629,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::bOVniSvjKdfaigeS', + '_route' => 'generated::38LWocxhMLlc4pNK', ), 1 => NULL, 2 => @@ -649,7 +649,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::upvT1IaMSI0hxksR', + '_route' => 'generated::PVoorV8JM5zFb8Be', ), 1 => NULL, 2 => @@ -669,7 +669,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::6M4OIDX8e1P35euL', + '_route' => 'generated::CLZkTmw90AqCSfdu', ), 1 => NULL, 2 => @@ -689,7 +689,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::WojXU4KMU8NmoMIQ', + '_route' => 'generated::jdlWZ8tNhTDVD3kW', ), 1 => NULL, 2 => @@ -2738,7 +2738,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::uwRpOS4msfgMPLUO' => + 'generated::3o8r6SFhHYJXudVU' => array ( 'methods' => array ( @@ -2750,7 +2750,7 @@ app('router')->setCompiledRoutes( array ( 'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile', 'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile', - 'as' => 'generated::uwRpOS4msfgMPLUO', + 'as' => 'generated::3o8r6SFhHYJXudVU', ), 'fallback' => false, 'defaults' => @@ -2766,7 +2766,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::N99mhs2lj0LpWDwf' => + 'generated::OmrEE69cygLxgFKH' => array ( 'methods' => array ( @@ -2778,7 +2778,7 @@ app('router')->setCompiledRoutes( array ( 'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps', 'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps', - 'as' => 'generated::N99mhs2lj0LpWDwf', + 'as' => 'generated::OmrEE69cygLxgFKH', ), 'fallback' => false, 'defaults' => @@ -2880,7 +2880,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::VY5gvGiICTLwb0GL' => + 'generated::scp8kliSZRCopV7D' => array ( 'methods' => array ( @@ -2890,7 +2890,7 @@ app('router')->setCompiledRoutes( 'uri' => 'up', 'action' => array ( - '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:826:"function () { + '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:834:"function () { $exception = null; try { @@ -2905,11 +2905,11 @@ app('router')->setCompiledRoutes( $exception = $e->getMessage(); } - return response(\\Illuminate\\Support\\Facades\\View::file(\'/Users/salam/Sites/nutzwerte_fi4/vendor/laravel/framework/src/Illuminate/Foundation/Configuration\'.\'/../resources/health-up.blade.php\', [ + 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:"0000000000000f6a0000000000000000";}}', - 'as' => 'generated::VY5gvGiICTLwb0GL', + 'as' => 'generated::scp8kliSZRCopV7D', ), 'fallback' => false, 'defaults' => @@ -2925,7 +2925,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::bOVniSvjKdfaigeS' => + 'generated::38LWocxhMLlc4pNK' => array ( 'methods' => array ( @@ -2947,7 +2947,7 @@ app('router')->setCompiledRoutes( 'where' => array ( ), - 'as' => 'generated::bOVniSvjKdfaigeS', + 'as' => 'generated::38LWocxhMLlc4pNK', ), 'fallback' => false, 'defaults' => @@ -2963,7 +2963,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::upvT1IaMSI0hxksR' => + 'generated::PVoorV8JM5zFb8Be' => array ( 'methods' => array ( @@ -2985,7 +2985,7 @@ app('router')->setCompiledRoutes( 'where' => array ( ), - 'as' => 'generated::upvT1IaMSI0hxksR', + 'as' => 'generated::PVoorV8JM5zFb8Be', ), 'fallback' => false, 'defaults' => @@ -3001,7 +3001,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::6M4OIDX8e1P35euL' => + 'generated::CLZkTmw90AqCSfdu' => array ( 'methods' => array ( @@ -3023,7 +3023,7 @@ app('router')->setCompiledRoutes( 'where' => array ( ), - 'as' => 'generated::6M4OIDX8e1P35euL', + 'as' => 'generated::CLZkTmw90AqCSfdu', ), 'fallback' => false, 'defaults' => @@ -3039,7 +3039,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::WojXU4KMU8NmoMIQ' => + 'generated::jdlWZ8tNhTDVD3kW' => array ( 'methods' => array ( @@ -3061,7 +3061,7 @@ app('router')->setCompiledRoutes( 'where' => array ( ), - 'as' => 'generated::WojXU4KMU8NmoMIQ', + 'as' => 'generated::jdlWZ8tNhTDVD3kW', ), 'fallback' => false, 'defaults' => @@ -3201,7 +3201,7 @@ app('router')->setCompiledRoutes( 'uri' => 'storage/{path}', 'action' => array ( - 'uses' => 'O:55:"Laravel\\SerializableClosure\\UnsignedSerializableClosure":1:{s:12:"serializable";O:46:"Laravel\\SerializableClosure\\Serializers\\Native":5:{s:3:"use";a:3:{s:4:"disk";s:5:"local";s:6:"config";a:5:{s:6:"driver";s:5:"local";s:4:"root";s:52:"/Users/salam/Sites/nutzwerte_fi4/storage/app/private";s:5:"serve";b:1;s:5:"throw";b:0;s:6:"report";b:0;}s:12:"isProduction";b:0;}s:8:"function";s:323:"function (\\Illuminate\\Http\\Request $request, string $path) use ($disk, $config, $isProduction) { + 'uses' => 'O:55:"Laravel\\SerializableClosure\\UnsignedSerializableClosure":1:{s:12:"serializable";O:46:"Laravel\\SerializableClosure\\Serializers\\Native":5:{s:3:"use";a:3:{s:4:"disk";s:5:"local";s:6:"config";a:5:{s:6:"driver";s:5:"local";s:4:"root";s:60:"/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/private";s:5:"serve";b:1;s:5:"throw";b:0;s:6:"report";b:0;}s:12:"isProduction";b:0;}s:8:"function";s:323:"function (\\Illuminate\\Http\\Request $request, string $path) use ($disk, $config, $isProduction) { return (new \\Illuminate\\Filesystem\\ServeFile( $disk, $config, diff --git a/database/migrations/2025_09_24_131440_create_projektes_table.php b/database/migrations/2025_09_24_131440_create_projektes_table.php index fb2a6db..7ea2f1d 100644 --- a/database/migrations/2025_09_24_131440_create_projektes_table.php +++ b/database/migrations/2025_09_24_131440_create_projektes_table.php @@ -23,6 +23,8 @@ return new class extends Migration $table->string('erstellung')->nullable(); $table->string('status')->default('entwurf'); $table->string('deckblatt_bg')->default('#efefef'); + $table->string('schmuckfarbe_header')->default('#bedbff'); + $table->string('farbe_borders')->default('#99a1af'); $table->boolean('evaluation_gutachten')->default(0); $table->timestamp('bezahlt_am')->nullable(); $table->timestamps(); diff --git a/public/storage b/public/storage index c5aab61..2935def 120000 --- a/public/storage +++ b/public/storage @@ -1 +1 @@ -/Users/salam/Sites/nutzwerte_fi4/storage/app/public \ No newline at end of file +/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/public \ No newline at end of file diff --git a/resources/css/pdf-download.css b/resources/css/pdf-download.css index 76ef8b4..edcab22 100644 --- a/resources/css/pdf-download.css +++ b/resources/css/pdf-download.css @@ -1,12 +1,13 @@ body { - font-family: Verdana, Tahoma, sans-serif; - font-size: 11pt; - font-weight: normal; + font-family: Arial, Helvetica, sans-serif; + font-size: 9.5pt !important; + font-weight: thin; line-height: 13pt; } #deckblatt { position: absolute; + background-color: '###BG_DECKBLATT###'; top: 0; bottom: 0; left: 0; @@ -18,64 +19,63 @@ body { /** POSITION FIXED */ #deckblatt-gutachter { - position: absolute; - margin-top: 12mm; - width: 200mm; + margin: 12mm 10mm; height: 100mm; -} - -#deckblatt-projekt { - position: absolute; - margin-left: 16mm; - height: 40mm; - width: 190mm; -} - -#deckblatt-festsetzung { - position: absolute; - text-align: right; - font-weight: bold; - margin-top: 12mm; - height: 60mm; - width: 195mm; + overflow: hidden; } #deckblatt-logo-gutachter { background-size: contain; background-repeat: no-repeat; margin-bottom: 1mm; + overflow: hidden; } -#deckblatt-auftraggeber { - position: absolute; +#deckblatt-projekt { + margin: auto 10mm; + height: 60mm; + overflow: hidden; +} + +#deckblatt-festsetzung { text-align: right; - margin-top: 20mm; - height: 40mm; - width: 195mm; + font-weight: bold; + margin: auto 10mm; + height: 55mm; + overflow: hidden; } #deckblatt-logo-auftraggeber { - width: 255mm; height: 20mm; background-size: contain; background-repeat: no-repeat; background-position: center right; margin-bottom: 1mm; + overflow: hidden; } +#deckblatt-auftraggeber { + text-align: right; + margin: auto 10mm; + height: 50mm; + overflow: hidden; +} + + /** FORMATTING */ .header { - padding: 1.3mm 3mm; - margin: 9mm 0 5mm; + padding: 1.5mm 3mm; + margin: 11mm auto 5mm; font-size: 14px; - border: 0.3mm solid #e5e7eb; - background-color: #eff6ff; + border: 0.3mm solid '###FARBE_RAHMEN###'; + background-color: '###BG_HEADER###'; + font-size: 11.5pt; } h1 { - font-size: 22pt; + font-size: 24pt; line-height: 26pt; } @@ -89,6 +89,11 @@ h3 { line-height: auto; } +h4 { + font-size: 11pt; + line-height: auto; +} + .small { font-size: 7pt; line-height: 9pt; @@ -103,6 +108,11 @@ a { font-weight: bold; } +.normal { + font-weight: normal; +} + + .right { text-align: right; } @@ -111,13 +121,17 @@ a { text-align: center; } +.nowrap { + white-space: nowrap; +} + /** FARBEN */ .gray { color: #4a5565; } -.bg-sky { - background-color: #eff6ff !important; +.bg-user-set { + background-color: '###BG_HEADER###'; } .bg-white { @@ -153,6 +167,10 @@ p { padding-bottom: 2mm; } +.pl-2 { + padding-left: 4mm; +} + .m10 { margin: 10px; } @@ -177,11 +195,11 @@ p { GUTACHTEN TABELLEN */ table { + font-size: 8.5pt; border-collapse: collapse; border-spacing: 0; empty-cells: show; width: 100% !important; - font-size: 11px; margin-top: 10mm; margin-bottom: 10mm; } @@ -197,6 +215,7 @@ td { th { padding: 5px 7px; + white-space: nowrap; } .w30 { @@ -220,21 +239,21 @@ th { } .border { - border: 0.3mm solid #e5e7eb; + border: 0.3mm solid '###FARBE_RAHMEN###'; } .bt { - border-top: 0.3mm solid #e5e7eb; + border-top: 0.3mm solid '###FARBE_RAHMEN###'; } .bb { - border-bottom: 0.3mm solid #e5e7eb; + border-bottom: 0.3mm solid '###FARBE_RAHMEN###'; } .bl { - border-left: 0.3mm solid #e5e7eb; + border-left: 0.3mm solid '###FARBE_RAHMEN###'; } .br { - border-right: 0.3mm solid #e5e7eb; + border-right: 0.3mm solid '###FARBE_RAHMEN###'; } \ No newline at end of file diff --git a/storage/hvf-logos/logo hanno.afphoto b/storage/hvf-logos/logo hanno.afphoto new file mode 100644 index 0000000..61863b7 Binary files /dev/null and b/storage/hvf-logos/logo hanno.afphoto differ
'.$value.''.$value.''.$value.''.$value.'