Beistrich bei Eingabe statt Punkt
This commit is contained in:
1 parent
096c8cf091
commit
ddbf171881
15 files changed
+407
-305
No files matched your search
+2
-2
@@ -13,12 +13,12 @@ https://www.markdownguide.org/basic-syntax/
|
|||||||
> 3.30 Tabellenformatierung wie im alten
|
> 3.30 Tabellenformatierung wie im alten
|
||||||
> bei Stellplätze 3.30 Typ im Header, Top Nummer und Geschoss links bündig
|
> bei Stellplätze 3.30 Typ im Header, Top Nummer und Geschoss links bündig
|
||||||
> §6 Tabelle linke Linie fehlt
|
> §6 Tabelle linke Linie fehlt
|
||||||
|
> Beistrich bei Eingabe statt Punkt
|
||||||
|
|
||||||
- Beistrich bei Eingabe statt Punkt
|
- Überschrift nur im Inhaltsverzeichnis anzeigen
|
||||||
- Inhaltsverzeichnis Textblock
|
- Inhaltsverzeichnis Textblock
|
||||||
- Gutachten Pxxx WEG 2002
|
- Gutachten Pxxx WEG 2002
|
||||||
- generieren wirklich?
|
- generieren wirklich?
|
||||||
- Überschrift nur im Inhaltsverzeichnis anzeigen
|
|
||||||
- Schriftgröße Hanno Logo
|
- Schriftgröße Hanno Logo
|
||||||
- Räume Methoden Aufstellungen Evaluieren
|
- Räume Methoden Aufstellungen Evaluieren
|
||||||
- Farbe excel Aufstellung heller
|
- Farbe excel Aufstellung heller
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
TextColumn::make('flaeche')
|
||||||
|
->numeric(
|
||||||
|
decimalPlaces: 2,
|
||||||
|
decimalSeparator: ',',
|
||||||
|
thousandsSeparator: '.'
|
||||||
|
)
|
||||||
|
// ->updateStateUsing(function ($record, $state) {
|
||||||
|
// return $record->update(['flaeche' => str_replace(',', '.', $state)]);
|
||||||
|
// })
|
||||||
|
// ->extraInputAttributes(['onClick' => 'this.select()'])
|
||||||
|
->summarize(Sum::make()->label('Gesammt')->numeric(
|
||||||
|
decimalPlaces: 2,
|
||||||
|
)->suffix(new HtmlString(' m²')))
|
||||||
|
->suffix(new HtmlString(' m²'))
|
||||||
|
->width('2rem')
|
||||||
|
// ->rules(['required'])
|
||||||
|
->alignment('right')
|
||||||
|
->label('Fläche')
|
||||||
|
->searchable(),
|
||||||
|
// ->validationMessages([
|
||||||
|
// 'required' => 'Die Eingabe einer Fläche ist erforderlich.',
|
||||||
|
// 'decimal' => 'Für die Fläche sind zwei Dezimalstellen erforderlich.',
|
||||||
|
// ])
|
||||||
|
// ->afterStateUpdated(function (Component $livewire) {
|
||||||
|
// $livewire->dispatch('refreshProjektAllgemeinflaechen');
|
||||||
|
// }),
|
||||||
@@ -14,7 +14,7 @@ class Deckblatt
|
|||||||
$html = '<div id="deckblatt">';
|
$html = '<div id="deckblatt">';
|
||||||
$html .= '<div id="deckblatt-gutachter">';
|
$html .= '<div id="deckblatt-gutachter">';
|
||||||
if (PdfGenerator::$gutachter->logo && PdfGenerator::$gutachter->logo_anzeigen) {
|
if (PdfGenerator::$gutachter->logo && PdfGenerator::$gutachter->logo_anzeigen) {
|
||||||
$html .= '<div id="deckblatt-logo-gutachter" style="height: '.PdfGenerator::$gutachter->logo_height.'mm; background-position: center '.PdfGenerator::$gutachter->logo_align.'; background-image: url(\''.public_path().'/storage/'.PdfGenerator::$gutachter->logo.'\');"></div>';
|
$html .= '<div id="deckblatt-logo-gutachter" style="background-size: contain; background-repeat: no-repeat; height: '.PdfGenerator::$gutachter->logo_height.'mm; background-position: top '.PdfGenerator::$gutachter->logo_align.'; background-image: url(\''.public_path().'/storage/'.PdfGenerator::$gutachter->logo.'\');"></div>';
|
||||||
}
|
}
|
||||||
if (PdfGenerator::$gutachter->referenz_formatting && PdfGenerator::$gutachter->text_anzeigen) {
|
if (PdfGenerator::$gutachter->referenz_formatting && PdfGenerator::$gutachter->text_anzeigen) {
|
||||||
$str = RichContentRenderer::make(PdfGenerator::$gutachter->referenz_formatting)->toHtml();
|
$str = RichContentRenderer::make(PdfGenerator::$gutachter->referenz_formatting)->toHtml();
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace App\Filament\Resources\Gutachters\Schemas;
|
|||||||
|
|
||||||
use App\Actions\Helper\ShowHelp;
|
use App\Actions\Helper\ShowHelp;
|
||||||
use Filament\Forms\Components\Checkbox;
|
use Filament\Forms\Components\Checkbox;
|
||||||
|
use Filament\Forms\Components\ColorPicker;
|
||||||
use Filament\Forms\Components\FileUpload;
|
use Filament\Forms\Components\FileUpload;
|
||||||
use Filament\Forms\Components\Radio;
|
use Filament\Forms\Components\Radio;
|
||||||
use Filament\Forms\Components\RichEditor;
|
use Filament\Forms\Components\RichEditor;
|
||||||
@@ -83,10 +84,12 @@ class GutachterForm
|
|||||||
]),
|
]),
|
||||||
TextInput::make('logo_height')
|
TextInput::make('logo_height')
|
||||||
->hidden(fn (Get $get): bool => ! $get('logo_anzeigen'))
|
->hidden(fn (Get $get): bool => ! $get('logo_anzeigen'))
|
||||||
|
->belowLabel('190mm ist die halbe Breite der Seite')
|
||||||
->numeric()
|
->numeric()
|
||||||
|
->default(70)
|
||||||
->minValue(20)
|
->minValue(20)
|
||||||
->maxValue(100)
|
->maxValue(100)
|
||||||
->label('Logo Höhe')
|
->label('Logo Breite')
|
||||||
->required()
|
->required()
|
||||||
->suffix('mm'),
|
->suffix('mm'),
|
||||||
])->columns(2),
|
])->columns(2),
|
||||||
@@ -142,6 +145,16 @@ class GutachterForm
|
|||||||
->acceptedFileTypes(['image/jpeg', 'image/png', 'image/webp'])
|
->acceptedFileTypes(['image/jpeg', 'image/png', 'image/webp'])
|
||||||
->visibility('public'),
|
->visibility('public'),
|
||||||
])->columns(2),
|
])->columns(2),
|
||||||
|
Tab::make('Farben')
|
||||||
|
->icon('phosphor-palette')
|
||||||
|
->schema([
|
||||||
|
ColorPicker::make('deckblatt_bg')->label('Deckblatt')
|
||||||
|
->belowContent('Farbe des Hintergrundes'),
|
||||||
|
ColorPicker::make('schmuckfarbe_header')->label('Überschriften')
|
||||||
|
->belowContent('Farbe des Hintergrundes'),
|
||||||
|
ColorPicker::make('farbe_borders')->label('Rahmen')
|
||||||
|
->belowContent('Farbe von Rahmen und Begrenzungen'),
|
||||||
|
])->columns(2),
|
||||||
])->columnSpanFull(),
|
])->columnSpanFull(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-12
@@ -12,7 +12,6 @@ use Filament\Resources\RelationManagers\RelationManager;
|
|||||||
use Filament\Schemas\Schema;
|
use Filament\Schemas\Schema;
|
||||||
use Filament\Tables\Columns\Summarizers\Sum;
|
use Filament\Tables\Columns\Summarizers\Sum;
|
||||||
use Filament\Tables\Columns\TextColumn;
|
use Filament\Tables\Columns\TextColumn;
|
||||||
use Filament\Tables\Columns\TextInputColumn;
|
|
||||||
use Filament\Tables\Table;
|
use Filament\Tables\Table;
|
||||||
use Illuminate\Support\HtmlString;
|
use Illuminate\Support\HtmlString;
|
||||||
use Livewire\Component;
|
use Livewire\Component;
|
||||||
@@ -60,24 +59,20 @@ class ProjektAllgemeinflaechensRelationManager extends RelationManager
|
|||||||
->columns([
|
->columns([
|
||||||
TextColumn::make('geschoss')->searchable(),
|
TextColumn::make('geschoss')->searchable(),
|
||||||
TextColumn::make('raumart')->searchable(),
|
TextColumn::make('raumart')->searchable(),
|
||||||
TextInputColumn::make('flaeche')
|
TextColumn::make('flaeche')
|
||||||
->extraInputAttributes(['onClick' => 'this.select()'])
|
->numeric(
|
||||||
|
decimalPlaces: 2,
|
||||||
|
decimalSeparator: ',',
|
||||||
|
thousandsSeparator: '.'
|
||||||
|
)
|
||||||
->summarize(Sum::make()->label('Gesammt')->numeric(
|
->summarize(Sum::make()->label('Gesammt')->numeric(
|
||||||
decimalPlaces: 2,
|
decimalPlaces: 2,
|
||||||
)->suffix(new HtmlString(' m²')))
|
)->suffix(new HtmlString(' m²')))
|
||||||
->suffix(new HtmlString(' m²'))
|
->suffix(new HtmlString(' m²'))
|
||||||
->width('2rem')
|
->width('2rem')
|
||||||
->rules(['required', 'flaeche' => 'decimal:2'])
|
|
||||||
->alignment('right')
|
->alignment('right')
|
||||||
->label('Fläche')
|
->label('Fläche')
|
||||||
->searchable()
|
->searchable(),
|
||||||
->validationMessages([
|
|
||||||
'required' => 'Die Eingabe einer Fläche ist erforderlich.',
|
|
||||||
'decimal' => 'Für die Fläche sind zwei Dezimalstellen erforderlich.',
|
|
||||||
])
|
|
||||||
->afterStateUpdated(function (Component $livewire) {
|
|
||||||
$livewire->dispatch('refreshProjektAllgemeinflaechen');
|
|
||||||
}),
|
|
||||||
])
|
])
|
||||||
->headerActions([
|
->headerActions([
|
||||||
CreateAction::make()
|
CreateAction::make()
|
||||||
|
|||||||
+73
-29
@@ -10,10 +10,12 @@ use App\Models\ProjektObjekteImDetail;
|
|||||||
use Filament\Actions\Action;
|
use Filament\Actions\Action;
|
||||||
use Filament\Actions\BulkAction;
|
use Filament\Actions\BulkAction;
|
||||||
use Filament\Actions\BulkActionGroup;
|
use Filament\Actions\BulkActionGroup;
|
||||||
|
use Filament\Actions\EditAction;
|
||||||
use Filament\Forms\Components\Select;
|
use Filament\Forms\Components\Select;
|
||||||
use Filament\Forms\Components\TextInput;
|
use Filament\Forms\Components\TextInput;
|
||||||
use Filament\Notifications\Notification;
|
use Filament\Notifications\Notification;
|
||||||
use Filament\Resources\RelationManagers\RelationManager;
|
use Filament\Resources\RelationManagers\RelationManager;
|
||||||
|
use Filament\Schemas\Schema;
|
||||||
use Filament\Tables\Columns\SelectColumn;
|
use Filament\Tables\Columns\SelectColumn;
|
||||||
use Filament\Tables\Columns\TextColumn;
|
use Filament\Tables\Columns\TextColumn;
|
||||||
use Filament\Tables\Columns\TextInputColumn;
|
use Filament\Tables\Columns\TextInputColumn;
|
||||||
@@ -37,51 +39,93 @@ class ProjektMethodesRelationManager extends RelationManager
|
|||||||
|
|
||||||
protected static ?string $pluralModelLabel = 'Raum Methoden';
|
protected static ?string $pluralModelLabel = 'Raum Methoden';
|
||||||
|
|
||||||
public function table(Table $table): Table
|
public function form(Schema $schema): Schema
|
||||||
{
|
{
|
||||||
return $table
|
return $schema
|
||||||
->striped()
|
->components([
|
||||||
->recordTitleAttribute('raumart')
|
Select::make('methode_id')
|
||||||
->columns([
|
|
||||||
SelectColumn::make('methode_id')
|
|
||||||
->label('Methoden')
|
->label('Methoden')
|
||||||
->optionsRelationship('methode', 'name')
|
->options(Methode::pluck('name', 'id'))
|
||||||
->preloadOptions()
|
|
||||||
->rules(['required'])
|
->rules(['required'])
|
||||||
->afterStateUpdated(function (Component $livewire) {
|
->afterStateUpdated(function (Component $livewire) {
|
||||||
$livewire->dispatch('refreshMethods');
|
$livewire->dispatch('refreshMethods');
|
||||||
})->validationMessages([
|
})->validationMessages([
|
||||||
'required' => 'Die Eingabe einer Methode ist erforderlich.',
|
'required' => 'Die Eingabe einer Methode ist erforderlich.',
|
||||||
]),
|
]),
|
||||||
SelectColumn::make('aufstellung_id')
|
Select::make('aufstellung_id')
|
||||||
->label('Aufstellung')
|
->label('Aufstellung')
|
||||||
->optionsRelationship('aufstellung', 'name')
|
->options(Aufstellung::pluck('name', 'id'))
|
||||||
->preloadOptions()
|
|
||||||
->rules(['required'])
|
|
||||||
->afterStateUpdated(function (Component $livewire) {
|
->afterStateUpdated(function (Component $livewire) {
|
||||||
$livewire->dispatch('refreshMethods');
|
$livewire->dispatch('refreshMethods');
|
||||||
})->validationMessages([
|
}),
|
||||||
'required' => 'Die Eingabe einer Aufstellung ist erforderlich.',
|
TextInput::make('faktor')
|
||||||
|
->suffixIcon('phosphor-function')
|
||||||
|
->numeric()
|
||||||
|
->label('Fläche')
|
||||||
|
->rules(['required'])
|
||||||
|
->validationMessages([
|
||||||
|
'required' => 'Die Eingabe einer Fläche ist erforderlich.',
|
||||||
]),
|
]),
|
||||||
|
])->columns(3);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function table(Table $table): Table
|
||||||
|
{
|
||||||
|
return $table
|
||||||
|
->striped()
|
||||||
|
->recordTitleAttribute('raumart')
|
||||||
|
->columns([
|
||||||
|
TextColumn::make('methode.name')
|
||||||
|
->searchable(),
|
||||||
|
TextColumn::make('aufstellung.name')
|
||||||
|
->searchable(),
|
||||||
|
// SelectColumn::make('methode_id')
|
||||||
|
// ->label('Methoden')
|
||||||
|
// ->optionsRelationship('methode', 'name')
|
||||||
|
// ->preloadOptions()
|
||||||
|
// ->rules(['required'])
|
||||||
|
// ->afterStateUpdated(function (Component $livewire) {
|
||||||
|
// $livewire->dispatch('refreshMethods');
|
||||||
|
// })->validationMessages([
|
||||||
|
// 'required' => 'Die Eingabe einer Methode ist erforderlich.',
|
||||||
|
// ]),
|
||||||
|
// SelectColumn::make('aufstellung_id')
|
||||||
|
// ->label('Aufstellung')
|
||||||
|
// ->optionsRelationship('aufstellung', 'name')
|
||||||
|
// ->preloadOptions()
|
||||||
|
// ->rules(['required'])
|
||||||
|
// ->afterStateUpdated(function (Component $livewire) {
|
||||||
|
// $livewire->dispatch('refreshMethods');
|
||||||
|
// })->validationMessages([
|
||||||
|
// 'required' => 'Die Eingabe einer Aufstellung ist erforderlich.',
|
||||||
|
// ]),
|
||||||
|
|
||||||
TextColumn::make('raumart')
|
TextColumn::make('raumart')
|
||||||
->searchable(),
|
->searchable(),
|
||||||
TextInputColumn::make('faktor')
|
TextColumn::make('faktor')
|
||||||
->extraInputAttributes(['onClick' => 'this.select()'])
|
->numeric(2, ',')
|
||||||
->suffixIcon('phosphor-function')
|
->icon('phosphor-function')
|
||||||
->width('1rem')
|
|
||||||
->rules(['required', 'faktor' => 'decimal:0,2'])
|
|
||||||
->searchable()
|
->searchable()
|
||||||
->afterStateUpdated(function ($record) {
|
->label('Faktor'),
|
||||||
$objects = ProjektObjekteImDetail::where('projekte_id', $record['projekte_id'])->where('raumart', $record['raumart'])->get();
|
// TextInputColumn::make('faktor')
|
||||||
foreach ($objects as $value) {
|
// ->extraInputAttributes(['onClick' => 'this.select()'])
|
||||||
$nutzwert = round($record['faktor'] * $value->flaeche, 2);
|
// ->suffixIcon('phosphor-function')
|
||||||
ProjektObjekteImDetail::where('id', $value->id)->update(['nutzwert' => $nutzwert]);
|
// ->width('1rem')
|
||||||
}
|
// ->rules(['required', 'faktor' => 'decimal:0,2'])
|
||||||
})->validationMessages([
|
// ->searchable()
|
||||||
'required' => 'Die Eingabe eines Faktors ist erforderlich.',
|
// ->afterStateUpdated(function ($record) {
|
||||||
'decimal' => 'Für den Faktors sind zwei Dezimalstellen erforderlich.',
|
// $objects = ProjektObjekteImDetail::where('projekte_id', $record['projekte_id'])->where('raumart', $record['raumart'])->get();
|
||||||
]),
|
// foreach ($objects as $value) {
|
||||||
|
// $nutzwert = round($record['faktor'] * $value->flaeche, 2);
|
||||||
|
// ProjektObjekteImDetail::where('id', $value->id)->update(['nutzwert' => $nutzwert]);
|
||||||
|
// }
|
||||||
|
// })->validationMessages([
|
||||||
|
// 'required' => 'Die Eingabe eines Faktors ist erforderlich.',
|
||||||
|
// 'decimal' => 'Für den Faktors sind zwei Dezimalstellen erforderlich.',
|
||||||
|
// ]),
|
||||||
|
])
|
||||||
|
->recordActions([
|
||||||
|
EditAction::make()->iconButton(),
|
||||||
])
|
])
|
||||||
->filters([
|
->filters([
|
||||||
SelectFilter::make('methodes')
|
SelectFilter::make('methodes')
|
||||||
|
|||||||
+26
-14
@@ -52,8 +52,9 @@ class ProjektObjekteImDetailRelationManager extends RelationManager
|
|||||||
->suffixIcon('phosphor-building'),
|
->suffixIcon('phosphor-building'),
|
||||||
TextInput::make('flaeche')
|
TextInput::make('flaeche')
|
||||||
->suffix(new HtmlString(' m²'))
|
->suffix(new HtmlString(' m²'))
|
||||||
->rules(['required'])
|
->numeric()
|
||||||
->label('Fläche')
|
->label('Fläche')
|
||||||
|
->rules(['required', 'flaeche' => 'decimal:2'])
|
||||||
->validationMessages([
|
->validationMessages([
|
||||||
'required' => 'Die Eingabe einer Fläche ist erforderlich.',
|
'required' => 'Die Eingabe einer Fläche ist erforderlich.',
|
||||||
'decimal' => 'Für die Fläche sind zwei Dezimalstellen erforderlich.',
|
'decimal' => 'Für die Fläche sind zwei Dezimalstellen erforderlich.',
|
||||||
@@ -79,31 +80,42 @@ class ProjektObjekteImDetailRelationManager extends RelationManager
|
|||||||
TextColumn::make('geschoss')->searchable(),
|
TextColumn::make('geschoss')->searchable(),
|
||||||
TextColumn::make('raumart')->searchable()->sortable(),
|
TextColumn::make('raumart')->searchable()->sortable(),
|
||||||
TextColumn::make('methode.faktor')
|
TextColumn::make('methode.faktor')
|
||||||
|
->numeric(2, ',')
|
||||||
->icon('phosphor-function')
|
->icon('phosphor-function')
|
||||||
->searchable()
|
->searchable()
|
||||||
->label('Faktor'),
|
->label('Faktor'),
|
||||||
TextInputColumn::make('flaeche')
|
TextColumn::make('flaeche')
|
||||||
->extraInputAttributes(['onClick' => 'this.select()'])
|
->numeric(2, ',', '.')
|
||||||
->summarize(Sum::make()->label('Gesammt')->numeric(
|
->summarize(Sum::make()->label('Gesammt')->numeric(
|
||||||
decimalPlaces: 2,
|
decimalPlaces: 2,
|
||||||
)->suffix(new HtmlString(' m²')))
|
)->suffix(new HtmlString(' m²')))
|
||||||
->suffix(new HtmlString(' m²'))
|
->suffix(new HtmlString(' m²'))
|
||||||
->width('2rem')
|
->width('2rem')
|
||||||
->alignment('right')
|
->alignment('right')
|
||||||
->rules(['required'])
|
|
||||||
->label('Fläche')
|
->label('Fläche')
|
||||||
->searchable()
|
->searchable(),
|
||||||
->afterStateUpdated(function ($record, Component $livewire) {
|
// TextInputColumn::make('flaeche')
|
||||||
$object = ProjektObjekteImDetail::find($record['id']);
|
// ->extraInputAttributes(['onClick' => 'this.select()'])
|
||||||
$object->nutzwert = round($record->methode->faktor * $object->flaeche, 2);
|
// ->summarize(Sum::make()->label('Gesammt')->numeric(
|
||||||
$object->save();
|
// decimalPlaces: 2,
|
||||||
|
// )->suffix(new HtmlString(' m²')))
|
||||||
|
// ->suffix(new HtmlString(' m²'))
|
||||||
|
// ->width('2rem')
|
||||||
|
// ->alignment('right')
|
||||||
|
// ->rules(['required'])
|
||||||
|
// ->label('Fläche')
|
||||||
|
// ->searchable()
|
||||||
|
// ->afterStateUpdated(function ($record, Component $livewire) {
|
||||||
|
// $object = ProjektObjekteImDetail::find($record['id']);
|
||||||
|
// $object->nutzwert = round($record->methode->faktor * $object->flaeche, 2);
|
||||||
|
// $object->save();
|
||||||
|
|
||||||
$livewire->dispatch('refreshProjektObjekteImDetail');
|
// $livewire->dispatch('refreshProjektObjekteImDetail');
|
||||||
|
|
||||||
})->validationMessages([
|
// })->validationMessages([
|
||||||
'required' => 'Die Eingabe einer Fläche ist erforderlich.',
|
// 'required' => 'Die Eingabe einer Fläche ist erforderlich.',
|
||||||
'decimal' => 'Für die Fläche sind zwei Dezimalstellen erforderlich.',
|
// 'decimal' => 'Für die Fläche sind zwei Dezimalstellen erforderlich.',
|
||||||
]),
|
// ]),
|
||||||
TextColumn::make('nutzwert')
|
TextColumn::make('nutzwert')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
->summarize(Sum::make()->label('Gesammt'))
|
->summarize(Sum::make()->label('Gesammt'))
|
||||||
|
|||||||
@@ -216,6 +216,7 @@ class ProjektObjekteRelationManager extends RelationManager
|
|||||||
$livewire->dispatch('refreshOrientierung');
|
$livewire->dispatch('refreshOrientierung');
|
||||||
}),
|
}),
|
||||||
TextColumn::make('nutzwert')
|
TextColumn::make('nutzwert')
|
||||||
|
->numeric(2, ',', '.')
|
||||||
->extraHeaderAttributes([
|
->extraHeaderAttributes([
|
||||||
'style' => 'position: sticky; right: 0; z-index: 1;',
|
'style' => 'position: sticky; right: 0; z-index: 1;',
|
||||||
'class' => 'bg-gray-50 dark:bg-gray-900 border-x border-gray-200 dark:border-gray-800',
|
'class' => 'bg-gray-50 dark:bg-gray-900 border-x border-gray-200 dark:border-gray-800',
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ class ProjektMethode extends Model
|
|||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'projekte_id',
|
'projekte_id',
|
||||||
'methode_id',
|
'methode_id',
|
||||||
|
'aufstellung_id',
|
||||||
'geschoss',
|
'geschoss',
|
||||||
'raumart',
|
'raumart',
|
||||||
'flaeche',
|
'flaeche',
|
||||||
|
|||||||
Vendored
+21
-21
@@ -531,7 +531,7 @@ app('router')->setCompiledRoutes(
|
|||||||
array (
|
array (
|
||||||
0 =>
|
0 =>
|
||||||
array (
|
array (
|
||||||
'_route' => 'generated::3o8r6SFhHYJXudVU',
|
'_route' => 'generated::3HnSsjNO6SUYgkAU',
|
||||||
),
|
),
|
||||||
1 => NULL,
|
1 => NULL,
|
||||||
2 =>
|
2 =>
|
||||||
@@ -551,7 +551,7 @@ app('router')->setCompiledRoutes(
|
|||||||
array (
|
array (
|
||||||
0 =>
|
0 =>
|
||||||
array (
|
array (
|
||||||
'_route' => 'generated::OmrEE69cygLxgFKH',
|
'_route' => 'generated::FxflLIZnLNah23E5',
|
||||||
),
|
),
|
||||||
1 => NULL,
|
1 => NULL,
|
||||||
2 =>
|
2 =>
|
||||||
@@ -609,7 +609,7 @@ app('router')->setCompiledRoutes(
|
|||||||
array (
|
array (
|
||||||
0 =>
|
0 =>
|
||||||
array (
|
array (
|
||||||
'_route' => 'generated::scp8kliSZRCopV7D',
|
'_route' => 'generated::xophVDUDP3Ckd8II',
|
||||||
),
|
),
|
||||||
1 => NULL,
|
1 => NULL,
|
||||||
2 =>
|
2 =>
|
||||||
@@ -629,7 +629,7 @@ app('router')->setCompiledRoutes(
|
|||||||
array (
|
array (
|
||||||
0 =>
|
0 =>
|
||||||
array (
|
array (
|
||||||
'_route' => 'generated::38LWocxhMLlc4pNK',
|
'_route' => 'generated::dbTuyU4My6WKl7DA',
|
||||||
),
|
),
|
||||||
1 => NULL,
|
1 => NULL,
|
||||||
2 =>
|
2 =>
|
||||||
@@ -649,7 +649,7 @@ app('router')->setCompiledRoutes(
|
|||||||
array (
|
array (
|
||||||
0 =>
|
0 =>
|
||||||
array (
|
array (
|
||||||
'_route' => 'generated::PVoorV8JM5zFb8Be',
|
'_route' => 'generated::pJrXrL1Kw7qoAQE4',
|
||||||
),
|
),
|
||||||
1 => NULL,
|
1 => NULL,
|
||||||
2 =>
|
2 =>
|
||||||
@@ -669,7 +669,7 @@ app('router')->setCompiledRoutes(
|
|||||||
array (
|
array (
|
||||||
0 =>
|
0 =>
|
||||||
array (
|
array (
|
||||||
'_route' => 'generated::CLZkTmw90AqCSfdu',
|
'_route' => 'generated::Zl5xWOyHVgHC4jup',
|
||||||
),
|
),
|
||||||
1 => NULL,
|
1 => NULL,
|
||||||
2 =>
|
2 =>
|
||||||
@@ -689,7 +689,7 @@ app('router')->setCompiledRoutes(
|
|||||||
array (
|
array (
|
||||||
0 =>
|
0 =>
|
||||||
array (
|
array (
|
||||||
'_route' => 'generated::jdlWZ8tNhTDVD3kW',
|
'_route' => 'generated::GuwNLdeLMZ0usPlV',
|
||||||
),
|
),
|
||||||
1 => NULL,
|
1 => NULL,
|
||||||
2 =>
|
2 =>
|
||||||
@@ -2738,7 +2738,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'waitSeconds' => NULL,
|
'waitSeconds' => NULL,
|
||||||
'withTrashed' => false,
|
'withTrashed' => false,
|
||||||
),
|
),
|
||||||
'generated::3o8r6SFhHYJXudVU' =>
|
'generated::3HnSsjNO6SUYgkAU' =>
|
||||||
array (
|
array (
|
||||||
'methods' =>
|
'methods' =>
|
||||||
array (
|
array (
|
||||||
@@ -2750,7 +2750,7 @@ app('router')->setCompiledRoutes(
|
|||||||
array (
|
array (
|
||||||
'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile',
|
'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile',
|
||||||
'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile',
|
'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile',
|
||||||
'as' => 'generated::3o8r6SFhHYJXudVU',
|
'as' => 'generated::3HnSsjNO6SUYgkAU',
|
||||||
),
|
),
|
||||||
'fallback' => false,
|
'fallback' => false,
|
||||||
'defaults' =>
|
'defaults' =>
|
||||||
@@ -2766,7 +2766,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'waitSeconds' => NULL,
|
'waitSeconds' => NULL,
|
||||||
'withTrashed' => false,
|
'withTrashed' => false,
|
||||||
),
|
),
|
||||||
'generated::OmrEE69cygLxgFKH' =>
|
'generated::FxflLIZnLNah23E5' =>
|
||||||
array (
|
array (
|
||||||
'methods' =>
|
'methods' =>
|
||||||
array (
|
array (
|
||||||
@@ -2778,7 +2778,7 @@ app('router')->setCompiledRoutes(
|
|||||||
array (
|
array (
|
||||||
'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps',
|
'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps',
|
||||||
'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps',
|
'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps',
|
||||||
'as' => 'generated::OmrEE69cygLxgFKH',
|
'as' => 'generated::FxflLIZnLNah23E5',
|
||||||
),
|
),
|
||||||
'fallback' => false,
|
'fallback' => false,
|
||||||
'defaults' =>
|
'defaults' =>
|
||||||
@@ -2880,7 +2880,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'waitSeconds' => NULL,
|
'waitSeconds' => NULL,
|
||||||
'withTrashed' => false,
|
'withTrashed' => false,
|
||||||
),
|
),
|
||||||
'generated::scp8kliSZRCopV7D' =>
|
'generated::xophVDUDP3Ckd8II' =>
|
||||||
array (
|
array (
|
||||||
'methods' =>
|
'methods' =>
|
||||||
array (
|
array (
|
||||||
@@ -2909,7 +2909,7 @@ app('router')->setCompiledRoutes(
|
|||||||
\'exception\' => $exception,
|
\'exception\' => $exception,
|
||||||
]), status: $exception ? 500 : 200);
|
]), status: $exception ? 500 : 200);
|
||||||
}";s:5:"scope";s:54:"Illuminate\\Foundation\\Configuration\\ApplicationBuilder";s:4:"this";N;s:4:"self";s:32:"0000000000000f6a0000000000000000";}}',
|
}";s:5:"scope";s:54:"Illuminate\\Foundation\\Configuration\\ApplicationBuilder";s:4:"this";N;s:4:"self";s:32:"0000000000000f6a0000000000000000";}}',
|
||||||
'as' => 'generated::scp8kliSZRCopV7D',
|
'as' => 'generated::xophVDUDP3Ckd8II',
|
||||||
),
|
),
|
||||||
'fallback' => false,
|
'fallback' => false,
|
||||||
'defaults' =>
|
'defaults' =>
|
||||||
@@ -2925,7 +2925,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'waitSeconds' => NULL,
|
'waitSeconds' => NULL,
|
||||||
'withTrashed' => false,
|
'withTrashed' => false,
|
||||||
),
|
),
|
||||||
'generated::38LWocxhMLlc4pNK' =>
|
'generated::dbTuyU4My6WKl7DA' =>
|
||||||
array (
|
array (
|
||||||
'methods' =>
|
'methods' =>
|
||||||
array (
|
array (
|
||||||
@@ -2947,7 +2947,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'where' =>
|
'where' =>
|
||||||
array (
|
array (
|
||||||
),
|
),
|
||||||
'as' => 'generated::38LWocxhMLlc4pNK',
|
'as' => 'generated::dbTuyU4My6WKl7DA',
|
||||||
),
|
),
|
||||||
'fallback' => false,
|
'fallback' => false,
|
||||||
'defaults' =>
|
'defaults' =>
|
||||||
@@ -2963,7 +2963,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'waitSeconds' => NULL,
|
'waitSeconds' => NULL,
|
||||||
'withTrashed' => false,
|
'withTrashed' => false,
|
||||||
),
|
),
|
||||||
'generated::PVoorV8JM5zFb8Be' =>
|
'generated::pJrXrL1Kw7qoAQE4' =>
|
||||||
array (
|
array (
|
||||||
'methods' =>
|
'methods' =>
|
||||||
array (
|
array (
|
||||||
@@ -2985,7 +2985,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'where' =>
|
'where' =>
|
||||||
array (
|
array (
|
||||||
),
|
),
|
||||||
'as' => 'generated::PVoorV8JM5zFb8Be',
|
'as' => 'generated::pJrXrL1Kw7qoAQE4',
|
||||||
),
|
),
|
||||||
'fallback' => false,
|
'fallback' => false,
|
||||||
'defaults' =>
|
'defaults' =>
|
||||||
@@ -3001,7 +3001,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'waitSeconds' => NULL,
|
'waitSeconds' => NULL,
|
||||||
'withTrashed' => false,
|
'withTrashed' => false,
|
||||||
),
|
),
|
||||||
'generated::CLZkTmw90AqCSfdu' =>
|
'generated::Zl5xWOyHVgHC4jup' =>
|
||||||
array (
|
array (
|
||||||
'methods' =>
|
'methods' =>
|
||||||
array (
|
array (
|
||||||
@@ -3023,7 +3023,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'where' =>
|
'where' =>
|
||||||
array (
|
array (
|
||||||
),
|
),
|
||||||
'as' => 'generated::CLZkTmw90AqCSfdu',
|
'as' => 'generated::Zl5xWOyHVgHC4jup',
|
||||||
),
|
),
|
||||||
'fallback' => false,
|
'fallback' => false,
|
||||||
'defaults' =>
|
'defaults' =>
|
||||||
@@ -3039,7 +3039,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'waitSeconds' => NULL,
|
'waitSeconds' => NULL,
|
||||||
'withTrashed' => false,
|
'withTrashed' => false,
|
||||||
),
|
),
|
||||||
'generated::jdlWZ8tNhTDVD3kW' =>
|
'generated::GuwNLdeLMZ0usPlV' =>
|
||||||
array (
|
array (
|
||||||
'methods' =>
|
'methods' =>
|
||||||
array (
|
array (
|
||||||
@@ -3061,7 +3061,7 @@ app('router')->setCompiledRoutes(
|
|||||||
'where' =>
|
'where' =>
|
||||||
array (
|
array (
|
||||||
),
|
),
|
||||||
'as' => 'generated::jdlWZ8tNhTDVD3kW',
|
'as' => 'generated::GuwNLdeLMZ0usPlV',
|
||||||
),
|
),
|
||||||
'fallback' => false,
|
'fallback' => false,
|
||||||
'defaults' =>
|
'defaults' =>
|
||||||
|
|||||||
Generated
+225
-212
File diff suppressed because it is too large.
Load diff
@@ -19,15 +19,17 @@ return new class extends Migration
|
|||||||
$table->string('name')->nullable();
|
$table->string('name')->nullable();
|
||||||
$table->string('company')->nullable();
|
$table->string('company')->nullable();
|
||||||
$table->string('logo')->nullable();
|
$table->string('logo')->nullable();
|
||||||
|
$table->integer('logo_height')->default(0)->nullable();
|
||||||
$table->string('digitale_signatur_stempel')->nullable();
|
$table->string('digitale_signatur_stempel')->nullable();
|
||||||
$table->string('email')->nullable();
|
$table->string('email')->nullable();
|
||||||
$table->string('phone')->nullable();
|
$table->string('phone')->nullable();
|
||||||
$table->string('logo_align')->default('right');
|
$table->string('logo_align')->default('right');
|
||||||
$table->integer('logo_height')->default(0)->nullable();
|
|
||||||
$table->text('referenz_formatting')->nullable();
|
$table->text('referenz_formatting')->nullable();
|
||||||
$table->boolean('logo_anzeigen')->default(0);
|
$table->boolean('logo_anzeigen')->default(0);
|
||||||
$table->boolean('text_anzeigen')->default(0);
|
$table->boolean('text_anzeigen')->default(0);
|
||||||
|
$table->string('deckblatt_bg')->default('#efefef');
|
||||||
|
$table->string('schmuckfarbe_header')->default('#bedbff');
|
||||||
|
$table->string('farbe_borders')->default('#99a1af');
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ return new class extends Migration
|
|||||||
$table->text('beschreibung')->nullable();
|
$table->text('beschreibung')->nullable();
|
||||||
$table->string('erstellung')->nullable();
|
$table->string('erstellung')->nullable();
|
||||||
$table->string('status')->default('entwurf');
|
$table->string('status')->default('entwurf');
|
||||||
$table->string('deckblatt_bg')->default('#efefef');
|
$table->string('deckblatt_bg')->nullable();
|
||||||
$table->string('schmuckfarbe_header')->default('#bedbff');
|
$table->string('schmuckfarbe_header')->nullable();
|
||||||
$table->string('farbe_borders')->default('#99a1af');
|
$table->string('farbe_borders')->nullable();
|
||||||
$table->boolean('evaluation_gutachten')->default(0);
|
$table->boolean('evaluation_gutachten')->default(0);
|
||||||
$table->timestamp('bezahlt_am')->nullable();
|
$table->timestamp('bezahlt_am')->nullable();
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ return new class extends Migration
|
|||||||
$table->foreignId('projekt_objekte_id')->constrained()->cascadeOnDelete();
|
$table->foreignId('projekt_objekte_id')->constrained()->cascadeOnDelete();
|
||||||
$table->string('geschoss')->nullable();
|
$table->string('geschoss')->nullable();
|
||||||
$table->string('raumart')->nullable();
|
$table->string('raumart')->nullable();
|
||||||
$table->double('flaeche')->nullable();
|
$table->decimal('flaeche', 7, 2)->default(0);
|
||||||
$table->integer('nutzwert')->default(0)->nullable();
|
$table->integer('nutzwert')->default(0)->nullable();
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -19,16 +19,11 @@ body {
|
|||||||
|
|
||||||
/** POSITION FIXED */
|
/** POSITION FIXED */
|
||||||
#deckblatt-gutachter {
|
#deckblatt-gutachter {
|
||||||
margin: 12mm 10mm;
|
margin: 12mm 10mm 0;
|
||||||
height: 100mm;
|
height: 90mm;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
|
||||||
|
|
||||||
#deckblatt-logo-gutachter {
|
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
margin-bottom: 1mm;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#deckblatt-projekt {
|
#deckblatt-projekt {
|
||||||
|
|||||||
Reference in new issue
Block a user