diff --git a/app/Actions/Create/CreateProjektInhaltsverzeichnis.php b/app/Actions/Create/CreateProjektInhaltsverzeichnis.php index 597c24e..f69f708 100644 --- a/app/Actions/Create/CreateProjektInhaltsverzeichnis.php +++ b/app/Actions/Create/CreateProjektInhaltsverzeichnis.php @@ -13,6 +13,7 @@ class CreateProjektInhaltsverzeichnis ProjektInhaltsverzeichnis::where('projekte_id', $record->id)->delete(); $inhaltsverzeichnis = Inhaltsverzeichnis::get(); + $part = 1; foreach ($inhaltsverzeichnis as $inhalt) { $textblock = ''; @@ -20,6 +21,10 @@ class CreateProjektInhaltsverzeichnis $textblock = Textblock::where('id', $inhalt->textblock_id)->pluck('textblock')->first(); } + if ($inhalt->tabellen_id == 5) { + $part = 2; + } + ProjektInhaltsverzeichnis::updateOrCreate( [ 'projekte_id' => $record->id, @@ -32,9 +37,11 @@ class CreateProjektInhaltsverzeichnis 'ueberschrift_anzeigen' => $inhalt->ueberschrift_anzeigen, 'tabellen_id' => $inhalt->tabellen_id, 'textblock_id' => $inhalt->textblock_id, + 'part' => $part, 'seite' => $inhalt->seite, 'neue_seite' => $inhalt->neue_seite, 'seitenzahl_anzeige' => $inhalt->seitenzahl_anzeige, + 'no_edit' => $inhalt->no_edit, 'textblock' => $textblock, ]); } diff --git a/app/Actions/Generate/MakeGutachten.php b/app/Actions/Generate/MakeGutachten.php index ff80dc2..2a54368 100644 --- a/app/Actions/Generate/MakeGutachten.php +++ b/app/Actions/Generate/MakeGutachten.php @@ -36,7 +36,7 @@ class MakeGutachten public static function generate($filepath, $projekte_id) { - self::$inhaltesverzeichnis = ProjektInhaltsverzeichnis::where('projekte_id', $projekte_id)->orderBy('sort')->get(); + self::$inhaltesverzeichnis = ProjektInhaltsverzeichnis::where('projekte_id', $projekte_id)->where('part', 1)->orderBy('sort')->get(); self::$projekt = Projekte::where('id', $projekte_id)->first(); diff --git a/app/Filament/Resources/Inhaltsverzeichnis/Schemas/InhaltsverzeichnisForm.php b/app/Filament/Resources/Inhaltsverzeichnis/Schemas/InhaltsverzeichnisForm.php index 7cebdc5..724015f 100644 --- a/app/Filament/Resources/Inhaltsverzeichnis/Schemas/InhaltsverzeichnisForm.php +++ b/app/Filament/Resources/Inhaltsverzeichnis/Schemas/InhaltsverzeichnisForm.php @@ -20,14 +20,18 @@ class InhaltsverzeichnisForm Section::make('Überschrift') ->schema([ Checkbox::make('neue_seite') - ->label('Start neuer Seite') - ->columnSpan(2), + ->label('Start neuer Seite'), + Checkbox::make('ueberschrift_anzeigen') + ->label('Überschrift angezeigen'), Textarea::make('name') ->required() - ->label('Kapitel / Absatz') + ->label('Überschrift in der Inhaltsangabe') ->columnSpan(2), - Checkbox::make('ueberschrift_anzeigen') - ->label('Überschrift angezeigen') + Textarea::make('name2') + ->label('Überschrift im Dokument') + ->belowContent([ + 'Bei abweichender Überschrift im Dokument', + ]) ->columnSpan(2), TextInput::make('ordnungszahl') ->label('Kapitel Index') diff --git a/app/Filament/Resources/Inhaltsverzeichnis/Tables/InhaltsverzeichnisTable.php b/app/Filament/Resources/Inhaltsverzeichnis/Tables/InhaltsverzeichnisTable.php index f5c5862..5d8e9df 100644 --- a/app/Filament/Resources/Inhaltsverzeichnis/Tables/InhaltsverzeichnisTable.php +++ b/app/Filament/Resources/Inhaltsverzeichnis/Tables/InhaltsverzeichnisTable.php @@ -4,10 +4,9 @@ namespace App\Filament\Resources\Inhaltsverzeichnis\Tables; use Filament\Actions\DeleteAction; use Filament\Actions\EditAction; -use Filament\Support\Enums\FontWeight; +use Filament\Support\Icons\Heroicon; use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\TextColumn; -use Filament\Tables\Columns\ToggleColumn; use Filament\Tables\Table; class InhaltsverzeichnisTable @@ -28,14 +27,16 @@ class InhaltsverzeichnisTable '1' => 'phosphor-file-plus', default => '' }), + IconColumn::make('ueberschrift_anzeigen') + ->label('') + ->tooltip('Überschrift anzeigen') + ->icon(fn (string $state): Heroicon => match ($state) { + '1' => Heroicon::OutlinedEye, + '0' => Heroicon::OutlinedEyeSlash, + }), TextColumn::make('name') ->label('Überschrift') - ->wrap() - ->weight(fn ($record): FontWeight => match ($record->ueberschrift_anzeigen) { - 1 => FontWeight::Thin, - default => FontWeight::SemiBold, - }), - // ToggleColumn::make('ueberschrift_anzeigen')->label('')->tooltip('Überschrift im PDF anzeigen'), + ->wrap(), TextColumn::make('tabellen.name')->wrap()->label('Tabelle'), TextColumn::make('textblock.name')->wrap(), TextColumn::make('seite') @@ -47,7 +48,7 @@ class InhaltsverzeichnisTable ->defaultSort('sort', direction: 'asc') ->reorderable('sort') ->recordActions([ - EditAction::make()->iconButton(), + EditAction::make()->iconButton()->hidden(fn ($record) => (bool) $record->no_edit), DeleteAction::make()->iconButton(), ]); } diff --git a/app/Filament/Resources/Projektes/RelationManagers/ProjektInhaltsverzeichnisRelationManager.php b/app/Filament/Resources/Projektes/RelationManagers/ProjektInhaltsverzeichnisRelationManager.php index 4c025bd..afb69d0 100644 --- a/app/Filament/Resources/Projektes/RelationManagers/ProjektInhaltsverzeichnisRelationManager.php +++ b/app/Filament/Resources/Projektes/RelationManagers/ProjektInhaltsverzeichnisRelationManager.php @@ -52,15 +52,20 @@ class ProjektInhaltsverzeichnisRelationManager extends RelationManager ->hidden(fn ($record) => $record->name == 'DECKBLATT' ? true : false) ->schema([ Checkbox::make('neue_seite') - ->label('Start neuer Seite') - ->columnSpan(2), + ->label('Start neuer Seite'), + Checkbox::make('ueberschrift_anzeigen') + ->label('Überschrift angezeigen'), Textarea::make('name') ->required() - ->label('Kapitel / Absatz') + ->label('Überschrift in der Inhaltsangabe') ->columnSpan(2), - Checkbox::make('ueberschrift_anzeigen') - ->label('Überschrift angezeigen') + Textarea::make('name2') + ->label('Überschrift im Dokument') + ->belowContent([ + 'Bei abweichender Überschrift im Dokument', + ]) ->columnSpan(2), + TextInput::make('ordnungszahl') ->label('Kapitel Index') ->placeholder('3.21') @@ -86,6 +91,7 @@ class ProjektInhaltsverzeichnisRelationManager extends RelationManager ->schema([ TextInput::make('konto_textblock_id')->hidden(), RichEditor::make('textblock') + ->aboveLabel('Ausgabe Textblock vor Tabelle') ->columnSpan(5) ->extraInputAttributes(['style' => 'min-height: 20rem; max-height: 50vh; overflow-y: auto;']) ->toolbarButtons([ @@ -180,6 +186,7 @@ class ProjektInhaltsverzeichnisRelationManager extends RelationManager Tab::make('Tabellen') ->schema([ Select::make('tabellen_id')->label('Tabelle') + ->aboveLabel('Ausgabe Textblock vor Tabelle') ->prefixIcon('phosphor-table') ->prefixIconColor( fn ($record): string => $record->tabellen_id == 0 ? 'gray' : 'primary' @@ -261,7 +268,7 @@ class ProjektInhaltsverzeichnisRelationManager extends RelationManager ->createAnother(false), ]) ->recordActions([ - EditAction::make()->iconButton()->hidden(fn ($record) => $record->name == 'INHALTSVERZEICHNIS' ? true : false), + EditAction::make()->iconButton()->hidden(fn ($record) => (bool) $record->no_edit), DeleteAction::make()->iconButton(), ]) ->toolbarActions([ diff --git a/app/Models/ProjektInhaltsverzeichnis.php b/app/Models/ProjektInhaltsverzeichnis.php index 15d4fa2..a6ecfbf 100644 --- a/app/Models/ProjektInhaltsverzeichnis.php +++ b/app/Models/ProjektInhaltsverzeichnis.php @@ -14,6 +14,7 @@ class ProjektInhaltsverzeichnis extends Model 'textblock_id', 'sort', 'ordnungszahl', + 'part', 'seite', 'neue_seite', 'seitenzahl_anzeige', diff --git a/bootstrap/cache/blade-icons.php b/bootstrap/cache/blade-icons.php index 24cfd29..be5c76f 100755 --- a/bootstrap/cache/blade-icons.php +++ b/bootstrap/cache/blade-icons.php @@ -1,7 +1,7 @@ array ( - '/Users/hermanntelser/Sites/nutzwerte_fi4/resources/svg' => + '/Users/salam/Sites/nutzwerte_fi4/resources/svg' => array ( 0 => 'excel', 1 => 'logo', @@ -11,7 +11,7 @@ ), 'heroicons' => array ( - '/Users/hermanntelser/Sites/nutzwerte_fi4/vendor/blade-ui-kit/blade-heroicons/src/../resources/svg' => + '/Users/salam/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/hermanntelser/Sites/nutzwerte_fi4/vendor/codeat3/blade-phosphor-icons/src/../resources/svg' => + '/Users/salam/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/hermanntelser/Sites/nutzwerte_fi4/vendor/filament/support/src/../resources/svg' => + '/Users/salam/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/hermanntelser/Sites/nutzwerte_fi4/vendor/mallardduck/blade-lucide-icons/src/../resources/svg' => + '/Users/salam/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 f053558..49cb9e7 100644 --- a/bootstrap/cache/config.php +++ b/bootstrap/cache/config.php @@ -81,9 +81,9 @@ array ( 'paths' => array ( - 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/resources/views', + 0 => '/Users/salam/Sites/nutzwerte_fi4/resources/views', ), - 'compiled' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/framework/views', + 'compiled' => '/Users/salam/Sites/nutzwerte_fi4/storage/framework/views', ), 'cors' => array ( @@ -124,9 +124,9 @@ 'timezone' => 'UTC', 'locale' => 'de', 'fallback_locale' => 'en', - 'faker_locale' => 'at_AT', + 'faker_locale' => 'de_AT', 'cipher' => 'AES-256-CBC', - 'key' => 'base64:yRi9h21i7xAkGpeF7JoArovQJU1w6xwczQ6ijpYpJrs=', + 'key' => 'base64:zrVnUcBmUGjEV/EoAKnZCm/1FWplKu79kYBvevE2/ek=', 'previous_keys' => array ( ), @@ -301,8 +301,8 @@ 'file' => array ( 'driver' => 'file', - 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/framework/cache/data', - 'lock_path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/framework/cache/data', + 'path' => '/Users/salam/Sites/nutzwerte_fi4/storage/framework/cache/data', + 'lock_path' => '/Users/salam/Sites/nutzwerte_fi4/storage/framework/cache/data', ), 'memcached' => array ( @@ -345,6 +345,15 @@ array ( 'driver' => 'octane', ), + 'failover' => + array ( + 'driver' => 'failover', + 'stores' => + array ( + 0 => 'database', + 1 => 'array', + ), + ), ), 'prefix' => 'nutzwerte-cache-', ), @@ -513,7 +522,7 @@ ), 'policies' => array ( - 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Policies', + 'path' => '/Users/salam/Sites/nutzwerte_fi4/app/Policies', 'merge' => true, 'generate' => true, 'methods' => @@ -601,7 +610,7 @@ 'local' => array ( 'driver' => 'local', - 'root' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/private', + 'root' => '/Users/salam/Sites/nutzwerte_fi4/storage/app/private', 'serve' => true, 'throw' => false, 'report' => false, @@ -609,7 +618,7 @@ 'public' => array ( 'driver' => 'local', - 'root' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/public', + 'root' => '/Users/salam/Sites/nutzwerte_fi4/storage/app/public', 'url' => 'http://nutzwerte_fi4.test/storage', 'visibility' => 'public', 'throw' => false, @@ -631,7 +640,7 @@ 'promotion' => array ( 'driver' => 'local', - 'root' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/public/promotion', + 'root' => '/Users/salam/Sites/nutzwerte_fi4/storage/app/public/promotion', 'url' => 'http://nutzwerte_fi4.test/storage/promotion', 'visibility' => 'public', 'throw' => false, @@ -639,7 +648,7 @@ ), 'links' => array ( - '/Users/hermanntelser/Sites/nutzwerte_fi4/public/storage' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/public', + '/Users/salam/Sites/nutzwerte_fi4/public/storage' => '/Users/salam/Sites/nutzwerte_fi4/storage/app/public', ), ), 'logging' => @@ -664,14 +673,14 @@ 'single' => array ( 'driver' => 'single', - 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/logs/laravel.log', + 'path' => '/Users/salam/Sites/nutzwerte_fi4/storage/logs/laravel.log', 'level' => 'debug', 'replace_placeholders' => true, ), 'daily' => array ( 'driver' => 'daily', - 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/logs/laravel.log', + 'path' => '/Users/salam/Sites/nutzwerte_fi4/storage/logs/laravel.log', 'level' => 'debug', 'days' => 14, 'replace_placeholders' => true, @@ -736,7 +745,7 @@ ), 'emergency' => array ( - 'path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/logs/laravel.log', + 'path' => '/Users/salam/Sites/nutzwerte_fi4/storage/logs/laravel.log', ), ), ), @@ -835,7 +844,7 @@ 'theme' => 'default', 'paths' => array ( - 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/resources/views/vendor/mail', + 0 => '/Users/salam/Sites/nutzwerte_fi4/resources/views/vendor/mail', ), ), ), @@ -967,6 +976,19 @@ 'block_for' => NULL, 'after_commit' => false, ), + 'deferred' => + array ( + 'driver' => 'deferred', + ), + 'failover' => + array ( + 'driver' => 'failover', + 'connections' => + array ( + 0 => 'database', + 1 => 'deferred', + ), + ), ), 'batching' => array ( @@ -1011,7 +1033,7 @@ 'lifetime' => 120, 'expire_on_close' => false, 'encrypt' => false, - 'files' => '/Users/hermanntelser/Sites/nutzwerte_fi4/storage/framework/sessions', + 'files' => '/Users/salam/Sites/nutzwerte_fi4/storage/framework/sessions', 'connection' => NULL, 'table' => 'sessions', 'store' => NULL, @@ -1059,7 +1081,7 @@ ), 'default_filesystem_disk' => 'local', 'assets_path' => NULL, - 'cache_path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/bootstrap/cache/filament', + 'cache_path' => '/Users/salam/Sites/nutzwerte_fi4/bootstrap/cache/filament', 'livewire_loading_delay' => 'default', 'file_generation' => array ( @@ -1072,7 +1094,7 @@ 'livewire' => array ( 'class_namespace' => 'App\\Livewire', - 'view_path' => '/Users/hermanntelser/Sites/nutzwerte_fi4/resources/views/livewire', + 'view_path' => '/Users/salam/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 9166a05..eb0c947 100644 --- a/bootstrap/cache/filament/panels/admin.php +++ b/bootstrap/cache/filament/panels/admin.php @@ -69,9 +69,9 @@ ), 'clusters' => array ( - '/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', + '/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', ), 'clusteredComponents' => array ( @@ -96,7 +96,7 @@ ), 'clusterDirectories' => array ( - 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Clusters', + 0 => '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Clusters', ), 'clusterNamespaces' => array ( @@ -104,14 +104,14 @@ ), 'pages' => array ( - '/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', + '/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', 0 => 'Filament\\Pages\\Dashboard', ), 'pageDirectories' => array ( - 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Pages', + 0 => '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Pages', ), 'pageNamespaces' => array ( @@ -119,23 +119,23 @@ ), 'resources' => array ( - '/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/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/Plans/PlanResource.php' => 'App\\Filament\\Resources\\Plans\\PlanResource', - '/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', + '/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/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/Plans/PlanResource.php' => 'App\\Filament\\Resources\\Plans\\PlanResource', + '/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', 0 => 'BezhanSalleh\\FilamentShield\\Resources\\Roles\\RoleResource', ), 'resourceDirectories' => array ( - 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Resources', + 0 => '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Resources', ), 'resourceNamespaces' => array ( @@ -148,7 +148,7 @@ ), 'widgetDirectories' => array ( - 0 => '/Users/hermanntelser/Sites/nutzwerte_fi4/app/Filament/Widgets', + 0 => '/Users/salam/Sites/nutzwerte_fi4/app/Filament/Widgets', ), 'widgetNamespaces' => array ( diff --git a/bootstrap/cache/routes-v7.php b/bootstrap/cache/routes-v7.php index e95fa15..03b6504 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::ZNpvxgADDn5xMeNp', + '_route' => 'generated::WKjAySyv8qRywGxo', ), 1 => NULL, 2 => @@ -551,7 +551,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::WXdGqkg3hpDPHwLz', + '_route' => 'generated::eG74GLjxEoZoEuBa', ), 1 => NULL, 2 => @@ -609,7 +609,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::r7B4EE4LzBNI1yRm', + '_route' => 'generated::9MKCSEpteOIvtjOK', ), 1 => NULL, 2 => @@ -629,7 +629,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::qbFR4pXVLxEVZgsO', + '_route' => 'generated::xkQvzbTBsBEOLlbX', ), 1 => NULL, 2 => @@ -649,7 +649,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::QW5BAru8ToD1rCwr', + '_route' => 'generated::A0btSbQB2Xod4bME', ), 1 => NULL, 2 => @@ -669,7 +669,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::dFDPSRvyjk8L8oYU', + '_route' => 'generated::gr4RqACOxUMRXNBm', ), 1 => NULL, 2 => @@ -689,7 +689,7 @@ app('router')->setCompiledRoutes( array ( 0 => array ( - '_route' => 'generated::C2ZDUgvuIHUcNlMf', + '_route' => 'generated::qTctko3Bz1FigcdB', ), 1 => NULL, 2 => @@ -2740,7 +2740,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::ZNpvxgADDn5xMeNp' => + 'generated::WKjAySyv8qRywGxo' => array ( 'methods' => array ( @@ -2752,7 +2752,7 @@ app('router')->setCompiledRoutes( array ( 'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile', 'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile', - 'as' => 'generated::ZNpvxgADDn5xMeNp', + 'as' => 'generated::WKjAySyv8qRywGxo', ), 'fallback' => false, 'defaults' => @@ -2768,7 +2768,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::WXdGqkg3hpDPHwLz' => + 'generated::eG74GLjxEoZoEuBa' => array ( 'methods' => array ( @@ -2780,7 +2780,7 @@ app('router')->setCompiledRoutes( array ( 'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps', 'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps', - 'as' => 'generated::WXdGqkg3hpDPHwLz', + 'as' => 'generated::eG74GLjxEoZoEuBa', ), 'fallback' => false, 'defaults' => @@ -2882,7 +2882,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::r7B4EE4LzBNI1yRm' => + 'generated::9MKCSEpteOIvtjOK' => array ( 'methods' => array ( @@ -2892,7 +2892,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:834:"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:826:"function () { $exception = null; try { @@ -2907,11 +2907,11 @@ app('router')->setCompiledRoutes( $exception = $e->getMessage(); } - return response(\\Illuminate\\Support\\Facades\\View::file(\'/Users/hermanntelser/Sites/nutzwerte_fi4/vendor/laravel/framework/src/Illuminate/Foundation/Configuration\'.\'/../resources/health-up.blade.php\', [ + return response(\\Illuminate\\Support\\Facades\\View::file(\'/Users/salam/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:"0000000000000f3b0000000000000000";}}', - 'as' => 'generated::r7B4EE4LzBNI1yRm', + 'as' => 'generated::9MKCSEpteOIvtjOK', ), 'fallback' => false, 'defaults' => @@ -2927,7 +2927,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::qbFR4pXVLxEVZgsO' => + 'generated::xkQvzbTBsBEOLlbX' => array ( 'methods' => array ( @@ -2949,7 +2949,7 @@ app('router')->setCompiledRoutes( 'where' => array ( ), - 'as' => 'generated::qbFR4pXVLxEVZgsO', + 'as' => 'generated::xkQvzbTBsBEOLlbX', ), 'fallback' => false, 'defaults' => @@ -2965,7 +2965,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::QW5BAru8ToD1rCwr' => + 'generated::A0btSbQB2Xod4bME' => array ( 'methods' => array ( @@ -2987,7 +2987,7 @@ app('router')->setCompiledRoutes( 'where' => array ( ), - 'as' => 'generated::QW5BAru8ToD1rCwr', + 'as' => 'generated::A0btSbQB2Xod4bME', ), 'fallback' => false, 'defaults' => @@ -3003,7 +3003,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::dFDPSRvyjk8L8oYU' => + 'generated::gr4RqACOxUMRXNBm' => array ( 'methods' => array ( @@ -3025,7 +3025,7 @@ app('router')->setCompiledRoutes( 'where' => array ( ), - 'as' => 'generated::dFDPSRvyjk8L8oYU', + 'as' => 'generated::gr4RqACOxUMRXNBm', ), 'fallback' => false, 'defaults' => @@ -3041,7 +3041,7 @@ app('router')->setCompiledRoutes( 'waitSeconds' => NULL, 'withTrashed' => false, ), - 'generated::C2ZDUgvuIHUcNlMf' => + 'generated::qTctko3Bz1FigcdB' => array ( 'methods' => array ( @@ -3063,7 +3063,7 @@ app('router')->setCompiledRoutes( 'where' => array ( ), - 'as' => 'generated::C2ZDUgvuIHUcNlMf', + 'as' => 'generated::qTctko3Bz1FigcdB', ), 'fallback' => false, 'defaults' => @@ -3203,7 +3203,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: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) { + '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) { return (new \\Illuminate\\Filesystem\\ServeFile( $disk, $config, diff --git a/composer.lock b/composer.lock index b8cb393..4cb81fc 100644 --- a/composer.lock +++ b/composer.lock @@ -2662,16 +2662,16 @@ }, { "name": "laravel/framework", - "version": "v12.34.0", + "version": "v12.35.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f9ec5a5d88bc8c468f17b59f88e05c8ac3c8d687" + "reference": "9583ef9e405a71d5b8c04ff6efd05a7ef9a5baef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f9ec5a5d88bc8c468f17b59f88e05c8ac3c8d687", - "reference": "f9ec5a5d88bc8c468f17b59f88e05c8ac3c8d687", + "url": "https://api.github.com/repos/laravel/framework/zipball/9583ef9e405a71d5b8c04ff6efd05a7ef9a5baef", + "reference": "9583ef9e405a71d5b8c04ff6efd05a7ef9a5baef", "shasum": "" }, "require": { @@ -2877,7 +2877,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-10-14T13:58:31+00:00" + "time": "2025-10-21T15:15:41+00:00" }, { "name": "laravel/prompts", @@ -4658,16 +4658,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.6.1", + "version": "v5.6.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2" + "reference": "3a454ca033b9e06b63282ce19562e892747449bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb", + "reference": "3a454ca033b9e06b63282ce19562e892747449bb", "shasum": "" }, "require": { @@ -4710,9 +4710,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2" }, - "time": "2025-08-13T20:13:15+00:00" + "time": "2025-10-21T19:32:17+00:00" }, { "name": "nunomaduro/termwind", diff --git a/database/migrations/2025_10_02_170241_create_inhaltsverzeichnis_table.php b/database/migrations/2025_10_02_170241_create_inhaltsverzeichnis_table.php index 68b2256..02c40d2 100644 --- a/database/migrations/2025_10_02_170241_create_inhaltsverzeichnis_table.php +++ b/database/migrations/2025_10_02_170241_create_inhaltsverzeichnis_table.php @@ -22,6 +22,7 @@ return new class extends Migration $table->integer('seite')->default(0); $table->integer('neue_seite')->default(0); $table->integer('seitenzahl_anzeige')->default(0); + $table->boolean('no_edit')->default(0)->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2025_10_10_085849_create_projekt_inhaltsverzeichnis_table.php b/database/migrations/2025_10_10_085849_create_projekt_inhaltsverzeichnis_table.php index 139445d..609c399 100644 --- a/database/migrations/2025_10_10_085849_create_projekt_inhaltsverzeichnis_table.php +++ b/database/migrations/2025_10_10_085849_create_projekt_inhaltsverzeichnis_table.php @@ -15,15 +15,18 @@ return new class extends Migration $table->id(); $table->foreignId('projekte_id')->constrained()->cascadeOnDelete(); $table->string('name'); + $table->string('name2'); $table->boolean('ueberschrift_anzeigen')->default(0)->nullable(); $table->integer('tabellen_id')->default(0)->nullable(); $table->integer('textblock_id')->default(0)->nullable(); $table->integer('konto_textblock_id')->default(0)->nullable(); $table->integer('sort')->default(0); $table->double('ordnungszahl')->default(0); + $table->integer('part')->default(0); $table->integer('seite')->default(0); $table->integer('neue_seite')->default(0); $table->integer('seitenzahl_anzeige')->default(0); + $table->boolean('no_edit')->default(0)->nullable(); $table->text('textblock')->nullable(); $table->timestamps(); }); diff --git a/resources/css/pdf-download.css b/resources/css/pdf-download.css index fdaeb37..1bf2ddd 100644 --- a/resources/css/pdf-download.css +++ b/resources/css/pdf-download.css @@ -6,7 +6,7 @@ table, font-weight: 100; line-height: 18px; margin: 0; - padding: 10px; + padding: 2px; } /** POSITION FIXED */ @@ -59,7 +59,7 @@ table, /** FORMATTING */ .header { padding: 1.3mm 3mm; - margin: 2rem 0; + margin: 9mm 0 5mm; font-size: 1.5rem; border: 0.5px solid #f3f4f6; background-color: #eff6ff; diff --git a/storage/beispiele/GutachtenParagraph6.pdf b/storage/beispiele/GutachtenParagraph6.pdf new file mode 100644 index 0000000..3563c1f Binary files /dev/null and b/storage/beispiele/GutachtenParagraph6.pdf differ diff --git a/storage/beispiele/Nutzflächen.pdf b/storage/beispiele/Nutzflächen.pdf new file mode 100644 index 0000000..5034321 Binary files /dev/null and b/storage/beispiele/Nutzflächen.pdf differ diff --git a/storage/beispiele/Standard-mit-§6.pdf b/storage/beispiele/Standard-mit-§6.pdf new file mode 100644 index 0000000..5c79bfe Binary files /dev/null and b/storage/beispiele/Standard-mit-§6.pdf differ diff --git a/storage/beispiele/Standard.pdf b/storage/beispiele/Standard.pdf new file mode 100644 index 0000000..835e096 Binary files /dev/null and b/storage/beispiele/Standard.pdf differ