add user and employee charts

app/Filament/Pages/Employees.php

@@ -25,6 +25,7 @@ class Employees extends Page
     protected function getHeaderWidgets(): array
     {
         return [
+            Widgets\CumulativeEmployeeData::class,
             Widgets\Employees::class,
         ];
     }

app/Filament/Pages/Users.php

@@ -25,6 +25,7 @@ class Users extends Page
     protected function getHeaderWidgets(): array
     {
         return [
+            Widgets\CumulativeUserData::class,
             Widgets\Users::class,
         ];
     }

app/Filament/Pages/Widgets/CumulativeCompanyData.php

@@ -68,7 +68,7 @@ class CumulativeCompanyData extends ApexChartWidget
             $year = substr($week, 0, 4);
             $weekNumber = substr($week, 4);
 
-            return now()->setISODate($year, $weekNumber)->format('Y-m-d');
+            return today()->setISODate($year, $weekNumber)->format('M d');
         });
 
         return [
@@ -98,8 +98,8 @@ class CumulativeCompanyData extends ApexChartWidget
                 ],
             ],
             'xaxis' => [
-                'type' => 'datetime',
                 'categories' => $labels,
+                'position' => 'bottom',
                 'labels' => [
                     'style' => [
                         'colors' => '#9ca3af',
@@ -119,6 +119,7 @@ class CumulativeCompanyData extends ApexChartWidget
                 ],
                 [
                     'seriesName' => 'New Companies',
+                    'decimalsInFloat' => 0,
                     'opposite' => true,
                     'labels' => [
                         'style' => [
@@ -129,6 +130,7 @@ class CumulativeCompanyData extends ApexChartWidget
                 ],
                 [
                     'seriesName' => 'Total Companies',
+                    'decimalsInFloat' => 0,
                     'opposite' => true,
                     'labels' => [
                         'style' => [
@@ -139,6 +141,8 @@ class CumulativeCompanyData extends ApexChartWidget
                 ],
             ],
             'legend' => [
+                'position' => 'top',
+                'horizontalAlign' => 'center',
                 'labels' => [
                     'colors' => '#9ca3af',
                     'fontWeight' => 600,

app/Filament/Pages/Widgets/CumulativeEmployeeData.php

@@ -0,0 +1,179 @@
+<?php
+
+namespace App\Filament\Pages\Widgets;
+
+use App\Models\Company;
+use App\Models\Employeeship;
+use App\Models\User;
+use Leandrocfe\FilamentApexCharts\Widgets\ApexChartWidget;
+
+class CumulativeEmployeeData extends ApexChartWidget
+{
+    protected int|string|array $columnSpan = [
+        'md' => 2,
+        'xl' => 3,
+    ];
+
+    /**
+     * Chart Id
+     *
+     * @var string
+     */
+    protected static string $chartId = 'cumulative-employee-data';
+
+    /**
+     * Widget Title
+     *
+     * @var string|null
+     */
+    protected static ?string $heading = 'Cumulative Employee Data';
+
+    protected function getOptions(): array
+    {
+        $startOfYear = today()->startOfYear();
+        $today = today();
+
+        // Company data
+        $employeeData = Employeeship::selectRaw("COUNT(*) as aggregate, role, YEARWEEK(created_at, 3) as week")
+            ->whereBetween('created_at', [$startOfYear, $today])
+            ->groupByRaw('week, role')
+            ->get();
+
+        $weeks = [];
+        for ($week = $startOfYear->copy(); $week->lte($today); $week->addWeek()) {
+            $weeks[$week->format('oW')] = 0;
+        }
+
+        $weeklyRoleData = collect($weeks)->mapWithKeys(static function ($value, $week) use ($employeeData) {
+            $editors = $employeeData->where('role', 'editor')->where('week', $week)->first();
+            $admins = $employeeData->where('role', 'admin')->where('week', $week)->first();
+
+            return [
+                $week => [
+                    'editors' => $editors ? $editors->aggregate : 0,
+                    'admins' => $admins ? $admins->aggregate : 0,
+                ]
+            ];
+        });
+
+        $cumulativeEditors = $weeklyRoleData->reduce(function ($carry, $value) {
+            $carry[] = ($carry ? end($carry) : 0) + $value['editors'];
+            return $carry;
+        }, []);
+
+        $cumulativeAdmins = $weeklyRoleData->reduce(function ($carry, $value) {
+            $carry[] = ($carry ? end($carry) : 0) + $value['admins'];
+            return $carry;
+        }, []);
+
+        $totalEmployees = [];
+        for ($i = 0; $i < count($cumulativeEditors); $i++) {
+            $totalEmployees[] = $cumulativeEditors[$i] + $cumulativeAdmins[$i];
+        }
+
+        $weeklyGrowthRate = [0];
+        for ($i = 1; $i < count($totalEmployees); $i++) {
+            $growth = (($totalEmployees[$i] - $totalEmployees[$i - 1]) / $totalEmployees[$i - 1]) * 100;
+            $weeklyGrowthRate[] = round($growth, 2);
+        }
+
+        $labels = collect($weeks)->keys()->map(static function ($week) {
+            $year = substr($week, 0, 4);
+            $weekNumber = substr($week, 4);
+
+            return today()->setISODate($year, $weekNumber)->format('M d');
+        });
+
+
+        return [
+            'chart' => [
+                'type' => 'line',
+                'height' => 350,
+                'stacked' => true,
+                'toolbar' => [
+                    'show' => false,
+                ],
+            ],
+            'series' => [
+                [
+                    'name' => 'Editors',
+                    'type' => 'bar',
+                    'data' => $cumulativeEditors,
+                ],
+                [
+                    'name' => 'Admins',
+                    'type' => 'bar',
+                    'data' => $cumulativeAdmins,
+                ],
+                [
+                    'name' => 'Weekly Growth Rate',
+                    'type' => 'area',
+                    'data' => $weeklyGrowthRate,
+                ],
+            ],
+            'stroke' => [
+                'width' => [0, 0, 2],
+                'curve' => 'smooth',
+            ],
+            'xaxis' => [
+                'categories' => $labels,
+                'position' => 'bottom',
+                'labels' => [
+                    'style' => [
+                        'colors' => '#9ca3af',
+                        'fontWeight' => 600,
+                    ],
+                ],
+            ],
+            'yaxis' => [
+                'labels' => [
+                    'style' => [
+                        'colors' => '#9ca3af',
+                        'fontWeight' => 600,
+                    ],
+                ],
+            ],
+            'legend' => [
+                'labels' => [
+                    'colors' => '#9ca3af',
+                    'fontWeight' => 600,
+                ],
+            ],
+            'colors' => ['#d946ef', '#6d28d9', '#3b82f6'],
+            'fill' => [
+                'type' => 'gradient',
+                'gradient' => [
+                    'shade' => 'dark',
+                    'type' => 'vertical',
+                    'shadeIntensity' => 0.2,
+                    'gradientToColors' => ['#ec4899', '#8b5cf6', '#0ea5e9'],
+                    'inverseColors' => true,
+                    'opacityFrom' => [0.85, 0.85, 0.85],
+                    'opacityTo' => [0.85, 0.85, 0.4],
+                    'stops' => [0, 100, 100],
+                ],
+            ],
+            'plotOptions' => [
+                'bar' => [
+                    'horizontal' => false,
+                    'borderRadius' => 5,
+                    'borderRadiusApplication' => 'end',
+                    'columnWidth' => '60%',
+                    'dataLabels' => [
+                        'total' => [
+                            'enabled' => true,
+                            'style' => [
+                                'color' => '#9ca3af',
+                                'fontSize' => '14px',
+                                'fontWeight' => 600,
+                            ],
+                        ]
+                    ],
+                ],
+            ],
+            'dataLabels' => [
+                'enabled' => false,
+            ],
+        ];
+    }
+}

app/Filament/Pages/Widgets/CumulativeUserData.php

@@ -0,0 +1,182 @@
+<?php
+
+namespace App\Filament\Pages\Widgets;
+
+use App\Models\Company;
+use App\Models\User;
+use Leandrocfe\FilamentApexCharts\Widgets\ApexChartWidget;
+
+class CumulativeUserData extends ApexChartWidget
+{
+    protected int|string|array $columnSpan = [
+        'md' => 2,
+        'xl' => 3,
+    ];
+
+    /**
+     * Chart Id
+     *
+     * @var string
+     */
+    protected static string $chartId = 'cumulative-user-data';
+
+    /**
+     * Widget Title
+     *
+     * @var string|null
+     */
+    protected static ?string $heading = 'Cumulative User Data';
+
+    protected function getOptions(): array
+    {
+        $startOfYear = today()->startOfYear();
+        $today = today();
+
+        // Company data
+        $userData = User::selectRaw("COUNT(*) as aggregate, YEARWEEK(created_at, 3) as week")
+            ->whereBetween('created_at', [$startOfYear, $today])
+            ->groupByRaw('week')
+            ->get();
+
+        $weeks = [];
+        for ($week = $startOfYear->copy(); $week->lte($today); $week->addWeek()) {
+            $weeks[$week->format('oW')] = 0;
+        }
+
+        $weeklyData = collect($weeks)->mapWithKeys(static function ($value, $week) use ($userData) {
+            $matchingData = $userData->firstWhere('week', $week);
+            return [$week => $matchingData ? $matchingData->aggregate : 0];
+        });
+
+        $totalUsers = $weeklyData->reduce(static function ($carry, $value) {
+            $carry[] = ($carry ? end($carry) : 0) + $value;
+            return $carry;
+        }, []);
+
+        // Calculate percentage increase and increase in companies per week
+        $newUsers = [0];
+        $weeklyGrowthRate = [0];
+
+        $cumulativeDataLength = count($totalUsers);
+        for ($key = 1; $key < $cumulativeDataLength; $key++) {
+            $value = $totalUsers[$key];
+            $previousWeekValue = $totalUsers[$key - 1];
+            $newUsers[] = $value - $previousWeekValue;
+            $weeklyGrowthRate[] = round((($value - $previousWeekValue) / $previousWeekValue) * 100, 2);
+        }
+
+        $labels = collect($weeks)->keys()->map(static function ($week) {
+            $year = substr($week, 0, 4);
+            $weekNumber = substr($week, 4);
+
+            return today()->setISODate($year, $weekNumber)->format('M d');
+        });
+
+        return [
+            'chart' => [
+                'type' => 'line',
+                'height' => 350,
+                'stacked' => false,
+                'toolbar' => [
+                    'show' => false,
+                ],
+            ],
+            'series' => [
+                [
+                    'name' => 'Weekly Growth Rate',
+                    'type' => 'area',
+                    'data' => $weeklyGrowthRate,
+                ],
+                [
+                    'name' => 'New Users',
+                    'type' => 'line',
+                    'data' => $newUsers,
+                ],
+                [
+                    'name' => 'Total Users',
+                    'type' => 'column',
+                    'data' => $totalUsers,
+                ],
+            ],
+            'xaxis' => [
+                'categories' => $labels,
+                'position' => 'bottom',
+                'labels' => [
+                    'style' => [
+                        'colors' => '#9ca3af',
+                        'fontWeight' => 600,
+                    ],
+                ],
+            ],
+            'yaxis' => [
+                [
+                    'seriesName' => 'Weekly Growth Rate',
+                    'labels' => [
+                        'style' => [
+                            'colors' => '#9ca3af',
+                            'fontWeight' => 600,
+                        ],
+                    ],
+                ],
+                [
+                    'seriesName' => 'New Users',
+                    'decimalsInFloat' => 0,
+                    'opposite' => true,
+                    'labels' => [
+                        'style' => [
+                            'colors' => '#9ca3af',
+                            'fontWeight' => 600,
+                        ],
+                    ],
+                ],
+                [
+                    'seriesName' => 'Total Users',
+                    'decimalsInFloat' => 0,
+                    'opposite' => true,
+                    'labels' => [
+                        'style' => [
+                            'colors' => '#9ca3af',
+                            'fontWeight' => 600,
+                        ],
+                    ],
+                ],
+            ],
+            'legend' => [
+                'position' => 'top',
+                'horizontalAlign' => 'center',
+                'labels' => [
+                    'colors' => '#9ca3af',
+                    'fontWeight' => 600,
+                ],
+            ],
+            'markers' => [
+                'size' => 0,
+            ],
+            'colors' => ['#6d28d9', '#3b82f6', '#d946ef'],
+            'fill' => [
+                'type' => 'gradient',
+                'gradient' => [
+                    'shade' => 'dark',
+                    'type' => 'vertical',
+                    'shadeIntensity' => 0.5,
+                    'gradientToColors' => ['#6d28d9', '#0ea5e9', '#d946ef'],
+                    'inverseColors' => false,
+                    'opacityFrom' => [0.85, 1, 0.75],
+                    'opacityTo' => [0.4, 0.85, 1],
+                    'stops' => [0, 20, 80, 100],
+                ],
+            ],
+            'stroke' => [
+                'width' => [2, 5, 0],
+                'curve' => 'smooth',
+            ],
+            'plotOptions' => [
+                'bar' => [
+                    'borderRadius' => 5,
+                    'borderRadiusApplication' => 'end',
+                    'columnWidth' => '60%',
+                ],
+            ],
+        ];
+    }
+}

composer.lock

@@ -8379,16 +8379,16 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "4.0.1",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd"
+                "reference": "5647d65443818959172645e7ed999217360654b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
-                "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/5647d65443818959172645e7ed999217360654b6",
+                "reference": "5647d65443818959172645e7ed999217360654b6",
                 "shasum": ""
             },
             "require": {
@@ -8427,7 +8427,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.0.1"
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.0.2"
             },
             "funding": [
                 {
@@ -8435,7 +8436,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-10T16:53:14+00:00"
+            "time": "2023-05-07T09:13:23+00:00"
         },
         {
             "name": "phpunit/php-invoker",