refactor: adjust project views and state logic, add support for conditional approval section and attachment display

lukas-staab · lukas-staab · commit 81facb748bcd · 2025-12-19T13:34:53.000+01:00
- Removed unused menu items and adjusted gradient styles.
- Conditionally rendered the approval section in `show-project` based on user roles and project state.
- Added attachment display using the `file-card` component.
- Updated `routes/web.php` to include a route for serving attachments.
- Refactored validation and state transition logic in `ProjectState` and `Draft` classes.
diff --git a/app/Livewire/Project/EditProject.php b/app/Livewire/Project/EditProject.php
@@ -5,6 +5,7 @@
 use App\Models\Legacy\ExpenseReceiptPost;
 use App\Models\Legacy\LegacyBudgetPlan;
 use App\Models\Legacy\Project;
+use App\Models\Legacy\ProjectAttachment;
 use App\Models\Legacy\ProjectPost;
 use App\States\Project\ProjectState;
 use Cknow\Money\Money;
@@ -13,6 +14,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rules\File;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Locked;
 use Livewire\Attributes\Url;
@@ -131,12 +133,26 @@ private function getValues(): array
         ];
     }
 
+    /**
+     * Add an empty post row
+     */
+    public function addEmptyPost(): void
+    {
+        $this->posts[] = ([
+            'name' => '',
+            'bemerkung' => '',
+            'einnahmen' => Money::EUR(0),
+            'ausgaben' => Money::EUR(0),
+            'titel_id' => null,
+        ]);
+    }
+
     public function isPostDeletable(int $index): bool
     {
-        return
-            count($this->posts) > 1 && (
+        return count($this->posts) > 1 && (
                 (isset($this->posts[$index]['id']) && ExpenseReceiptPost::where('projekt_posten_id', $this->posts[$index]['id'])->doesntExist())
-                || ! isset($this->posts[$index]['id']));
+                || ! isset($this->posts[$index]['id'])
+            );
     }
 
     /**
@@ -232,20 +248,6 @@ public function saveAs($stateName)
         }
     }
 
-    /**
-     * Add an empty post row
-     */
-    public function addEmptyPost(): void
-    {
-        $this->posts[] = ([
-            'name' => '',
-            'bemerkung' => '',
-            'einnahmen' => Money::EUR(0),
-            'ausgaben' => Money::EUR(0),
-            'titel_id' => null,
-        ]);
-    }
-
     /**
      * Get the sum of all income posts
      */
diff --git a/app/Livewire/Project/ShowProject.php b/app/Livewire/Project/ShowProject.php
@@ -5,6 +5,7 @@
 use App\Models\Enums\ChatMessageType;
 use App\Models\Legacy\ChatMessage;
 use App\Models\Legacy\Project;
+use App\States\Project\Draft;
 use App\States\Project\ProjectState;
 use Flux\Flux;
 use Livewire\Attributes\Url;
@@ -19,11 +20,16 @@ class ShowProject extends Component
 
     public $newState;
 
+    public $fileUrl;
+
     public function render()
     {
         $project = Project::findOrFail($this->project_id);
+        $state = $project->state;
+
+        $showApproval = \Auth::user()->getGroups()->has('ref-finanzen-hv') || !$state->equals(Draft::class);
 
-        return view('livewire.project.show-project', compact('project'));
+        return view('livewire.project.show-project', compact('project', 'showApproval'));
     }
 
     public function changeState(): void
@@ -33,7 +39,8 @@ public function changeState(): void
         $filtered = $this->validate(['newState' => ['required', new ValidStateRule(ProjectState::class)]]);
         $newState = ProjectState::make($filtered['newState'], $project);
         // Business Logic check: are some values missing for the new state
-        $newState->validate();
+        $v = $newState->getValidator();
+        $v->validate();
         // Authorization check: can the user transition to this state
         $this->authorize('transition-to', [$project, $newState]);
 
