diff --git a/app/Filament/Pages/Selections/LoadSeasons.php b/app/Filament/Pages/Selections/LoadSeasons.php index 84db58a0..b2dc3688 100644 --- a/app/Filament/Pages/Selections/LoadSeasons.php +++ b/app/Filament/Pages/Selections/LoadSeasons.php @@ -2,33 +2,18 @@ namespace App\Filament\Pages\Selections; +use App\Models\SofaScoreCategory; use App\Models\StatistikoEvent; class LoadSeasons { - public static function load($league_id = 0) + public static function load($league_id) { - // $res = CompetitionGroup::with('country')->where('id', $league_id)->first(); - // $season_mode = $res->country->season_mode; + if(!$league_id){ + return []; + } + + return StatistikoEvent::query()->where('league_id', $league_id)->groupBy('season')->pluck('season','season')->toArray(); - // $res = StatistikoEvent::query()->where('league_id', $league_id)->get(); - - // if (! $res) { - // return []; - // } - - // $arr = []; - // foreach ($res as $val) { - // $arr[$val->season] = $val->season; - // } - - // asort($arr); - - $arr = []; - $arr['24/25'] = '24/25'; - $arr['25/26'] = '25/26'; - $arr['26/27'] = '26/27'; - - return $arr; } } diff --git a/app/Filament/Pages/Statistic.php b/app/Filament/Pages/Statistic.php index 1469e67a..7e4ee545 100644 --- a/app/Filament/Pages/Statistic.php +++ b/app/Filament/Pages/Statistic.php @@ -6,6 +6,7 @@ use App\Actions\LoadSofaScoreCategory; use App\Actions\LoadStatisticFixturesLeaguesOptions; use App\Actions\LoadStatisticFixturesMatchOptions; use App\Filament\Pages\Selections\LoadPlayer; +use App\Filament\Pages\Selections\LoadSeasons; use App\Models\SofaScoreRosa; use App\Models\StatisticFixtures; use BackedEnum; @@ -23,8 +24,8 @@ use Filament\Schemas\Components\Utilities\Set; use Filament\Schemas\Schema; use Filament\Support\RawJs; use Illuminate\Contracts\Support\Htmlable; -use Livewire\Component; use Illuminate\Support\HtmlString; +use Livewire\Component; class Statistic extends BaseDashboard { @@ -348,14 +349,9 @@ class Statistic extends BaseDashboard // ->prefixIconColor(fn(Get $get): string => $get('season') ? 'success' : 'primary') ->hidden(fn (Get $get) => $get('season_or_date') == 'date') ->prefixIcon('phosphor-calendar-star-fill') - ->options([ - '26/27' => '26/27', - '25/26' => '25/26', - '24/25' => '24/25', - ]) - // ->options(function (Get $get) { - // return LoadSeasons::load($get('league_id')); - // }) + ->options(function (Get $get) { + return LoadSeasons::load($get('league_id')); + }) ->afterStateUpdated(function (callable $set) { $set('ss_player_id', null); }), diff --git a/app/Filament/Widgets/Data/LoadPlayer.php b/app/Filament/Widgets/Data/LoadPlayer.php index 3c57e0d0..6009ca95 100644 --- a/app/Filament/Widgets/Data/LoadPlayer.php +++ b/app/Filament/Widgets/Data/LoadPlayer.php @@ -62,6 +62,8 @@ class LoadPlayer } })->pluck('match_id')->toArray(); + // dd($matches_season); + $matches_played = StatistikoPlayer::query() ->whereIn('match_id', $matches_season) ->where('ss_player_id', $ss_player_id)