diff --git a/app/Actions/LoadSofaScoreCategory.php b/app/Actions/LoadSofaScoreCategory.php index 31673c97..061c9f33 100644 --- a/app/Actions/LoadSofaScoreCategory.php +++ b/app/Actions/LoadSofaScoreCategory.php @@ -14,6 +14,18 @@ class LoadSofaScoreCategory ->groupBy('league_id') ->pluck('league_id')->toArray(); + /* + 0 => 24 + 1 => 25 + 2 => 54 + 3 => 131 + 4 => 192 + 5 => 242 + 6 => 406 + 7 => 11539 + 8 => 11621 + */ + $sofa_score_category_id = SofaScoreTournament::whereIn('tournament_id', $league_ids)->pluck('sofa_score_category_id')->toArray(); $sofa_score_category_id = array_unique($sofa_score_category_id); diff --git a/app/Actions/LoadStatisticFixturesLeaguesOptions.php b/app/Actions/LoadStatisticFixturesLeaguesOptions.php index 78e62c5a..2befcd94 100644 --- a/app/Actions/LoadStatisticFixturesLeaguesOptions.php +++ b/app/Actions/LoadStatisticFixturesLeaguesOptions.php @@ -2,16 +2,23 @@ namespace App\Actions; -use App\Models\SofaScoreTournament; +use App\Models\StatisticFixtures; class LoadStatisticFixturesLeaguesOptions { - public static function load(int|null $sofascore_category_id = 0) + public static function load(?int $sofascore_category_id = 0) { - // $res = StatisticFixtures::with('league')->where('league_id', $sofascore_category_id) - // ->groupBy('league_id') - // ->pluck('league_id')->toArray(); + $res = StatisticFixtures::with('league') + ->whereHas('league', function ($query) use ($sofascore_category_id) { + $query->where('sofa_score_category_id', $sofascore_category_id); + }) + ->get(); - return SofaScoreTournament::where('enabled', 1)->where('sofa_score_category_id', $sofascore_category_id)->orderBy('name')->pluck('name', 'tournament_id'); + $arr = []; + foreach ($res as $value) { + $arr[$value->league_id] = $value->league->name; + } + + return $arr; } } diff --git a/app/Filament/Pages/Statistic.php b/app/Filament/Pages/Statistic.php index cdd25899..8053ebcd 100644 --- a/app/Filament/Pages/Statistic.php +++ b/app/Filament/Pages/Statistic.php @@ -143,7 +143,7 @@ class Statistic extends BaseDashboard ->prefixIcon('phosphor-globe-fill') ->hiddenLabel() ->options(fn () => LoadSofaScoreCategory::load()) - ->placeholder('Country') + ->placeholder('Select Country') ->afterStateUpdated(function (callable $set, $state) { $set('seasonmode', SofaScoreCategory::where('id', $state)->value('season_mode')); $set('league_id', null); @@ -159,7 +159,7 @@ class Statistic extends BaseDashboard ->prefixIcon('phosphor-trophy-fill') ->hiddenLabel() ->options(fn (Get $get) => LoadStatisticFixturesLeaguesOptions::load($get('sofascore_category_id'))) - ->placeholder('League') + ->placeholder('Select League') ->afterStateUpdated(function (callable $set) { $set('match_id', null); $set('team_id', null); @@ -180,7 +180,7 @@ class Statistic extends BaseDashboard $set('ss_player_id', null); $this->dispatch('reset-tab'); }) - ->placeholder('Events'), + ->placeholder('Select Event'), Select::make('team_id') ->live() @@ -213,12 +213,12 @@ class Statistic extends BaseDashboard $set('ss_player_id', null); $this->dispatch('reset-tab'); }) - ->placeholder('Team'), + ->placeholder('Select Team'), Select::make('team_position') ->live() ->hiddenLabel() - ->placeholder('Team Position') + ->placeholder('Select Team Position') ->prefix('TP') ->prefixAction( Action::make('iconInfo') diff --git a/app/Filament/Widgets/ChartEvent.php b/app/Filament/Widgets/ChartEvent.php index 619e90e6..071a0f52 100644 --- a/app/Filament/Widgets/ChartEvent.php +++ b/app/Filament/Widgets/ChartEvent.php @@ -2,12 +2,12 @@ namespace App\Filament\Widgets; +use App\Filament\Widgets\Data\HelperStatisticType; +use App\Filament\Widgets\Data\LoadEvents; use Filament\Support\RawJs; use Filament\Widgets\ChartWidget; -use Livewire\Attributes\Reactive; use Illuminate\Support\HtmlString; -use App\Filament\Widgets\Data\LoadEvents; -use App\Filament\Widgets\Data\HelperStatisticType; +use Livewire\Attributes\Reactive; class ChartEvent extends ChartWidget { @@ -28,7 +28,7 @@ class ChartEvent extends ChartWidget Events - ' . $this->type . ' + '.$this->type.' '); } diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index 8fdc86bc..9d688b3f 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -1,7 +1,14 @@ get('/'); +use App\Models\User; +use Tests\TestCase; + +/** @var TestCase $this */ +it('the application returns a successful response', function () { + // Create a temporary user and log them in + $user = User::factory()->create(); + + $response = $this->actingAs($user)->get('/'); $response->assertStatus(200); }); diff --git a/tests/Pest.php b/tests/Pest.php index 60f04a45..75b10e71 100644 --- a/tests/Pest.php +++ b/tests/Pest.php @@ -1,5 +1,16 @@ in('Feature'); + /* |-------------------------------------------------------------------------- | Test Case @@ -11,7 +22,7 @@ | */ -pest()->extend(Tests\TestCase::class) +pest()->extend(TestCase::class) // ->use(Illuminate\Foundation\Testing\RefreshDatabase::class) ->in('Feature'); @@ -30,6 +41,11 @@ expect()->extend('toBeOne', function () { return $this->toBe(1); }); +test('the application returns a successful response') + ->actingAs(User::factory()->create()) + ->get('/') + ->assertStatus(200); + /* |-------------------------------------------------------------------------- | Functions