Timesheet fixes on reports

Author: mihaisolomon

app/Filament/Pages/TimesheetDashboard.php

@@ -5,16 +5,14 @@
 use App\Filament\Widgets\Timesheet\ActivitiesReport;
 use App\Filament\Widgets\Timesheet\MonthlyReport;
 use App\Filament\Widgets\Timesheet\WeeklyReport;
-use Filament\Pages\Page;
+use Filament\Pages\Dashboard;
 
-class TimesheetDashboard extends Page
+class TimesheetDashboard extends Dashboard
 {
     protected static ?string $slug = 'timesheet-dashboard';
 
     protected static ?int $navigationSort = 2;
 
-    protected string $view = 'filament::pages.dashboard';
-
     public function getColumns(): int | array
     {
         return 6;

app/Filament/Widgets/Timesheet/ActivitiesReport.php

@@ -19,7 +19,13 @@ class ActivitiesReport extends ChartWidget
         'lg' => 3
     ];
 
-    public ?string $filter = '2023';
+    public ?string $filter = null;
+
+    public function mount(): void
+    {
+        $this->filter = (string) Carbon::now()->year;
+        parent::mount();
+    }
 
     public function getHeading(): string
     {
@@ -33,16 +39,23 @@ public function getType(): string
 
     public function getFilters(): ?array
     {
-        return [
-            2022 => 2022,
-            2023 => 2023
-        ];
+        $currentYear = (int) Carbon::now()->year;
+        $firstYear = (int) (TicketHour::min('created_at')
+            ? Carbon::parse(TicketHour::min('created_at'))->year
+            : $currentYear);
+
+        $years = [];
+        for ($year = $firstYear; $year <= $currentYear; $year++) {
+            $years[(string) $year] = (string) $year;
+        }
+
+        return $years;
     }
 
     public function getData(): array
     {
         $collection = $this->filter(auth()->user(), [
-            'year' => $this->filter
+            'year' => $this->filter ?: Carbon::now()->year
         ]);
 
         $datasets = $this->getDatasets($collection);

app/Filament/Widgets/Timesheet/MonthlyReport.php

@@ -18,7 +18,13 @@ public function getHeading(): string
         return __('Logged time monthly');
     }
 
-    public ?string $filter = '2023';
+    public ?string $filter = null;
+
+    public function mount(): void
+    {
+        $this->filter = (string) Carbon::now()->year;
+        parent::mount();
+    }
 
     public function getType(): string
     {
@@ -52,10 +58,17 @@ public function getData(): array
 
     public function getFilters(): ?array
     {
-        return [
-            2022 => 2022,
-            2023 => 2023
-        ];
+        $currentYear = (int) Carbon::now()->year;
+        $firstYear = (int) (TicketHour::min('created_at')
+            ? Carbon::parse(TicketHour::min('created_at'))->year
+            : $currentYear);
+
+        $years = [];
+        for ($year = $firstYear; $year <= $currentYear; $year++) {
+            $years[(string) $year] = (string) $year;
+        }
+
+        return $years;
     }
 
     protected ?array $options = [

app/Filament/Widgets/Timesheet/WeeklyReport.php

@@ -20,13 +20,12 @@ class WeeklyReport extends ChartWidget
         'lg' => 3
     ];
 
-    public function __construct($id = null)
+    public function mount(): void
     {
-        $weekDaysData = $this->getWeekStartAndFinishDays();
+        parent::mount();
 
+        $weekDaysData = $this->getWeekStartAndFinishDays();
         $this->filter = $weekDaysData['weekStartDate'] . ' - ' . $weekDaysData['weekEndDate'];
-
-        parent::__construct($id);
     }
 
     public function getHeading(): string
@@ -41,6 +40,11 @@ public function getType(): string
 
     public function getData(): array
     {
+        if (empty($this->filter) || !str_contains($this->filter, ' - ')) {
+            $weekDefaults = $this->getWeekStartAndFinishDays();
+            $this->filter = $weekDefaults['weekStartDate'] . ' - ' . $weekDefaults['weekEndDate'];
+        }
+
         $weekDaysData = explode(' - ', $this->filter);
 
         $collection = $this->filter(auth()->user(), [