Enhance ActivityLogsTable by updating event and causer filters to utilize the Activity model directly. Introduce a new causer_id filter with improved query logic for better user experience. Add new methods in EmployeeStatisticsService for applying table aggregates, and update localization files to include new terms for employee statistics in English, Russian, and Turkmen.
This commit is contained in:
@@ -17,6 +17,7 @@ use Filament\Tables\Filters\Filter;
|
||||
use Filament\Tables\Filters\SelectFilter;
|
||||
use Filament\Tables\Table;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Spatie\Activitylog\Models\Activity;
|
||||
|
||||
class ActivityLogsTable
|
||||
{
|
||||
@@ -67,16 +68,29 @@ class ActivityLogsTable
|
||||
]),
|
||||
SelectFilter::make('event')
|
||||
->label(__('hr.fields.event'))
|
||||
->options(fn (): array => \Spatie\Activitylog\Models\Activity::query()
|
||||
->options(fn (): array => Activity::query()
|
||||
->whereNotNull('event')
|
||||
->distinct()
|
||||
->pluck('event', 'event')
|
||||
->all()),
|
||||
SelectFilter::make('causer')
|
||||
SelectFilter::make('causer_id')
|
||||
->label(__('hr.fields.causer'))
|
||||
->relationship('causer', 'name')
|
||||
->options(fn (): array => User::query()
|
||||
->whereIn('id', Activity::query()
|
||||
->where('causer_type', User::class)
|
||||
->whereNotNull('causer_id')
|
||||
->distinct()
|
||||
->pluck('causer_id'))
|
||||
->orderBy('name')
|
||||
->pluck('name', 'id')
|
||||
->all())
|
||||
->searchable()
|
||||
->preload(),
|
||||
->query(fn (Builder $query, array $data): Builder => $query->when(
|
||||
$data['value'] ?? null,
|
||||
fn (Builder $query, $causerId): Builder => $query
|
||||
->where('causer_id', $causerId)
|
||||
->where('causer_type', User::class),
|
||||
)),
|
||||
Filter::make('created_at')
|
||||
->label(__('hr.fields.date'))
|
||||
->schema([
|
||||
|
||||
Reference in New Issue
Block a user