From 9fdba6449914159a9042ef655fc21fd75e990adc Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Thu, 29 Jan 2026 10:32:13 +0700 Subject: [PATCH] refactor: Use class imports and scope methods for improved readability in chart widgets. --- app/Filament/Widgets/IssueLocationChart.php | 3 ++- app/Filament/Widgets/JournalistRegistrationChart.php | 3 ++- app/Filament/Widgets/MediaRegistrationChart.php | 3 ++- app/Filament/Widgets/TaskRealizationChart.php | 10 +++++----- app/Filament/Widgets/VerificationPerformanceChart.php | 3 ++- app/Filament/Widgets/VisitorTrafficChart.php | 3 ++- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/Filament/Widgets/IssueLocationChart.php b/app/Filament/Widgets/IssueLocationChart.php index 0d592b6..ffefa58 100644 --- a/app/Filament/Widgets/IssueLocationChart.php +++ b/app/Filament/Widgets/IssueLocationChart.php @@ -3,6 +3,7 @@ namespace App\Filament\Widgets; use App\Models\IssueManagement; +use App\Models\Location; use Filament\Widgets\ChartWidget; use Illuminate\Support\Facades\DB; @@ -17,7 +18,7 @@ class IssueLocationChart extends ChartWidget protected function getData(): array { $issueTable = (new IssueManagement)->getTable(); - $locationTable = (new \App\Models\Location)->getTable(); + $locationTable = (new Location)->getTable(); $data = IssueManagement::query() ->join($locationTable, "{$issueTable}.location_id", '=', "{$locationTable}.id") diff --git a/app/Filament/Widgets/JournalistRegistrationChart.php b/app/Filament/Widgets/JournalistRegistrationChart.php index bf4e772..69ad1b3 100644 --- a/app/Filament/Widgets/JournalistRegistrationChart.php +++ b/app/Filament/Widgets/JournalistRegistrationChart.php @@ -3,6 +3,7 @@ namespace App\Filament\Widgets; use App\Models\Journalist; +use Carbon\Carbon; use Filament\Widgets\ChartWidget; use Illuminate\Support\Facades\DB; @@ -36,7 +37,7 @@ protected function getData(): array 'backgroundColor' => 'rgba(99, 102, 241, 0.1)', ], ], - 'labels' => $data->pluck('month')->map(fn ($m) => \Carbon\Carbon::createFromFormat('Y-m', $m)->translatedFormat('M Y'))->toArray(), + 'labels' => $data->pluck('month')->map(fn ($m) => Carbon::createFromFormat('Y-m', $m)->translatedFormat('M Y'))->toArray(), ]; } diff --git a/app/Filament/Widgets/MediaRegistrationChart.php b/app/Filament/Widgets/MediaRegistrationChart.php index 9193d09..ca3a4ba 100644 --- a/app/Filament/Widgets/MediaRegistrationChart.php +++ b/app/Filament/Widgets/MediaRegistrationChart.php @@ -3,6 +3,7 @@ namespace App\Filament\Widgets; use App\Models\PartnerMedia; +use Carbon\Carbon; use Filament\Widgets\ChartWidget; use Illuminate\Support\Facades\DB; @@ -36,7 +37,7 @@ protected function getData(): array 'backgroundColor' => 'rgba(16, 185, 129, 0.1)', ], ], - 'labels' => $data->pluck('month')->map(fn ($m) => \Carbon\Carbon::createFromFormat('Y-m', $m)->translatedFormat('M Y'))->toArray(), + 'labels' => $data->pluck('month')->map(fn ($m) => Carbon::createFromFormat('Y-m', $m)->translatedFormat('M Y'))->toArray(), ]; } diff --git a/app/Filament/Widgets/TaskRealizationChart.php b/app/Filament/Widgets/TaskRealizationChart.php index 4f09f02..855d5fc 100644 --- a/app/Filament/Widgets/TaskRealizationChart.php +++ b/app/Filament/Widgets/TaskRealizationChart.php @@ -2,8 +2,8 @@ namespace App\Filament\Widgets; -use App\Enums\ApprovalStatus; use App\Models\Report; +use Carbon\Carbon; use Filament\Widgets\ChartWidget; use Illuminate\Support\Facades\DB; @@ -35,9 +35,9 @@ protected function getData(): array $rejectedData = []; foreach ($months as $month) { - $acceptedData[] = $data->where('month', $month)->where('status', ApprovalStatus::ACCEPTED)->first()?->count ?? 0; - $pendingData[] = $data->where('month', $month)->where('status', ApprovalStatus::PENDING)->first()?->count ?? 0; - $rejectedData[] = $data->where('month', $month)->where('status', ApprovalStatus::REJECTED)->first()?->count ?? 0; + $acceptedData[] = $data->where('month', $month)->accepted()->first()?->count ?? 0; + $pendingData[] = $data->where('month', $month)->pending()->first()?->count ?? 0; + $rejectedData[] = $data->where('month', $month)->rejected()->first()?->count ?? 0; } return [ @@ -58,7 +58,7 @@ protected function getData(): array 'backgroundColor' => '#EF4444', ], ], - 'labels' => $months->map(fn ($m) => \Carbon\Carbon::createFromFormat('Y-m', $m)->translatedFormat('M Y'))->toArray(), + 'labels' => $months->map(fn ($m) => Carbon::createFromFormat('Y-m', $m)->translatedFormat('M Y'))->toArray(), ]; } diff --git a/app/Filament/Widgets/VerificationPerformanceChart.php b/app/Filament/Widgets/VerificationPerformanceChart.php index de99e3e..a5fd920 100644 --- a/app/Filament/Widgets/VerificationPerformanceChart.php +++ b/app/Filament/Widgets/VerificationPerformanceChart.php @@ -4,6 +4,7 @@ use App\Enums\VerificationStatus; use App\Models\VerificationRequest; +use Carbon\Carbon; use Filament\Widgets\ChartWidget; use Illuminate\Support\Facades\DB; @@ -52,7 +53,7 @@ protected function getData(): array 'backgroundColor' => '#EF4444', ], ], - 'labels' => $months->map(fn ($m) => \Carbon\Carbon::createFromFormat('Y-m', $m)->translatedFormat('M Y'))->toArray(), + 'labels' => $months->map(fn ($m) => Carbon::createFromFormat('Y-m', $m)->translatedFormat('M Y'))->toArray(), ]; } diff --git a/app/Filament/Widgets/VisitorTrafficChart.php b/app/Filament/Widgets/VisitorTrafficChart.php index 24ce400..4aa4e9c 100644 --- a/app/Filament/Widgets/VisitorTrafficChart.php +++ b/app/Filament/Widgets/VisitorTrafficChart.php @@ -3,6 +3,7 @@ namespace App\Filament\Widgets; use App\Models\Visitor; +use Carbon\Carbon; use Filament\Widgets\ChartWidget; use Illuminate\Support\Facades\DB; @@ -36,7 +37,7 @@ protected function getData(): array 'backgroundColor' => 'rgba(59, 130, 246, 0.1)', ], ], - 'labels' => $data->pluck('day')->map(fn ($d) => \Carbon\Carbon::parse($d)->translatedFormat('d M'))->toArray(), + 'labels' => $data->pluck('day')->map(fn ($d) => Carbon::parse($d)->translatedFormat('d M'))->toArray(), ]; }