Compare commits

..

No commits in common. "9501d8f1c2c269adda59922a50e2cf8acf9dbb50" and "8d887de837d8f429c0068f8bb45370a044f8cf7a" have entirely different histories.

2 changed files with 10 additions and 29 deletions

View File

@ -4,17 +4,14 @@ namespace App\Filament\Resources\Todos\Tables;
use App\Models\Group; use App\Models\Group;
use App\Models\User; use App\Models\User;
use Filament\Actions\Action;
use Filament\Actions\BulkActionGroup; use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteBulkAction; use Filament\Actions\DeleteBulkAction;
use Filament\Actions\EditAction; use Filament\Actions\EditAction;
use Filament\Support\Icons\Heroicon;
use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\IconColumn;
use Filament\Tables\Columns\TextColumn; use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\Filter; use Filament\Tables\Filters\Filter;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
class TodosTable class TodosTable
{ {
@ -58,36 +55,25 @@ class TodosTable
->boolean(), ->boolean(),
]) ])
->filters([ ->filters([
Filter::make('mine')->label('von mir oder für mich')
->default()
->query(function (Builder $query) {
$query->where('user_id', filament()->auth()->user()->id)
->orWhere('todoable_type', User::class)->where('todoable_id', filament()->auth()->user()->id)
->orwhere('todoable_type', Group::class)->whereIn('todoable_id', User::find(filament()->auth()->user()->id)->groups()->get()->pluck('id'));
return $query;
}),
Filter::make('alleoffenen') Filter::make('alleoffenen')
->default() ->default()
->label('nicht erledigt') ->label('nicht erledigt')
->query(function (Builder $query) { ->query(function (Builder $query) {
$query->whereNull('done_date'); $query->where('done_date', null);
return $query;
}),
Filter::make('mine')->label('von mir oder für mich')
->default()
->query(function (Builder $query) {
$query->where(function (Builder $query) {
$query
->orWhere('user_id', filament()->auth()->user()->id)
->orWhere('todoable_type', User::class)->where('todoable_id', filament()->auth()->user()->id)
->orwhere('todoable_type', Group::class)->whereIn('todoable_id', User::find(filament()->auth()->user()->id)->groups()->get()->pluck('id'));
return $query;
});
return $query; return $query;
}), }),
]) ])
->recordActions([ ->recordActions([
Action::make('done') EditAction::make(),
->iconButton()
->icon(Heroicon::Check)
->action(function (Model $record) {
$record->done_date = now()->today();
$record->save();
}),
EditAction::make()->iconButton(),
]) ])
->toolbarActions([ ->toolbarActions([
BulkActionGroup::make([ BulkActionGroup::make([

View File

@ -2,7 +2,6 @@
namespace App\Providers\Filament; namespace App\Providers\Filament;
use Filament\FontProviders\LocalFontProvider;
use Filament\Http\Middleware\Authenticate; use Filament\Http\Middleware\Authenticate;
use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\AuthenticateSession;
use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DisableBladeIconComponents;
@ -34,10 +33,6 @@ class AdminPanelProvider extends PanelProvider
->databaseNotifications() ->databaseNotifications()
->profile() ->profile()
->passwordReset() ->passwordReset()
->font(
'Bunny',
provider: LocalFontProvider::class,
)
->colors([ ->colors([
'primary' => Color::Amber, 'primary' => Color::Amber,
]) ])