salam/nutzwerte_fi4
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename tables raumealle, allgemeinflaechen orientierung_zu_abschlaege

Browse Source
This commit is contained in:
salam committed 2025-10-25 05:47:33 +02:00
1 parent f2b6487ec0
commit 92bdc77eee
31 files changed
+194 -197
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Filament/Imports/AllgemeinflaechenImporter.php
+5 -5
View File
@@ -2,19 +2,19 @@
namespace App\Filament\Imports;
use App\Models\Allgemeinflaechen;
use App\Models\ProjektAllgemeinflaechen;
use Filament\Actions\Imports\ImportColumn;
use Filament\Actions\Imports\Importer;
use Filament\Actions\Imports\Models\Import;
use Illuminate\Support\Number;
class AllgemeinflaechenImporter extends Importer
class ProjektAllgemeinflaechenImporter extends Importer
{
protected static ?string $model = Allgemeinflaechen::class;
protected static ?string $model = ProjektAllgemeinflaechen::class;
public function resolveRecord(): Allgemeinflaechen
public function resolveRecord(): ProjektAllgemeinflaechen
{
$allgemeinflaechen = new Allgemeinflaechen;
$allgemeinflaechen = new ProjektAllgemeinflaechen;
$allgemeinflaechen->projekte_id = $this->options['projekte_id'];
return $allgemeinflaechen;
app/Filament/Imports/RaeumealleImporter.php
+5 -5
View File
@@ -2,19 +2,19 @@
namespace App\Filament\Imports;
use App\Models\Raeumealle;
use App\Models\ProjektRaeumealle;
use Filament\Actions\Imports\ImportColumn;
use Filament\Actions\Imports\Importer;
use Filament\Actions\Imports\Models\Import;
use Illuminate\Support\Number;
class RaeumealleImporter extends Importer
class ProjektRaeumealleImporter extends Importer
{
protected static ?string $model = Raeumealle::class;
protected static ?string $model = ProjektRaeumealle::class;
public function resolveRecord(): Raeumealle
public function resolveRecord(): ProjektRaeumealle
{
$raeumealle = new Raeumealle;
$raeumealle = new ProjektRaeumealle;
$raeumealle->projekte_id = $this->options['projekte_id'];
return $raeumealle;
app/Filament/Resources/Projektes/Pages/EditProjekte.php
+2 -2
View File
@@ -17,10 +17,10 @@ class EditProjekte extends EditRecord
{
protected static string $resource = ProjekteResource::class;
#[On('refreshAllgemeinflaechen'), On('refreshRaeumealle'), On('refreshMethods'), On('refreshOrientierung')]
#[On('refreshProjektAllgemeinflaechen'), On('refreshProjektRaeumealle'), On('refreshMethods'), On('refreshOrientierung')]
public function refresh(): void {}
// #[On('refreshRaeumealle')]
// #[On('refreshProjektRaeumealle')]
// public function refresh(): void {}
protected function getHeaderActions(): array
app/Filament/Resources/Projektes/ProjekteResource.php
+6 -6
View File
@@ -4,12 +4,12 @@ namespace App\Filament\Resources\Projektes;
use App\Filament\Resources\Projektes\Pages\EditProjekte;
use App\Filament\Resources\Projektes\Pages\ListProjektes;
use App\Filament\Resources\Projektes\RelationManagers\AllgemeinflaechensRelationManager;
use App\Filament\Resources\Projektes\RelationManagers\OrientierungZuAbschlaegesRelationManager;
use App\Filament\Resources\Projektes\RelationManagers\ProjektAllgemeinflaechensRelationManager;
use App\Filament\Resources\Projektes\RelationManagers\ProjektInhaltsverzeichnisRelationManager;
use App\Filament\Resources\Projektes\RelationManagers\ProjektMethodesRelationManager;
use App\Filament\Resources\Projektes\RelationManagers\ProjektOrientierungZuAbschlaegesRelationManager;
use App\Filament\Resources\Projektes\RelationManagers\ProjektPlatzhalterRelationManager;
use App\Filament\Resources\Projektes\RelationManagers\RaeumeallesRelationManager;
use App\Filament\Resources\Projektes\RelationManagers\ProjektRaeumeallesRelationManager;
use App\Filament\Resources\Projektes\Schemas\ProjekteForm;
use App\Filament\Resources\Projektes\Tables\ProjektesTable;
use App\Models\Projekte;
@@ -47,10 +47,10 @@ class ProjekteResource extends Resource
public static function getRelations(): array
{
return [
AllgemeinflaechensRelationManager::class,
RaeumeallesRelationManager::class,
ProjektAllgemeinflaechensRelationManager::class,
ProjektRaeumeallesRelationManager::class,
ProjektMethodesRelationManager::class,
OrientierungZuAbschlaegesRelationManager::class,
ProjektOrientierungZuAbschlaegesRelationManager::class,
ProjektInhaltsverzeichnisRelationManager::class,
ProjektPlatzhalterRelationManager::class,
];
app/Filament/Resources/Projektes/RelationManagers/AllgemeinflaechensRelationManager.php → app/Filament/Resources/Projektes/RelationManagers/ProjektAllgemeinflaechensRelationManager.php
+8 -8
View File
@@ -2,7 +2,7 @@
namespace App\Filament\Resources\Projektes\RelationManagers;
use App\Filament\Imports\AllgemeinflaechenImporter;
use App\Filament\Imports\ProjektAllgemeinflaechenImporter;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\CreateAction;
use Filament\Actions\DeleteAction;
@@ -20,9 +20,9 @@ use Illuminate\Support\HtmlString;
use Illuminate\Validation\Rules\File;
use Livewire\Component;
class AllgemeinflaechensRelationManager extends RelationManager
class ProjektAllgemeinflaechensRelationManager extends RelationManager
{
protected static string $relationship = 'allgemeinflaechens';
protected static string $relationship = 'projekt_allgemeinflaechens';
protected static ?string $title = 'Allgemeinflächen';
@@ -77,7 +77,7 @@ class AllgemeinflaechensRelationManager extends RelationManager
'decimal' => 'Für die Fläche sind zwei Dezimalstellen erforderlich.',
])
->afterStateUpdated(function (Component $livewire) {
$livewire->dispatch('refreshAllgemeinflaechen');
$livewire->dispatch('refreshProjektAllgemeinflaechen');
}),
])
->filters([
@@ -88,7 +88,7 @@ class AllgemeinflaechensRelationManager extends RelationManager
->icon('phosphor-file-plus')
->createAnother(false),
ImportAction::make()
->importer(AllgemeinflaechenImporter::class)
->importer(ProjektAllgemeinflaechenImporter::class)
->modalHeading('Allgemeinflächen Import')
// ->modalSubmitActionLabel('Yes, delete it')
->label('Hochladen')
@@ -104,17 +104,17 @@ class AllgemeinflaechensRelationManager extends RelationManager
->recordActions([
EditAction::make()->iconButton()
->after(function (Component $livewire) {
$livewire->dispatch('refreshAllgemeinflaechen');
$livewire->dispatch('refreshProjektAllgemeinflaechen');
}),
DeleteAction::make()->iconButton()->after(function (Component $livewire) {
$livewire->dispatch('refreshAllgemeinflaechen');
$livewire->dispatch('refreshProjektAllgemeinflaechen');
}),
])
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make()
->after(function (Component $livewire) {
$livewire->dispatch('refreshAllgemeinflaechen');
$livewire->dispatch('refreshProjektAllgemeinflaechen');
}),
]),
]);
app/Filament/Resources/Projektes/RelationManagers/OrientierungZuAbschlaegesRelationManager.php → app/Filament/Resources/Projektes/RelationManagers/ProjektOrientierungZuAbschlaegesRelationManager.php
+18 -18
View File
@@ -2,10 +2,10 @@
namespace App\Filament\Resources\Projektes\RelationManagers;
use App\Actions\Create\CreateOrientierungZuAbschlaege;
use App\Actions\Create\CreateProjektOrientierungZuAbschlaege;
use App\Models\Merkmale;
use App\Models\Orientierung;
use App\Models\OrientierungZuAbschlaege;
use App\Models\ProjektOrientierungZuAbschlaege;
use Filament\Actions\Action;
use Filament\Actions\BulkAction;
use Filament\Actions\BulkActionGroup;
@@ -25,9 +25,9 @@ use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Collection;
use Livewire\Component;
class OrientierungZuAbschlaegesRelationManager extends RelationManager
class ProjektOrientierungZuAbschlaegesRelationManager extends RelationManager
{
protected static string $relationship = 'orientierung_zu_abschlaeges';
protected static string $relationship = 'projekt_orientierung_zu_abschlaeges';
protected static ?string $title = 'Orientierung Zu/Abschläge';
@@ -230,7 +230,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
$livewire->dispatch('refreshOrientierung');
}),
Action::make('erstellen')
->action(fn (CreateOrientierungZuAbschlaege $createOrientierungZuAbschlaege) => $createOrientierungZuAbschlaege->create($this->ownerRecord))
->action(fn (CreateProjektOrientierungZuAbschlaege $createProjektOrientierungZuAbschlaege) => $createProjektOrientierungZuAbschlaege->create($this->ownerRecord))
->requiresConfirmation()
->modalHeading('Orientierung Zu/Abschläge erstellen')
->modalDescription('Alle bestehenden Daten in dieser Tabelle werden vorher gelöscht.')
@@ -254,7 +254,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->icon('phosphor-align-center-horizontal-simple')
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->where('nicht_in_orientierung', '=', false)
->update(
['type' => $data['type']]
@@ -278,7 +278,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->icon('phosphor-compass')
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
['orientierung_id' => $data['methode_id']]
);
@@ -302,7 +302,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->icon('phosphor-check-square')
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
['nicht_in_orientierung' => 1]
);
@@ -323,7 +323,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('a', $data['a'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'a' => $data['a'],
@@ -346,7 +346,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('b', $data['b'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'b' => $data['b'],
@@ -369,7 +369,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('c', $data['c'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'c' => $data['c'],
@@ -392,7 +392,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('d', $data['d'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'd' => $data['d'],
@@ -415,7 +415,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('e', $data['e'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'e' => $data['e'],
@@ -438,7 +438,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('f', $data['f'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'f' => $data['f'],
@@ -461,7 +461,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('g', $data['g'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'g' => $data['g'],
@@ -484,7 +484,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('h', $data['h'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'h' => $data['h'],
@@ -507,7 +507,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('i', $data['i'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'i' => $data['i'],
@@ -530,7 +530,7 @@ class OrientierungZuAbschlaegesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = $this->sum_nutzwerte('j', $data['j'], $record);
OrientierungZuAbschlaege::where('id', '=', $record->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $record->id)
->update(
[
'j' => $data['j'],
app/Filament/Resources/Projektes/RelationManagers/RaeumeallesRelationManager.php → app/Filament/Resources/Projektes/RelationManagers/ProjektRaeumeallesRelationManager.php
+17 -18
View File
@@ -2,8 +2,8 @@
namespace App\Filament\Resources\Projektes\RelationManagers;
use App\Filament\Imports\RaeumealleImporter;
use App\Models\Raeumealle;
use App\Filament\Imports\ProjektRaeumealleImporter;
use App\Models\ProjektRaeumealle;
use Filament\Actions\BulkAction;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\CreateAction;
@@ -18,7 +18,6 @@ use Filament\Support\Enums\FontWeight;
use Filament\Tables\Columns\Summarizers\Sum;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Columns\TextInputColumn;
use Filament\Tables\Enums\FiltersLayout;
use Filament\Tables\Filters\SelectFilter;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Collection;
@@ -26,9 +25,9 @@ use Illuminate\Support\HtmlString;
use Illuminate\Validation\Rules\File;
use Livewire\Component;
class RaeumeallesRelationManager extends RelationManager
class ProjektRaeumeallesRelationManager extends RelationManager
{
protected static string $relationship = 'raeumealles';
protected static string $relationship = 'projekt_raeumealles';
protected static ?string $title = 'Räume Alle';
@@ -60,13 +59,13 @@ class RaeumeallesRelationManager extends RelationManager
'decimal' => 'Für die Fläche sind zwei Dezimalstellen erforderlich.',
])
->afterStateUpdated(function (Component $livewire) {
$livewire->dispatch('refreshAllgemeinflaechen');
$livewire->dispatch('refreshProjektAllgemeinflaechen');
}),
TextInput::make('faktor')
->suffixIcon('phosphor-function')
->rules(['required', 'faktor' => 'decimal:0,2'])
->afterStateUpdated(function (Component $livewire) {
$livewire->dispatch('refreshRaeumealle');
$livewire->dispatch('refreshProjektRaeumealle');
})->validationMessages([
'required' => 'Die Eingabe eines Faktors ist erforderlich.',
'decimal' => 'Für den Faktors sind zwei Dezimalstellen erforderlich.',
@@ -92,7 +91,7 @@ class RaeumeallesRelationManager extends RelationManager
->rules(['required', 'faktor' => 'decimal:0,2'])
->searchable()
->afterStateUpdated(function (Component $livewire) {
$livewire->dispatch('refreshRaeumealle');
$livewire->dispatch('refreshProjektRaeumealle');
})->validationMessages([
'required' => 'Die Eingabe eines Faktors ist erforderlich.',
'decimal' => 'Für den Faktors sind zwei Dezimalstellen erforderlich.',
@@ -108,7 +107,7 @@ class RaeumeallesRelationManager extends RelationManager
->label('Fläche')
->searchable()
->afterStateUpdated(function (Component $livewire) {
$livewire->dispatch('refreshRaeumealle');
$livewire->dispatch('refreshProjektRaeumealle');
})->validationMessages([
'required' => 'Die Eingabe einer Fläche ist erforderlich.',
'decimal' => 'Für die Fläche sind zwei Dezimalstellen erforderlich.',
@@ -123,17 +122,17 @@ class RaeumeallesRelationManager extends RelationManager
->label('Top Nummer')
->searchable()
->options(function (): array {
return Raeumealle::where('projekte_id', $this->getOwnerRecord()->id)->groupBy('top_nummer')->orderBy('top_nummer')->pluck('top_nummer', 'top_nummer')->toArray();
return ProjektRaeumealle::where('projekte_id', $this->getOwnerRecord()->id)->groupBy('top_nummer')->orderBy('top_nummer')->pluck('top_nummer', 'top_nummer')->toArray();
}),
SelectFilter::make('geschoss')
->searchable()
->options(function (): array {
return Raeumealle::where('projekte_id', $this->getOwnerRecord()->id)->groupBy('geschoss')->orderBy('geschoss')->pluck('geschoss', 'geschoss')->toArray();
return ProjektRaeumealle::where('projekte_id', $this->getOwnerRecord()->id)->groupBy('geschoss')->orderBy('geschoss')->pluck('geschoss', 'geschoss')->toArray();
}),
SelectFilter::make('raumart')
->searchable()
->options(function (): array {
return Raeumealle::where('projekte_id', $this->getOwnerRecord()->id)->groupBy('raumart')->orderBy('raumart')->pluck('raumart', 'raumart')->toArray();
return ProjektRaeumealle::where('projekte_id', $this->getOwnerRecord()->id)->groupBy('raumart')->orderBy('raumart')->pluck('raumart', 'raumart')->toArray();
}),
])
// ], layout: FiltersLayout::AboveContentCollapsible)
@@ -142,7 +141,7 @@ class RaeumeallesRelationManager extends RelationManager
->icon('phosphor-file-plus')
->createAnother(false),
ImportAction::make()
->importer(RaeumealleImporter::class)
->importer(ProjektRaeumealleImporter::class)
->label('Hochladen')
->icon('phosphor-upload')
->color('info')
@@ -160,10 +159,10 @@ class RaeumeallesRelationManager extends RelationManager
return $data;
})->after(function (Component $livewire) {
$livewire->dispatch('refreshRaeumealle');
$livewire->dispatch('refreshProjektRaeumealle');
}),
DeleteAction::make()->iconButton()->after(function (Component $livewire) {
$livewire->dispatch('refreshRaeumealle');
$livewire->dispatch('refreshProjektRaeumealle');
}),
])
->toolbarActions([
@@ -181,7 +180,7 @@ class RaeumeallesRelationManager extends RelationManager
->action(function (Collection $records, array $data): void {
foreach ($records as $record) {
$nutzwert = round($data['faktor'] * $record->flaeche);
Raeumealle::where('id', '=', $record->id)
ProjektRaeumealle::where('id', '=', $record->id)
->update(
[
'faktor' => $data['faktor'],
@@ -190,10 +189,10 @@ class RaeumeallesRelationManager extends RelationManager
);
}
})->after(function (Component $livewire) {
$livewire->dispatch('refreshRaeumealle');
$livewire->dispatch('refreshProjektRaeumealle');
}),
DeleteBulkAction::make()->after(function (Component $livewire) {
$livewire->dispatch('refreshRaeumealle');
$livewire->dispatch('refreshProjektRaeumealle');
}),
]),
]);
app/Filament/Resources/Projektes/Widgets/WidgetMerkmale.php
+4 -4
View File
@@ -3,7 +3,7 @@
namespace App\Filament\Resources\Projektes\Widgets;
use App\Models\Merkmale;
use App\Models\OrientierungZuAbschlaege;
use App\Models\ProjektOrientierungZuAbschlaege;
use Filament\Actions\Action;
use Filament\Actions\DeleteAction;
use Filament\Actions\EditAction;
@@ -49,14 +49,14 @@ class WidgetMerkmale extends TableWidget
->color('gray')
->iconButton()
->after(function ($record) {
OrientierungZuAbschlaege::where('projekte_id', '=', $record->projekte_id)
ProjektOrientierungZuAbschlaege::where('projekte_id', '=', $record->projekte_id)
->update(
[$record->code => 0]
);
$res = OrientierungZuAbschlaege::where('projekte_id', '=', $record->projekte_id)->get();
$res = ProjektOrientierungZuAbschlaege::where('projekte_id', '=', $record->projekte_id)->get();
foreach ($res as $value) {
$nutzwert = round($value->a + $value->b + $value->c + $value->d + $value->e + $value->f + $value->g + $value->h + $value->i + $value->j);
OrientierungZuAbschlaege::where('id', '=', $value->id)
ProjektOrientierungZuAbschlaege::where('id', '=', $value->id)
->update(
['nutzwert' => $nutzwert]
);