diff --git a/app/States/Project/Draft.php b/app/States/Project/Draft.php
@@ -33,8 +33,8 @@ public function rules(): array
             'protocol' => 'sometimes|nullable|string|url',
             // 'recht' => 'required|string|in:...',
             // 'recht-additional' => 'sometimes|nullable|string',
-            'date_start' => 'sometimes|date',
-            'date_end' => 'sometimes|date|after:date_start',
+            'date_start' => 'sometimes|nullable|date',
+            'date_end' => 'sometimes|nullable|date',
             'beschreibung' => ['sometimes', 'string', new FluxEditorRule],
             'posts' => 'sometimes|array|min:1',
             'posts.*.id' => 'sometimes|integer',
diff --git a/app/States/Project/ProjectState.php b/app/States/Project/ProjectState.php
@@ -18,7 +18,6 @@ abstract class ProjectState extends State implements Wireable
     public function iconName(): string
     {
         return 'file-pen';
-
     }
 
     public function color(): string
@@ -52,7 +51,7 @@ public static function config(): StateConfig
             ->allowTransition(Draft::class, Applied::class)
             ->allowTransition([ApprovedByOrg::class, ApprovedByFinance::class, ApprovedByOther::class], Terminated::class)
             ->allowTransition([Applied::class, NeedOrgApproval::class, NeedFinanceApproval::class], Revoked::class)
-            ->allowTransition([Revoked::class], Draft::class);
+            ->allowTransition([Applied::class, Revoked::class], Draft::class);
 
         // here would be some dynamic logic from config possible
 
@@ -130,20 +129,33 @@ public function rules(): array
             'posts.*.ausgaben' => ['required', 'money:EUR', new ExactlyOneZeroMoneyRule('posts.*.einnahmen')],
             'posts.*.position' => 'sometimes|integer',
             'posts.*.bemerkung' => 'sometimes|string|max:256',
+
         ];
     }
 
-    public function getValidator(): \Illuminate\Contracts\Validation\Validator
+    /**
+     * Create and return a validator instance for the provided data or the model's attributes.
+     *
+     * If the provided data is empty, it retrieves the model's attributes and populates additional
+     * data such as related posts and attachments.
+     *
+     * @param array $data An optional array of data to validate. If empty, the model's attributes will be used.
+     *
+     * @return \Illuminate\Contracts\Validation\Validator The validator instance for the given data.
+     */
+    public function getValidator(array $data = []): \Illuminate\Contracts\Validation\Validator
     {
-        $model = $this->getModel();
-        $data = [...$model->getAttributes(), 'posts' => $model->posts->all()];
-
+        if(empty($data)){
+            $model = $this->getModel();
+            $data = $this->getModel()->getAttributes();
+            $data['posts'] = $model->posts->all();
+        }
         return Validator::make($data, static::rules());
     }
 
-    public function validate(): array
+    public function validate(array $data = []): array
     {
-        return $this->getValidator()->validate();
+        return $this->getValidator($data)->validate();
     }
 
     public function toLivewire(): array
diff --git a/resources/views/livewire/project/edit-project.blade.php b/resources/views/livewire/project/edit-project.blade.php
@@ -21,9 +21,9 @@
         <div class="flex flex-col space-y-4 mt-6">
             <div class="flex flex-col items-end space-y-4">
                 <div class="flex items-center space-x-4">
-                    <flux:button :href="url()->previous()" variant="outline" icon="arrow-left">Zurück</flux:button>
+                    <flux:button :href="$isNew ? url()->previous() : route('project.show', $project_id)" variant="outline" icon="arrow-left">Zurück</flux:button>
                     <flux:button wire:click="saveAs('{{ $state_name }}')" variant="primary">
-                        Speichern
+                        Speichern als {{ $this->getState()->label() }}
                     </flux:button>
                 </div>
                 @error('save')
@@ -360,9 +360,9 @@
     <div class="flex flex-col space-y-4 mt-6">
         <div class="flex flex-col items-end space-y-4">
             <div class="flex items-center space-x-4">
