fix date box selection

This commit is contained in:
salam committed 2026-08-15 08:03:46 +02:00
1 parent d8bb8153d9
commit d746d34271
4 files changed
+67 -31

No files matched your search

-14
View File
@@ -6,8 +6,6 @@ use App\Filament\Widgets\Data\LoadEvents\LoadEventsAverages;
use App\Filament\Widgets\Data\LoadEvents\LoadEventsQuery;
use App\Filament\Widgets\Data\LoadEvents\LoadExpectations;
use App\Models\StatisticFixtures;
use App\Models\StatistikoEvent;
use App\Models\StatistikoPlayer;
use Illuminate\Support\Carbon;
class LoadEvents
@@ -17,7 +15,6 @@ class LoadEvents
$league_id = (int) $filter['league_id'] ?? 0;
$match_id = (int) $filter['match_id'] ?? 0;
$team_id = (int) $filter['team_id'] ?? 0;
$season_or_date = $filter['season_or_date'] ?? 'season';
$statistic_type = $filter['statistic_type'] ?? 'gls';
$team_position = $filter['team_position'];
$accuracy = (float) $filter['accuracy'] ?? 0.5;
@@ -34,16 +31,6 @@ class LoadEvents
$statistic_type = 'gls';
}
switch ($season_or_date) {
case 'season':
$start = 0;
$end = 0;
break;
default:
$season = 0;
break;
}
/**
* IF WITH SIMILAR_PAST_MATCHES
*
@@ -80,7 +67,6 @@ class LoadEvents
*/
$res = LoadEventsQuery::load($filter, $handicap_range, $total_range, $match);
$dataset_home = [];
$dataset_away = [];
$dataset_exp_home = [];
@@ -2,7 +2,6 @@
namespace App\Filament\Widgets\Data\LoadEvents;
use App\Models\CompetitionGroup;
use App\Models\SofaScoreTournament;
use App\Models\StatistikoEvent;
@@ -19,6 +19,7 @@ class LoadEventsQuery
$similar_past_matches = $filter['similar_past_matches'];
$statistic_type = $filter['statistic_type'] ?? 'gls';
$team_position = $filter['team_position'];
$season_or_date = $filter['season_or_date'] ?? 'season';
$home_id = $match->home_id;
$away_id = $match->away_id;
@@ -26,6 +27,16 @@ class LoadEventsQuery
$statistic_type = 'gls';
}
switch ($season_or_date) {
case 'season':
$start = 0;
$end = 0;
break;
default:
$season = 0;
break;
}
/**
* IF WITH PLAYER
*/
@@ -99,9 +110,9 @@ class LoadEventsQuery
})->when($total_range, function ($query) use ($total_range) {
return $query->whereBetween('exp_total', $total_range);
})->when($start, function ($query) use ($start) {
return $query->where('starttime', '>=', $start);
return $query->whereDate('starttime', '>=', $start);
})->when($end, function ($query) use ($end) {
return $query->where('starttime', '<=', $end);
return $query->whereDate('starttime', '<=', $end);
})->when($season, function ($query) use ($season) {
return $query->whereIn('season', $season);
})