wip

app/Filament/Pages/Selections/Helper/GetSeason.php

@@ -3,13 +3,13 @@
 namespace App\Filament\Pages\Selections\Helper;
 
 use App\Models\SofaScoreCategory;
-use Filament\Schemas\Components\Utilities\Get;
 
 class GetSeason
 {
-    public static function load(array $season, int $sofascore_category_id)
+    public static function load(array $season, int|null $sofascore_category_id)
     {
         if (!$season) {
+            if ($sofascore_category_id) {
                 $season_mode = SofaScoreCategory::where('id', $sofascore_category_id)->value('season_mode');
                 if ($season_mode == 'halfyear') {
                     if ((int) date('m') > 7)
@@ -18,6 +18,7 @@ class GetSeason
                         $season[] = date('y', strtotime('-1 year')) . '/' . date('y');
                 }
             }
+        }
 
         return $season;
     }

app/Filament/Pages/Selections/LoadSeasons.php

@@ -11,9 +11,7 @@ class LoadSeasons
         // $res = CompetitionGroup::with('country')->where('id', $league_id)->first();
         // $season_mode = $res->country->season_mode;
 
-        $res = StatistikoEvent::where('league_id', $league_id)
-            ->groupBy('season')
-            ->get();
+        $res = StatistikoEvent::select('season')->where('league_id', $league_id)->get();
 
         if (! $res) {
             return [];
@@ -24,7 +22,7 @@ class LoadSeasons
             $arr[$val->season] = $val->season;
         }
 
-        sort($arr);
+        asort($arr);
 
         return $arr;
     }

app/Filament/Widgets/Data/LoadEvents.php

@@ -92,8 +92,6 @@ class LoadEvents
             return [];
         }
 
-
-
         $expectations = LoadExpectations::load($res['all'], $match, $statistic_type);
 
         if ($team_id) {

app/Filament/Widgets/Data/LoadEvents/LoadEventsQuery.php

@@ -12,7 +12,7 @@ class LoadEventsQuery
     {
         $league_id = (int) $filter['league_id'] ?? 0;
         $team_id = (int) $filter['team_id'] ?? 0;
-        $season = $filter['season'] ?? 0;
+        $season = $filter['season'];
         $sofascore_category_id = $filter['sofascore_category_id'] ?? 0;
         $season_or_date = $filter['season_or_date'];
         $start = $filter['start_date'] ?? 0;
@@ -85,7 +85,8 @@ class LoadEventsQuery
          * STATTISTIC DATA
          */
 
-        // dd($league_id, $home_id, $away_id);
+
+        // dd($team_id, $home_id, $away_id);
         $res = StatistikoEvent::with('home')->with('away')
             ->where(function ($query) use ($league_id, $similar_past_matches) {
                 switch ($similar_past_matches) {
@@ -97,23 +98,20 @@ class LoadEventsQuery
             ->where(function ($query) use ($team_id, $home_id, $away_id, $similar_past_matches) {
                 if ($similar_past_matches == 'none') {
                     if ($team_id) {
-                        return $query->where('home_id', '=', $team_id)
+                        return $query->where('home_id', $team_id)
                             ->orWhere('away_id', '=', $team_id);
                     } else {
-                        return $query->where('home_id', '=', $home_id)
-                            ->orWhere('away_id', '=', $home_id)
-                            ->orWhere('home_id', '=', $away_id)
-                            ->orWhere('away_id', '=', $away_id);
+                        return $query->whereIn('home_id', [$home_id, $away_id])->orWhereIn('away_id', [$home_id, $away_id]);
                     }
                 }
             })
-            // ->when($matches_played, function ($query) use ($matches_played, $player_on_field) {
-            //     if ($player_on_field == 'notplayed') {
-            //         return $query->whereNotIn('match_id', $matches_played);
-            //     } else {
-            //         return $query->whereIn('match_id', $matches_played);
-            //     }
-            // })
+            ->when($matches_played, function ($query) use ($matches_played, $player_on_field) {
+                if ($player_on_field == 'notplayed') {
+                    return $query->whereNotIn('match_id', $matches_played);
+                } else {
+                    return $query->whereIn('match_id', $matches_played);
+                }
+            })
             ->when($handicap_range, function ($query) use ($handicap_range) {
                 return $query->whereBetween('exp_handicap', $handicap_range);
             })->when($total_range, function ($query) use ($total_range) {
@@ -122,14 +120,15 @@ class LoadEventsQuery
                 return $query->whereDate('starttime', '>=', $start);
             })->when($end, function ($query) use ($end) {
                 return $query->whereDate('starttime', '<=', $end);
-            })->when($season, function ($query) use ($season, $season_or_date) {
+            })
+            ->when($season, function ($query) use ($season, $season_or_date) {
                 if ($season_or_date == 'season')
                     return $query->whereIn('season', $season);
             })
             ->orderBy('starttime', 'ASC')
             ->get();
 
-        // dd($res);
+        // dd($season, $res);
 
         $arr = [];
         foreach ($res as $value) {

app/Filament/Widgets/StatsMedianAverage.php

@@ -69,8 +69,6 @@ class StatsMedianAverage extends StatsOverviewWidget
                 break;
         }
 
-        // Log::debug($data['datasets']);
-
         $team_position = HelperTeamPosition::get($this->filters);
 
         if (! $data) {

app/Models/StatistikoEvent.php

@@ -48,6 +48,7 @@ class StatistikoEvent extends Model
         'starttime' => 'datetime',
     ];
 
+
     public function sport(): BelongsTo
     {
         return $this->belongsTo(Sport::class, 'sport_id', 'id');