-                <flux:button :href="url()->previous()" variant="outline" icon="arrow-left">Zurück</flux:button>
-                <flux:button wire:click="saveAs({{ $state_name }})" variant="primary">
-                    Speichern
+                <flux:button :href="$isNew ? url()->previous() : route('project.show', $project_id)" variant="outline" icon="arrow-left">Zurück</flux:button>
+                <flux:button wire:click="saveAs('{{ $state_name }}')" variant="primary">
+                    Speichern als {{ $this->getState()->label() }}
                 </flux:button>
                 @if($this->getState()->equals(\App\States\Project\Draft::class))
                     <flux:button wire:click="saveAs('wip')" variant="primary">
@@ -375,5 +375,4 @@
             @enderror
         </div>
     </div>
-    @dump($this->getErrorBag()->keys())
 </div>
diff --git a/resources/views/livewire/project/show-project.blade.php b/resources/views/livewire/project/show-project.blade.php
@@ -8,7 +8,7 @@
 @php $totalRemainingEinnahmen = $project->totalRemainingEinnahmen() @endphp
 @php $totalRatioEinnahmen = $project->totalRatioEinnahmen(); @endphp
 
-<div class="min-h-screen bg-gradient-to-br from-gray-50 to-gray-100 py-8">
+<div class="min-h-screen py-8">
     <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 space-y-4">
 
         <!-- Header with Status and Actions -->
@@ -57,12 +57,6 @@
                         <flux:button icon="ellipsis-vertical"/>
 
                         <flux:menu>
-                            <flux:menu.item  href="{{ route('project.history', $project->id) }}" icon="inbox-stack">
-                                Secret New Feature :)
-                            </flux:menu.item>
-                            <flux:menu.item icon="document-duplicate">
-                                Duplicate (WIP)
-                            </flux:menu.item>
                             <flux:menu.item icon="clock" href="{{ route('legacy.projekt', $project->id) }}">
                                 {{ __('project.view.header.old-view') }}
                             </flux:menu.item>
@@ -83,13 +77,13 @@
                     <div>
                         <p class="text-xs font-medium text-gray-500 uppercase">{{ __('project.view.summary_cards.state') }}</p>
                         <p @class([
-                                    "font-bold mt-1",
-                                    "text-zinc-600" => $project->state->color() === "zinc",
-                                    "text-sky-600" => $project->state->color() === "sky",
-                                    "text-yellow-600" => $project->state->color() === "yellow",
-                                    "text-green-600" => $project->state->color() === "green",
-                                    "text-rose-600" => $project->state->color() === "rose",
-                                ])>
+                            "font-bold mt-1",
+                            "text-zinc-600" => $project->state->color() === "zinc",
+                            "text-sky-600" => $project->state->color() === "sky",
+                            "text-yellow-600" => $project->state->color() === "yellow",
+                            "text-green-600" => $project->state->color() === "green",
+                            "text-rose-600" => $project->state->color() === "rose",
+                        ])>
                             {{ $project->state->label() }}
                         </p>
                     </div>
@@ -266,37 +260,39 @@
 
         </div>
 
-        <!-- Approval Section -->
-        <div class="bg-white rounded-2xl shadow-accent border border-gray-200 p-6">
-            <h2 class="text-xl font-bold text-gray-900 mb-4">{{ __('project.view.approval.heading') }}</h2>
-            <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
-                <div>
-                    <label
-                        class="block text-sm font-medium text-gray-700 mb-1">{{ __('project.view.approval.legal_basis') }}</label>
-                    @empty($project->recht)
-                        <p class="text-gray-500 italic">{{ __('project.view.approval.none') }}</p>
-                    @else
-                        <p class="text-gray-900">{{ $project->getLegal()['label'] }}</p>
-                    @endisset
-                </div>
-                <div>
-                    @if($project->getLegal())
+        @if($showApproval)
+            <!-- Approval Section -->
+            <div class="bg-white rounded-2xl shadow-accent border border-gray-200 p-6">
+                <h2 class="text-xl font-bold text-gray-900 mb-4">{{ __('project.view.approval.heading') }}</h2>
+                <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+                    <div>
                         <label
