refactor and add company stats

app/Filament/Pages/Companies.php

@@ -25,8 +25,9 @@ class Companies extends Page
     protected function getHeaderWidgets(): array
     {
         return [
-            Widgets\CumulativeCompanyData::class,
-            Widgets\Companies::class,
+            Widgets\Companies\Charts\CompanyStatsOverview::class,
+            Widgets\Companies\Charts\CumulativeCompanyData::class,
+            Widgets\Companies\Tables\Companies::class,
         ];
     }
 

app/Filament/Pages/Employees.php

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

app/Filament/Pages/Users.php

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

app/Filament/Pages/Widgets/Companies/Charts/CompanyStatsOverview.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Filament\Pages\Widgets\Companies\Charts;
+
+use App\Models\Company;
+use Filament\Widgets\StatsOverviewWidget;
+
+class CompanyStatsOverview extends StatsOverviewWidget
+{
+    protected int|string|array $columnSpan = 3;
+
+    protected function getColumns(): int
+    {
+        return 3;
+    }
+
+    /**
+     * Holt's Linear Trend
+     */
+    protected function holtLinearTrend($data, $alpha, $beta): array
+    {
+        $level = $data[0];
+        $trend = $data[1] - $data[0];
+
+        $forecast = [];
+        for ($i = 0; $i < count($data); $i++) {
+            $prev_level = $level;
+            $level = $alpha * $data[$i] + (1 - $alpha) * ($prev_level + $trend);
+            $trend = $beta * ($level - $prev_level) + (1 - $beta) * $trend;
+            $forecast[] = $level + $trend;
+        }
+
+        return $forecast;
+    }
+
+    /**
+     * Chart Options
+     */
+    protected function getCards(): array
+    {
+        // Define constants
+        $alpha = 0.8;
+        $beta = 0.2;
+
+        // Define time variables
+        $startOfYear = today()->startOfYear();
+        $today = today();
+
+        // Get Company Data
+        $companyData = Company::selectRaw("COUNT(*) as aggregate, YEARWEEK(created_at, 3) as week")
+            ->whereBetween('created_at', [$startOfYear, $today])
+            ->groupByRaw('week')
+            ->get();
+
+        // Initialize weeks
+        $weeks = [];
+        for ($week = $startOfYear->copy(); $week->lte($today); $week->addWeek()) {
+            $weeks[$week->format('oW')] = 0;
+        }
+
+        // Get Weekly Data
+        $weeklyData = collect($weeks)->mapWithKeys(static function ($value, $week) use ($companyData) {
+            $matchingData = $companyData->firstWhere('week', $week);
+            return [$week => $matchingData ? $matchingData->aggregate : 0];
+        });
+
+        // Calculate total companies
+        $totalCompanies = $weeklyData->reduce(static function ($carry, $value) {
+            $carry[] = ($carry ? end($carry) : 0) + $value;
+            return $carry;
+        }, []);
+
+        // Calculate new companies and percentage change
+        $newCompanies = [0];
+        $weeklyPercentageChange = [0];
+        for ($i = 1; $i < count($totalCompanies); $i++) {
+            $newCompanies[] = $totalCompanies[$i] - $totalCompanies[$i - 1];
+            $weeklyPercentageChange[] = ($newCompanies[$i] / $totalCompanies[$i - 1]) * 100;
+        }
+
+        // Calculate average weekly growth rate
+        $totalWeeks = $startOfYear->diffInWeeks($today);
+        $averageWeeklyGrowthRate = round(array_sum($weeklyPercentageChange) / ($totalWeeks), 2);
+
+        // Calculate Holt's forecast
+        $weeklyDataArray = $weeklyData->values()->toArray();
+        $holt_forecast = $this->holtLinearTrend($weeklyDataArray, $alpha, $beta);
+        $expectedNewCompanies = round(end($holt_forecast));
+
+        // Prepare cards for return
+        return [
+            StatsOverviewWidget\Card::make("New Companies Forecast (Holt's Trend)", $expectedNewCompanies),
+            StatsOverviewWidget\Card::make('Average Weekly Growth Rate', $averageWeeklyGrowthRate . '%'),
+            StatsOverviewWidget\Card::make('Personal Companies', Company::sum('personal_company')),
+        ];
+    }
+}

app/Filament/Pages/Widgets/CumulativeCompanyData.php → app/Filament/Pages/Widgets/Companies/Charts/CumulativeCompanyData.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Widgets;
+namespace App\Filament\Pages\Widgets\Companies\Charts;
 
 use App\Models\Company;
 use Leandrocfe\FilamentApexCharts\Widgets\ApexChartWidget;
