salam/nuhodds_fi4
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
salam committed 2026-10-07 17:07:37 +02:00
1 parent 4b39c59630
commit 15e3fc392d
2 files changed
+11 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Filament/Widgets/Boxes/ExpectationsTeam.php
+2
View File
@@ -30,6 +30,7 @@ class ExpectationsTeam
} }
$res = LoadEventsQueryAll::load($filter, $match); $res = LoadEventsQueryAll::load($filter, $match);
// dd($res);
$res_tp = LoadEventsQueryTP::load($filter, $match); $res_tp = LoadEventsQueryTP::load($filter, $match);
@@ -54,6 +55,7 @@ class ExpectationsTeam
ExpectationCollecting::sort($similar_past_matches, $tmp, 'crn', $value->home_id, $value->away_id, $value->crn_h, $value->crn_a, $match); ExpectationCollecting::sort($similar_past_matches, $tmp, 'crn', $value->home_id, $value->away_id, $value->crn_h, $value->crn_a, $match);
} }
$expectations = ExpectationCalculation::calc($tmp); $expectations = ExpectationCalculation::calc($tmp);
$expectations['gls']['name'] = 'Goals'; $expectations['gls']['name'] = 'Goals';
$expectations['fls']['name'] = 'Fouls'; $expectations['fls']['name'] = 'Fouls';
app/Filament/Widgets/Charts/LoadEvents/LoadEventsQueryAll.php
+9 -2
View File
@@ -5,6 +5,7 @@ namespace App\Filament\Widgets\Charts\LoadEvents;
use App\Filament\Pages\Selections\Helper\GetSeason; use App\Filament\Pages\Selections\Helper\GetSeason;
use App\Models\StatistikoEvent; use App\Models\StatistikoEvent;
use App\Models\StatistikoPlayer; use App\Models\StatistikoPlayer;
use Illuminate\Support\Facades\Log;
class LoadEventsQueryAll class LoadEventsQueryAll
{ {
@@ -82,7 +83,7 @@ class LoadEventsQueryAll
/** /**
* STATTISTIC DATA * STATTISTIC DATA
*/ */
// Log::debug('result', [$similar_past_matches, $home_id, $away_id, $team_id]); Log::debug('result', [$similar_past_matches, $team_id]);
return StatistikoEvent::with('home')->with('away') return StatistikoEvent::with('home')->with('away')
->where(function ($query) use ($league_id, $similar_past_matches) { ->where(function ($query) use ($league_id, $similar_past_matches) {
@@ -92,10 +93,16 @@ class LoadEventsQueryAll
return $query->where('league_id', $league_id); return $query->where('league_id', $league_id);
} }
}) })
->when($team_id, function ($query) use ($team_id, $player_on_field) { ->where(function ($query) use ($team_id, $similar_past_matches) {
if ($team_id && $similar_past_matches == 'none') {
return $query->where('home_id', '=', $team_id) return $query->where('home_id', '=', $team_id)
->orWhere('away_id', '=', $team_id); ->orWhere('away_id', '=', $team_id);
}
}) })
// ->when($team_id, function ($query) use ($team_id) {
// return $query->where('home_id', '=', $team_id)
// ->orWhere('away_id', '=', $team_id);
// })
->when($matches_played, function ($query) use ($matches_played, $player_on_field) { ->when($matches_played, function ($query) use ($matches_played, $player_on_field) {
if ($player_on_field == 'notplayed') { if ($player_on_field == 'notplayed') {
return $query->whereNotIn('match_id', $matches_played); return $query->whereNotIn('match_id', $matches_played);