diff --git a/app/Filament/Resources/User/HitAndRunResource.php b/app/Filament/Resources/User/HitAndRunResource.php index 6d44ef63..88cd68a2 100644 --- a/app/Filament/Resources/User/HitAndRunResource.php +++ b/app/Filament/Resources/User/HitAndRunResource.php @@ -70,11 +70,32 @@ class HitAndRunResource extends Resource ->label('UID') ->placeholder('UID') , - ])->query(function (Builder $query, array $data) { + ]) + ->query(function (Builder $query, array $data) { return $query->when($data['uid'], fn (Builder $query, $uid) => $query->where("uid", $uid)); }) , Tables\Filters\SelectFilter::make('status')->options(HitAndRun::listStatus(true))->label(__('label.status')), + Tables\Filters\Filter::make('created_at_begin') + ->form([ + Forms\Components\DatePicker::make('created_at_begin') + ->maxDate(now()) + ->label(__('hr.created_at_begin')) + , + ])->query(function (Builder $query, array $data) { + return $query->when($data['created_at_begin'], fn (Builder $query, $value) => $query->where("created_at", '>=', $value)); + }) + , + Tables\Filters\Filter::make('created_at_end') + ->form([ + Forms\Components\DatePicker::make('created_at_end') + ->maxDate(now()) + ->label(__('hr.created_at_end')) + , + ])->query(function (Builder $query, array $data) { + return $query->when($data['created_at_end'], fn (Builder $query, $value) => $query->where("created_at", '<=', $value)); + }) + , ]) ->actions([ Tables\Actions\ViewAction::make(), @@ -88,6 +109,8 @@ class HitAndRunResource extends Resource ->deselectRecordsAfterCompletion() ->label(__('admin.resources.hit_and_run.bulk_action_pardon')) ->icon('heroicon-o-x-mark') + , + Tables\Actions\DeleteBulkAction::make('bulkDelete') ]); } diff --git a/include/constants.php b/include/constants.php index 33be1c48..e0fde4b5 100644 --- a/include/constants.php +++ b/include/constants.php @@ -1,6 +1,6 @@ 'Client', 'reason' => 'Reason', 'change' => 'Change', + 'created_at_begin' => 'Created at begin', + 'created_at_end' => 'Created at end', 'setting' => [ 'nav_text' => 'Setting', 'backup' => [ diff --git a/resources/lang/zh_CN/label.php b/resources/lang/zh_CN/label.php index 443565d7..84e6f766 100644 --- a/resources/lang/zh_CN/label.php +++ b/resources/lang/zh_CN/label.php @@ -42,6 +42,8 @@ return [ 'reason' => '原因', 'change' => '修改', 'create' => '创建', + 'created_at_begin' => '创建时间开始', + 'created_at_end' => '创建时间结束', 'setting' => [ 'nav_text' => '设置', 'backup' => [ diff --git a/resources/lang/zh_TW/label.php b/resources/lang/zh_TW/label.php index 71b1a9b3..95f77641 100644 --- a/resources/lang/zh_TW/label.php +++ b/resources/lang/zh_TW/label.php @@ -41,6 +41,8 @@ return [ 'client' => '客戶端', 'reason' => '原因', 'change' => '修改', + 'created_at_begin' => '創建時間開始', + 'created_at_end' => '創建時間結束', 'setting' => [ 'nav_text' => '設置', 'backup' => [