@@ -54,14 +54,20 @@ class CumulativeCompanyData extends ApexChartWidget
 
         // Calculate percentage increase and increase in companies per week
         $newCompanies = [0];
-        $weeklyGrowthRate = [0];
-
-        $cumulativeDataLength = count($totalCompanies);
-        for ($key = 1; $key < $cumulativeDataLength; $key++) {
-            $value = $totalCompanies[$key];
-            $previousWeekValue = $totalCompanies[$key - 1];
-            $newCompanies[] = $value - $previousWeekValue;
-            $weeklyGrowthRate[] = round((($value - $previousWeekValue) / $previousWeekValue) * 100, 2);
+        $weeklyPercentageChange = [0];
+
+        for ($i = 1; $i < count($totalCompanies); $i++) {
+            $newCompanies[] = $totalCompanies[$i] - $totalCompanies[$i - 1];
+            $weeklyPercentageChange[] = ($newCompanies[$i] / $totalCompanies[$i - 1]) * 100;
+        }
+
+        // Calculate exponential smoothing for total companies
+        $alpha = 0.3; // Smoothing factor, between 0 and 1
+        $smoothedTotalCompanies = [];
+
+        $smoothedTotalCompanies[0] = $totalCompanies[0]; // Initialize the first smoothed value
+        for ($i = 1; $i < count($totalCompanies); $i++) {
+            $smoothedTotalCompanies[$i] = $alpha * $totalCompanies[$i] + (1 - $alpha) * $smoothedTotalCompanies[$i - 1];
         }
 
         $labels = collect($weeks)->keys()->map(static function ($week) {
@@ -84,13 +90,18 @@ class CumulativeCompanyData extends ApexChartWidget
                 [
                     'name' => 'Weekly Growth Rate',
                     'type' => 'area',
-                    'data' => $weeklyGrowthRate,
+                    'data' => $weeklyPercentageChange,
                 ],
                 [
                     'name' => 'New Companies',
                     'type' => 'line',
                     'data' => $newCompanies,
                 ],
+                [
+                    'name' => 'Smoothed Total Companies',
+                    'type' => 'line',
+                    'data' => $smoothedTotalCompanies,
+                ],
                 [
                     'name' => 'Total Companies',
                     'type' => 'column',
@@ -110,6 +121,7 @@ class CumulativeCompanyData extends ApexChartWidget
             'yaxis' => [
                 [
                     'seriesName' => 'Weekly Growth Rate',
+                    'decimalsInFloat' => 2,
                     'labels' => [
                         'style' => [
                             'colors' => '#9ca3af',
@@ -128,6 +140,17 @@ class CumulativeCompanyData extends ApexChartWidget
                         ],
                     ],
                 ],
+                [
+                    'seriesName' => 'Smoothed Total Companies',
+                    'decimalsInFloat' => 0,
+                    'opposite' => true,
+                    'labels' => [
+                        'style' => [
+                            'colors' => '#9ca3af',
+                            'fontWeight' => 600,
+                        ],
+                    ],
+                ],
                 [
                     'seriesName' => 'Total Companies',
                     'decimalsInFloat' => 0,
@@ -151,22 +174,22 @@ class CumulativeCompanyData extends ApexChartWidget
             'markers' => [
                 'size' => 0,
             ],
-            'colors' => ['#d946ef', '#6d28d9', '#3b82f6'],
+            'colors' => ['#d946ef', '#6d28d9', '#14b8a6', '#3b82f6'],
             'fill' => [
                 'type' => 'gradient',
                 'gradient' => [
                     'shade' => 'dark',
                     'type' => 'vertical',
                     'shadeIntensity' => 0.5,
-                    'gradientToColors' => ['#d946ef', '#6d28d9', '#0ea5e9'],
+                    'gradientToColors' => ['#d946ef', '#6d28d9', '#14b8a6', '#0ea5e9'],
                     'inverseColors' => false,
-                    'opacityFrom' => [0.85, 1, 0.75],
-                    'opacityTo' => [0.4, 0.85, 1],
+                    'opacityFrom' => [0.85, 1, 1, 0.75],
+                    'opacityTo' => [0.4, 0.85, 0.85, 1],
                     'stops' => [0, 20, 80, 100],
                 ],
             ],
             'stroke' => [
-                'width' => [2, 5, 0],
+                'width' => [2, 5, 5, 0],
                 'curve' => 'smooth',
             ],
             'plotOptions' => [

app/Filament/Pages/Widgets/Companies.php → app/Filament/Pages/Widgets/Companies/Tables/Companies.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Widgets;
+namespace App\Filament\Pages\Widgets\Companies\Tables;
 
 use App\Models\Company;
 use Closure;

app/Filament/Pages/Widgets/CumulativeEmployeeData.php → app/Filament/Pages/Widgets/Employees/Charts/CumulativeEmployeeData.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Widgets;
+namespace App\Filament\Pages\Widgets\Employees\Charts;
 
 use App\Models\Employeeship;
 use Leandrocfe\FilamentApexCharts\Widgets\ApexChartWidget;
@@ -54,12 +54,12 @@ class CumulativeEmployeeData extends ApexChartWidget
             ];
         });
 
-        $cumulativeEditors = $weeklyRoleData->reduce(function ($carry, $value) {
+        $cumulativeEditors = $weeklyRoleData->reduce(static function ($carry, $value) {
             $carry[] = ($carry ? end($carry) : 0) + $value['editors'];
             return $carry;
         }, []);
 
-        $cumulativeAdmins = $weeklyRoleData->reduce(function ($carry, $value) {
+        $cumulativeAdmins = $weeklyRoleData->reduce(static function ($carry, $value) {
             $carry[] = ($carry ? end($carry) : 0) + $value['admins'];
             return $carry;
         }, []);
@@ -85,7 +85,7 @@ class CumulativeEmployeeData extends ApexChartWidget
 
         return [
             'chart' => [
-                'type' => 'line',
+                'type' => 'area',
                 'height' => 350,
                 'stacked' => true,
                 'toolbar' => [

app/Filament/Pages/Widgets/Employees.php → app/Filament/Pages/Widgets/Employees/Tables/Employees.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Widgets;
+namespace App\Filament\Pages\Widgets\Employees\Tables;
 
 use App\Models\User;
 use Closure;

app/Filament/Pages/Widgets/CumulativeUserData.php → app/Filament/Pages/Widgets/Users/Charts/CumulativeUserData.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Widgets;
+namespace App\Filament\Pages\Widgets\Users\Charts;
 
 use App\Models\User;
 use Leandrocfe\FilamentApexCharts\Widgets\ApexChartWidget;

app/Filament/Pages/Widgets/Users.php → app/Filament/Pages/Widgets/Users/Tables/Users.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Widgets;
+namespace App\Filament\Pages\Widgets\Users\Tables;
 
 use App\Models\User;
 use Closure;

composer.lock

@@ -934,16 +934,16 @@
         },
         {
             "name": "filament/filament",
-            "version": "v2.17.36",
+            "version": "v2.17.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/app.git",
-                "reference": "c62290398a1d6b03351dbab8158115efd936deaa"
+                "reference": "0719a1fcebcad120dd4e254938cfb08470c90105"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/app/zipball/c62290398a1d6b03351dbab8158115efd936deaa",
-                "reference": "c62290398a1d6b03351dbab8158115efd936deaa",
+                "url": "https://api.github.com/repos/filamentphp/app/zipball/0719a1fcebcad120dd4e254938cfb08470c90105",
+                "reference": "0719a1fcebcad120dd4e254938cfb08470c90105",
                 "shasum": ""
             },
             "require": {
@@ -993,20 +993,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-05-05T08:37:23+00:00"
+            "time": "2023-05-08T15:39:08+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v2.17.36",
+            "version": "v2.17.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "b29e2f817ad63913ae1b339910726ede6696de9a"
+                "reference": "49bafbf87f0d7f23e7b62a6d40591fd3ea81a55b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/b29e2f817ad63913ae1b339910726ede6696de9a",
-                "reference": "b29e2f817ad63913ae1b339910726ede6696de9a",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/49bafbf87f0d7f23e7b62a6d40591fd3ea81a55b",
+                "reference": "49bafbf87f0d7f23e7b62a6d40591fd3ea81a55b",
                 "shasum": ""
             },
             "require": {
@@ -1051,11 +1051,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-05-04T23:08:13+00:00"
+            "time": "2023-05-08T09:55:16+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v2.17.36",
+            "version": "v2.17.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -1108,7 +1108,7 @@
         },
         {
             "name": "filament/support",
-            "version": "v2.17.36",
+            "version": "v2.17.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
@@ -1158,16 +1158,16 @@
         },
         {
             "name": "filament/tables",
-            "version": "v2.17.36",
+            "version": "v2.17.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "f9862eb6d9af85c98512924e9f0d84d6eb1ff4f5"
+                "reference": "b23b5cc95c7b1afb650b366545942b1ccad993af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/f9862eb6d9af85c98512924e9f0d84d6eb1ff4f5",
-                "reference": "f9862eb6d9af85c98512924e9f0d84d6eb1ff4f5",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/b23b5cc95c7b1afb650b366545942b1ccad993af",
+                "reference": "b23b5cc95c7b1afb650b366545942b1ccad993af",
                 "shasum": ""
             },
             "require": {
@@ -1210,7 +1210,7 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-05-04T23:08:16+00:00"
+            "time": "2023-05-08T09:55:33+00:00"
         },
         {
             "name": "flowframe/laravel-trend",
@@ -1833,16 +1833,16 @@
         },
         {
             "name": "laravel/fortify",
-            "version": "v1.17.1",
+            "version": "v1.17.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/fortify.git",
-                "reference": "76908639d6c58a4996ce8bbacea9ec7f610b2ec6"
+                "reference": "fc4b9b00b0d657dd035751b286f412976596ba32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/fortify/zipball/76908639d6c58a4996ce8bbacea9ec7f610b2ec6",
-                "reference": "76908639d6c58a4996ce8bbacea9ec7f610b2ec6",
+                "url": "https://api.github.com/repos/laravel/fortify/zipball/fc4b9b00b0d657dd035751b286f412976596ba32",
+                "reference": "fc4b9b00b0d657dd035751b286f412976596ba32",
                 "shasum": ""
             },
             "require": {
@@ -1893,20 +1893,20 @@
                 "issues": "https://github.com/laravel/fortify/issues",
                 "source": "https://github.com/laravel/fortify"
             },
-            "time": "2023-04-19T15:48:59+00:00"
+            "time": "2023-04-26T13:35:07+00:00"
         },
         {
             "name": "laravel/framework",
-            "version": "v10.9.0",
+            "version": "v10.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "35078125f61ef0b125edf524de934f108d4b47fd"
+                "reference": "0da22a8d179f79b49d4e71f4822f759651f35012"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/35078125f61ef0b125edf524de934f108d4b47fd",
-                "reference": "35078125f61ef0b125edf524de934f108d4b47fd",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/0da22a8d179f79b49d4e71f4822f759651f35012",
+                "reference": "0da22a8d179f79b49d4e71f4822f759651f35012",
                 "shasum": ""
             },
             "require": {
@@ -2093,7 +2093,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-04-25T13:47:18+00:00"
+            "time": "2023-05-09T13:08:05+00:00"
         },
         {
             "name": "laravel/sanctum",
@@ -7898,23 +7898,23 @@
         },
         {
             "name": "laravel/sail",
-            "version": "v1.21.5",
+            "version": "v1.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "27af207bb1c53faddcba34c7528b3e969f6a646d"
+                "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/27af207bb1c53faddcba34c7528b3e969f6a646d",
-                "reference": "27af207bb1c53faddcba34c7528b3e969f6a646d",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/923e1e112b6a8598664dbb0ee79dd3137f1c9d56",
+                "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56",
                 "shasum": ""
             },
             "require": {
                 "illuminate/console": "^8.0|^9.0|^10.0",
                 "illuminate/contracts": "^8.0|^9.0|^10.0",
                 "illuminate/support": "^8.0|^9.0|^10.0",
-                "php": "^7.3|^8.0",
+                "php": "^8.0",
                 "symfony/yaml": "^6.0"
             },
             "require-dev": {
@@ -7959,7 +7959,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2023-04-24T13:29:38+00:00"
+            "time": "2023-05-04T14:52:56+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -9895,16 +9895,16 @@
         },
         {
             "name": "spatie/laravel-ignition",
-            "version": "2.1.1",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-ignition.git",
-                "reference": "802c7e27754456e45134f1a9d29ab7df4b6cb9e4"
+                "reference": "2f99fa6b732a6049e78ed34e4608ce589605ae54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/802c7e27754456e45134f1a9d29ab7df4b6cb9e4",
-                "reference": "802c7e27754456e45134f1a9d29ab7df4b6cb9e4",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/2f99fa6b732a6049e78ed34e4608ce589605ae54",
+                "reference": "2f99fa6b732a6049e78ed34e4608ce589605ae54",
                 "shasum": ""
             },
             "require": {
@@ -9983,7 +9983,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-04T13:54:49+00:00"
+            "time": "2023-05-09T07:19:31+00:00"
         },
         {
             "name": "symfony/yaml",