From ef49675ffe71821ac5a4d32447a4948d3c6dbe1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anna-Sara=20S=C3=A9lea?= Date: Mon, 27 Jan 2025 20:04:39 +0100 Subject: [PATCH] Small fixes --- .../Resources/ItemResource/Widgets/ItemsOverview.php | 12 ++++++------ .../ReserveditemResource/Pages/EditReserveditem.php | 4 +--- app/Filament/Resources/ReserveditemResourceUser.php | 5 +++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/Filament/Resources/ItemResource/Widgets/ItemsOverview.php b/app/Filament/Resources/ItemResource/Widgets/ItemsOverview.php index 7eb1c35..4f735f8 100644 --- a/app/Filament/Resources/ItemResource/Widgets/ItemsOverview.php +++ b/app/Filament/Resources/ItemResource/Widgets/ItemsOverview.php @@ -26,13 +26,13 @@ class ItemsOverview extends BaseWidget ->searchable(), Tables\Columns\ImageColumn::make('image') ->label('Bild'), - Tables\Columns\IconColumn::make('reserveditem.reserved') + Tables\Columns\IconColumn::make('reserved') ->label('Tillgänglig') - ->trueIcon('heroicon-o-check-badge') - ->falseIcon('heroicon-o-x-mark') - ->trueColor('success') - ->falseColor('danger') - ->default(true), + ->falseIcon('heroicon-o-check-badge') + ->trueIcon('heroicon-o-x-mark') + ->falseColor('success') + ->trueColor('danger') + ->default(false), Tables\Columns\TextColumn::make('reserveditem.return_date') ->label('Tillbaka') ->searchable(), diff --git a/app/Filament/Resources/ReserveditemResource/Pages/EditReserveditem.php b/app/Filament/Resources/ReserveditemResource/Pages/EditReserveditem.php index 06d04ad..ed90d1e 100644 --- a/app/Filament/Resources/ReserveditemResource/Pages/EditReserveditem.php +++ b/app/Filament/Resources/ReserveditemResource/Pages/EditReserveditem.php @@ -22,9 +22,7 @@ class EditReserveditem extends EditRecord protected function mutateFormDataBeforeSave(array $data): array { - $data['user_id'] = auth()->id(); - $data['username'] = auth()->user()->name; - + if ($data['delivered']) { $data['delivered_date'] = Carbon::now(); diff --git a/app/Filament/Resources/ReserveditemResourceUser.php b/app/Filament/Resources/ReserveditemResourceUser.php index 5ac988c..517f85b 100644 --- a/app/Filament/Resources/ReserveditemResourceUser.php +++ b/app/Filament/Resources/ReserveditemResourceUser.php @@ -102,4 +102,9 @@ class ReserveditemResourceUser extends Resource ItemResource\Widgets\ItemsOverview::class, ]; } + +public static function canViewAny(): bool +{ + return auth()->user()->is_admin==false; + } }