Merge pull request #40 from devaslanphp/master

Merge master into dev

Author: heloufir

app/Filament/Pages/Dashboard.php

@@ -2,6 +2,15 @@
 
 namespace App\Filament\Pages;
 
+use App\Filament\Widgets\FavoriteProjects;
+use App\Filament\Widgets\LatestActivities;
+use App\Filament\Widgets\LatestComments;
+use App\Filament\Widgets\LatestProjects;
+use App\Filament\Widgets\LatestTickets;
+use App\Filament\Widgets\TicketsByPriority;
+use App\Filament\Widgets\TicketsByType;
+use App\Filament\Widgets\TicketTimeLogged;
+use App\Filament\Widgets\UserTimeLogged;
 use Filament\Pages\Dashboard as BasePage;
 
 class Dashboard extends BasePage
@@ -12,4 +21,19 @@ protected function getColumns(): int | array
     {
         return 6;
     }
+
+    protected function getWidgets(): array
+    {
+        return [
+            FavoriteProjects::class,
+            LatestActivities::class,
+            LatestComments::class,
+            LatestProjects::class,
+            LatestTickets::class,
+            TicketsByPriority::class,
+            TicketsByType::class,
+            TicketTimeLogged::class,
+            UserTimeLogged::class
+        ];
+    }
 }

app/Filament/Pages/TimesheetDashboard.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Filament\Pages;
+
+use App\Filament\Widgets\Timesheet\MonthlyReport;
+use Filament\Pages\Page;
+
+class TimesheetDashboard extends Page
+{
+    protected static ?string $slug = 'timesheet-dashboard';
+
+    protected static ?int $navigationSort = 1;
+
+    protected static string $view = 'filament::pages.dashboard';
+
+    protected function getColumns(): int | array
+    {
+        return 6;
+    }
+
+    protected static function getNavigationLabel(): string
+    {
+        return __('Dashboard');
+    }
+
+    protected static function getNavigationGroup(): ?string
+    {
+        return __('Timesheet');
+    }
+
+    protected function getWidgets(): array
+    {
+        return [
+            MonthlyReport::class
+        ];
+    }
+}

app/Filament/Resources/TimesheetResource.php

@@ -79,6 +79,7 @@ public static function table(Table $table): Table
                     ->searchable(),
                 Tables\Columns\TextColumn::make('comment')
                     ->label(__('Comment'))
+                    ->limit(50)
                     ->sortable()
                     ->searchable(),
 

app/Filament/Widgets/Timesheet/MonthlyReport.php

@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Widgets\Timesheet;
+
+use App\Models\TicketHour;
+use App\Models\User;
+use Carbon\Carbon;
+use Filament\Widgets\BarChartWidget;
+use Illuminate\Support\Facades\DB;
+
+class MonthlyReport extends BarChartWidget
+{
+    protected function getHeading(): string
+    {
+        return __('Logged time monthly');
+    }
+
+    protected function getData(): array
+    {
+        $months = [
+            1 => ['January', 0],
+            2 => ['February', 0],
+            3 => ['March', 0],
+            4 => ['April', 0],
+            5 => ['May', 0],
+            6 => ['June', 0],
+            7 => ['July', 0],
+            8 => ['August', 0],
+            9 => ['September', 0],
+            10 => ['October', 0],
+            11 => ['November', 0],
+            12 => ['December', 0]
+        ];
+
+
+        $data = $this->filter(auth()->user());
+
+        foreach ($data as $value) {
+            if (isset($months[(int)$value->month])) {
+                $months[(int)$value->month][1] = (float)$value->value;
+            }
+        }
+
+        $datasets = [];
+        $labels = [];
+        foreach ($months as $month) {
+            $datasets[] = $month[1];
+            $labels[] = $month[0];
+        }
+
+        return [
+            'datasets' => [
+                [
+                    'label' => __('Total time logged'),
+                    'data' => $datasets,
+                    'backgroundColor' => [
+                        'rgba(54, 162, 235, .6)'
+                    ],
+                    'borderColor' => [
+                        'rgba(54, 162, 235, .8)'
+                    ],
+                ],
+            ],
+            'labels' => $labels,
+        ];
+    }
+
+    protected int|string|array $columnSpan = [
+        'sm' => 1,
+        'md' => 6,
+        'lg' => 3
+    ];
+
+    protected function filter(User $user)
+    {
+        return TicketHour::select([
+            DB::raw("DATE_FORMAT (created_at, '%m') as month"),
+            DB::raw('SUM(value) as value'),
+        ])
+            ->where('user_id', $user->id)
+            ->whereRaw(DB::raw("YEAR(created_at)=") . Carbon::now()->format('Y'))
+            ->groupBy(DB::raw("DATE_FORMAT (created_at, '%m')"))
+            ->get();
+    }
+}