-                            class="block text-sm font-medium text-gray-700 mb-1">{{ $project->getLegal()['label-additional'] }}</label>
-                        @if($project->recht_additional)
-                            <p class="text-gray-900">{{ $project->recht_additional }}</p>
-                        @else
+                            class="block text-sm font-medium text-gray-700 mb-1">{{ __('project.view.approval.legal_basis') }}</label>
+                        @empty($project->recht)
                             <p class="text-gray-500 italic">{{ __('project.view.approval.none') }}</p>
+                        @else
+                            <p class="text-gray-900">{{ $project->getLegal()['label'] }}</p>
+                        @endisset
+                    </div>
+                    <div>
+                        @if($project->getLegal())
+                            <label
+                                class="block text-sm font-medium text-gray-700 mb-1">{{ $project->getLegal()['label-additional'] }}</label>
+                            @if($project->recht_additional)
+                                <p class="text-gray-900">{{ $project->recht_additional }}</p>
+                            @else
+                                <p class="text-gray-500 italic">{{ __('project.view.approval.none') }}</p>
+                            @endif
                         @endif
+                    </div>
+                    @if(!empty($project->getLegal()['hint-text']))
+                        <div class="lg:col-span-2 mt-2">
+                            <p class="text-sm text-gray-500 mt-1">{{ $project->getLegal()['hint-text'] ?? '' }}</p>
+                        </div>
                     @endif
                 </div>
-                @if(!empty($project->getLegal()['hint-text']))
-                    <div class="lg:col-span-2 mt-2">
-                        <p class="text-sm text-gray-500 mt-1">{{ $project->getLegal()['hint-text'] ?? '' }}</p>
-                    </div>
-                @endif
             </div>
-        </div>
+        @endif
 
         <!-- Project Details -->
         <div class="bg-white rounded-2xl shadow-accent border border-gray-200 p-6">
@@ -318,7 +314,7 @@ class="block text-sm font-medium text-gray-700 mb-1">{{ __('project.view.details
                 <div>
                     <label
                         class="block text-sm font-medium text-gray-700 mb-1">{{ __('project.view.details.responsible') }}</label>
-                @if(empty($project->responsible))
+                    @if(empty($project->responsible))
                         <x-no-content/>
                     @else
                         <a href="mailto:{{ $project->responsible }}"
@@ -490,7 +486,17 @@ class="inline-flex items-center text-indigo-600 hover:text-indigo-800 transition
                     {!! Str::markdown($project->beschreibung) !!}
                 </p>
             @endempty
-
+            <div class="grid grid-cols-1 lg:grid-cols-3 gap-6 mt-6">
+                @foreach($project->attachments as $attachment)
+                    <x-file-card
+                        :href="route('project.attachment', [$attachment->id, $attachment->name])"
+                        :heading="$attachment->name"
+                        :size="$attachment->size"
+                        :url="$attachment->url"
+                        :icon="$attachment->mime_type"
+                    />
+                @endforeach
+            </div>
         </div>
 
         <!-- Expenses Section -->
diff --git a/routes/web.php b/routes/web.php
@@ -34,6 +34,7 @@
     Route::get('project/{project_id}', \App\Livewire\Project\ShowProject::class)->name('project.show');
     Route::get('project/{project_id}/history', \App\Livewire\Project\ShowProject::class)->name('project.history');
     Route::get('project/{project_id}/edit', \App\Livewire\Project\EditProject::class)->name('project.edit');
+    Route::get('project/attachment/{attachment}/{fileName}', [\App\Http\Controllers\ProjectController::class, 'showAttachment'])->name('project.attachment');
 
 });
 
