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

changes Ubaldo before Logomatic

Browse Source
This commit is contained in:
salam committed 2026-10-07 04:52:23 +02:00
1 parent 498660e9cc
commit f9e8b17d58
11 files changed
+607 -843
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Filament/Widgets/Boxes/AverageTeamSeason.php
+37 -34
View File
@@ -8,12 +8,14 @@ use App\Models\StatistikoEvent;
class AverageTeamSeason
{
public static function load(array &$expectations, array $filter)
public static function load(array &$expectations, array $filter, object $match)
{
$tournament_id = (int) $filter['league_id'] ?? 0;
$team_position = $filter['team_position'];
$team_id = (int) $filter['team_id'] ?? 0;
$seasonmode = $filter['seasonmode'];
$home_id = $match->home_id;
$away_id = $match->away_id;
$active_season = GetSeason::active($seasonmode);
// Box 2
@@ -23,16 +25,9 @@ class AverageTeamSeason
$res = StatistikoEvent::where('league_id', $tournament_id)
->when($active_season, function ($query) use ($active_season) {
return $query->where('season', $active_season);
})->when($team_id, function ($query) use ($team_position, $team_id) {
switch ($team_position) {
case 'home':
return $query->where('home_id', $team_id);
case 'away':
return $query->where('away_id', $team_id);
default:
return $query->orWhere('home_id', $team_id)
->orWhere('away_id', '=', $team_id);
}
})->when($team_id, function ($query) use ($team_id) {
return $query->orWhere('home_id', $team_id)
->orWhere('away_id', '=', $team_id);
})->get();
$result = [];
@@ -44,32 +39,40 @@ class AverageTeamSeason
// 2) la media dei falli di tutte le partite giocate nel campionato Brasiliano
// (esempio 6 giornate giocate = 60 partite quindi 120 squadre, quindi 120 dati tipo 17-12-12-15-8-15-13-21-...,
// quindi la media di questi 120 dati)
foreach ($res as $val) {
if ($team_position == 'home' && $team_id == $val->home_id) {
ExpectationAverage::filter($result, 'team', 'gls', $val->gls_h, $val->gls_a);
ExpectationAverage::filter($result, 'team', 'fls', $val->fls_h, $val->fls_a);
ExpectationAverage::filter($result, 'team', 'ofs', $val->ofs_h, $val->ofs_a);
ExpectationAverage::filter($result, 'team', 'crd', $val->crd_h, $val->crd_a);
ExpectationAverage::filter($result, 'team', 'snt', $val->snt_h, $val->snt_a);
ExpectationAverage::filter($result, 'team', 'tsh', $val->tsh_h, $val->tsh_a);
} elseif ($team_position == 'away' && $team_id == $val->away_id) {
ExpectationAverage::filter($result, 'team', 'gls', $val->gls_a, $val->gls_h);
ExpectationAverage::filter($result, 'team', 'fls', $val->fls_a, $val->fls_h);
ExpectationAverage::filter($result, 'team', 'ofs', $val->ofs_a, $val->ofs_h);
ExpectationAverage::filter($result, 'team', 'crd', $val->crd_a, $val->crd_h);
ExpectationAverage::filter($result, 'team', 'snt', $val->snt_a, $val->snt_h);
ExpectationAverage::filter($result, 'team', 'tsh', $val->tsh_a, $val->tsh_h);
} else {
ExpectationAverage::filter($result, 'team', 'gls', $val->gls_a, $val->gls_h);
ExpectationAverage::filter($result, 'team', 'fls', $val->fls_a, $val->fls_h);
ExpectationAverage::filter($result, 'team', 'ofs', $val->ofs_a, $val->ofs_h);
ExpectationAverage::filter($result, 'team', 'crd', $val->crd_a, $val->crd_h);
ExpectationAverage::filter($result, 'team', 'snt', $val->snt_a, $val->snt_h);
ExpectationAverage::filter($result, 'team', 'tsh', $val->tsh_a, $val->tsh_h);
}
ExpectationAverage::filter($result, 'team', 'gls', $val->gls_a, $val->gls_h);
ExpectationAverage::filter($result, 'team', 'fls', $val->fls_a, $val->fls_h);
ExpectationAverage::filter($result, 'team', 'ofs', $val->ofs_a, $val->ofs_h);
ExpectationAverage::filter($result, 'team', 'crd', $val->crd_a, $val->crd_h);
ExpectationAverage::filter($result, 'team', 'snt', $val->snt_a, $val->snt_h);
ExpectationAverage::filter($result, 'team', 'tsh', $val->tsh_a, $val->tsh_h);
}
// foreach ($res as $val) {
// if ($team_position == 'home' && $team_id == $val->home_id) {
// ExpectationAverage::filter($result, 'team', 'gls', $val->gls_h, $val->gls_a);
// ExpectationAverage::filter($result, 'team', 'fls', $val->fls_h, $val->fls_a);
// ExpectationAverage::filter($result, 'team', 'ofs', $val->ofs_h, $val->ofs_a);
// ExpectationAverage::filter($result, 'team', 'crd', $val->crd_h, $val->crd_a);
// ExpectationAverage::filter($result, 'team', 'snt', $val->snt_h, $val->snt_a);
// ExpectationAverage::filter($result, 'team', 'tsh', $val->tsh_h, $val->tsh_a);
// } elseif ($team_position == 'away' && $team_id == $val->away_id) {
// ExpectationAverage::filter($result, 'team', 'gls', $val->gls_a, $val->gls_h);
// ExpectationAverage::filter($result, 'team', 'fls', $val->fls_a, $val->fls_h);
// ExpectationAverage::filter($result, 'team', 'ofs', $val->ofs_a, $val->ofs_h);
// ExpectationAverage::filter($result, 'team', 'crd', $val->crd_a, $val->crd_h);
// ExpectationAverage::filter($result, 'team', 'snt', $val->snt_a, $val->snt_h);
// ExpectationAverage::filter($result, 'team', 'tsh', $val->tsh_a, $val->tsh_h);
// } else {
// ExpectationAverage::filter($result, 'team', 'gls', $val->gls_a, $val->gls_h);
// ExpectationAverage::filter($result, 'team', 'fls', $val->fls_a, $val->fls_h);
// ExpectationAverage::filter($result, 'team', 'ofs', $val->ofs_a, $val->ofs_h);
// ExpectationAverage::filter($result, 'team', 'crd', $val->crd_a, $val->crd_h);
// ExpectationAverage::filter($result, 'team', 'snt', $val->snt_a, $val->snt_h);
// ExpectationAverage::filter($result, 'team', 'tsh', $val->tsh_a, $val->tsh_h);
// }
// }
$bets = ['gls', 'fls', 'ofs', 'crd', 'snt', 'tsh'];
if ($result) {
foreach ($bets as $bet) {
app/Filament/Widgets/Boxes/LoadEventsBoxes.php
+1 -1
View File
@@ -40,7 +40,7 @@ class LoadEventsBoxes
*/
if ($team_id != 0 && $similar_past_matches == 'none') {
AverageTeam::load($expectations, $filter);
AverageTeamSeason::load($expectations, $filter);
AverageTeamSeason::load($expectations, $filter, $match);
AverageLeagueSeason::load($expectations, $filter);
}
app/Filament/Widgets/BoxesBettypeAll.php
+9 -2
View File
@@ -32,11 +32,18 @@ class BoxesBettypeAll extends StatsOverviewWidget
protected function getStats(): array
{
$data = LoadEventsBoxes::load($this->filters, false);
$similar_past_matches = $this->filters['similar_past_matches'];
$team_position = $this->filters['team_position'];
$team_id = (int) $this->filters['team_id'] ?? 0;
if (! $team_id && $similar_past_matches == 'none') {
return [];
}
$data = LoadEventsBoxes::load($this->filters, false);
$team_position = in_array($this->filters['team_position'], ['home', 'away']) ? ucfirst($this->filters['team_position']) : 'Both Position';
if (! $data) {
app/Filament/Widgets/BoxesBettypeSingle.php
-345
View File
@@ -1,345 +0,0 @@
<?php
namespace App\Filament\Widgets;
use App\Filament\Widgets\Charts\HelperStatisticType;
use App\Filament\Widgets\Charts\LoadEvents;
use App\Utilities\Round;
use Filament\Widgets\Concerns\InteractsWithPageFilters;
use Filament\Widgets\StatsOverviewWidget;
use Filament\Widgets\StatsOverviewWidget\Stat;
use Illuminate\Support\Carbon;
use Illuminate\Support\HtmlString;
use Livewire\Attributes\Reactive;
// use Illuminate\Support\Facades\Log;
class BoxesBettypeSingle extends StatsOverviewWidget
{
use InteractsWithPageFilters;
protected ?string $pollingInterval = null;
protected int|array|null $columns = null;
#[Reactive]
public ?array $filters = [];
public ?int $count;
public function mount(array $filters)
{
$this->filters = $filters;
}
protected function getStats(): array
{
$data = LoadEvents::load($this->filters, false);
$team_id = (int) $this->filters['team_id'] ?? 0;
$season = $this->filters['season'] ?? 0;
$season_or_date = $this->filters['season_or_date'];
$similar_past_matches = $this->filters['similar_past_matches'];
$date_events = '';
switch ($season_or_date) {
case 'season':
if ($season) {
$date_events = implode(', ', $season);
} else {
$date_events = 'Current Season';
}
break;
default:
$start = $this->filters['start_date'] ?? 0;
$end = $this->filters['end_date'] ?? 0;
$tmp = [];
if ($start) {
$tmp[] = 'From: '.Carbon::createFromDate($start)->format('Y-m-d');
}
if ($end) {
$tmp[] = 'To: '.Carbon::createFromDate($end)->format('Y-m-d');
}
if ($tmp) {
$date_events = implode('<br>', $tmp);
} else {
$date_events = 'All Dates';
}
break;
}
$team_position = $this->filters['team_position'] ? ucfirst($this->filters['team_position']) : 'Position Both';
if (! $data) {
return [];
}
$statistic_type = HelperStatisticType::get($this->filters);
if (! isset($data['datasets'][0])) {
$data['datasets'][0]['data'] = [];
$data['datasets'][1]['data'] = [];
$total_home = 0;
$total_away = 0;
$summe_home = 0;
$summe_away = 0;
$home_team = '';
$away_team = '';
} else {
$arr_home = $data['datasets'][0]['data'];
$arr_away = $data['datasets'][1]['data'];
$total_home = count($arr_home);
$total_away = count($arr_away);
$summe_home = array_sum($arr_home);
$summe_away = array_sum($arr_away);
$home_team = $data['home_team'];
$away_team = $data['away_team'];
}
if (isset($data['results'])) {
$win = $data['results']['w'] ? number_format(Round::odd($total_home / $data['results']['w']), 2) : 0;
$draw = $data['results']['d'] ? number_format(Round::odd($total_home / $data['results']['d']), 2) : 0;
$lost = $data['results']['l'] ? number_format(Round::odd($total_home / $data['results']['l']), 2) : 0;
} else {
$win = 0;
$draw = 0;
$lost = 0;
}
if ($total_home) {
$value_home = number_format($summe_home / $total_home, 1);
} else {
$value_home = 0;
}
if ($total_away) {
$value_away = number_format($summe_away / $total_away, 1);
} else {
$value_away = 0;
}
$max_boxes = 3;
$average_team_home = 0;
$average_team_away = 0;
$average_league_home = 0;
$average_league_away = 0;
$expectations_home = 0;
$expectations_away = 0;
$expectations_home = $data['expectations_home'] ?? 0;
$expectations_away = $data['expectations_away'] ?? 0;
foreach ($data['datasets'] as $value) {
if ($value['label'] == 'Average Team') {
$average_team_home = $value['average_team_home'] ?? 0;
$average_team_away = $value['average_team_away'] ?? 0;
$max_boxes++;
}
if ($value['label'] == 'Average League') {
$average_league_home = $value['average_league_home'] ?? 0;
$average_league_away = $value['average_league_away'] ?? 0;
$max_boxes++;
}
}
// i box 1 3 4 5 devono sempre avere 1 decimale, se il valore è 12 fai scrivere 12.0
// il box 2 sempre un numero intero
// il box 6 sempre a due decimali, se trovi 2 fai scrivere 2.00
$boxes = [];
if ($similar_past_matches != 'none') {
// BOX 2
$boxes[] = Stat::make('Total', self::template_box2($total_home))
->description(fn () => $similar_past_matches == 'all' ? 'SPM Source Database' : 'SPM Source League')
->extraAttributes([
'x-init' => "animate('number-of-events', $total_home);",
'class' => 'box-info',
]);
// BOX 3
$boxes[] = Stat::make('Average '.$statistic_type, self::template_box3('Home', 'Away', $value_home, $value_away))
->description('Team '.$team_position)
->extraAttributes([
'x-init' => "animate('average_home', $value_home, 1); animate('average_away', $value_away, 1)",
'class' => 'box-success',
]);
// BOX 6
$boxes[] = Stat::make('Odds', self::templateOdds($data, $win, $draw, $lost))
->description($team_position)
->extraAttributes([
'x-init' => "animate('win', $win); animate('draw', $draw); animate('lost', $lost)",
'class' => 'box-purple',
]);
} else {
// BOX 1
$boxes[] = Stat::make($statistic_type, self::template_box1($expectations_home, $expectations_away))
->description('Expected Values')
->extraAttributes([
'x-init' => "animate('expectations_home', $expectations_home, 1); animate('expectations_away', $expectations_away, 1)",
'class' => 'box-yellow',
]);
if ($team_id) {
// BOX 2
$boxes[] = Stat::make('Total', self::template_box2($total_home))
->description(fn () => new HtmlString($date_events))
->extraAttributes([
'x-init' => "animate('number-of-events', $total_home);",
'class' => 'box-info',
]);
// BOX 3
$boxes[] = Stat::make('Average '.$statistic_type, self::template_box3($home_team, $away_team, $value_home, $value_away))
->description('Team '.$team_position)
->extraAttributes([
'x-init' => "animate('average_home', $value_home, 1); animate('average_away', $value_away, 1)",
'class' => 'box-success',
]);
// BOX 4
$boxes[] = Stat::make('Average '.$statistic_type, self::template_box4($home_team, $away_team, $average_team_home, $average_team_away))
->description('Team Season')
->extraAttributes([
'x-init' => "animate('av_team_home', $average_team_home, 1); animate('av_team_away', $average_team_away, 1)",
'class' => 'box-success',
]);
// BOX 5
$boxes[] = Stat::make('Average '.$statistic_type, self::template_box5('Home', 'Away', $average_league_home, $average_league_away))
->description('League Season')
->extraAttributes([
'x-init' => "animate('av_league_home', $average_league_home, 1); animate('av_league_away', $average_league_away, 1)",
'class' => 'box-success',
]);
// BOX 6
$boxes[] = Stat::make('Odds', self::templateOdds($data, $win, $draw, $lost))
->description($team_position)
->extraAttributes([
'x-init' => "animate('win', $win, 2); animate('draw', $draw, 2); animate('lost', $lost, 2)",
'class' => 'box-purple',
]);
}
}
$this->columns = [
'default' => 1,
'sm' => 2,
'md' => 3,
'xl' => 6,
];
return $boxes;
}
// TEAMPLATE BOX 1
protected function template_box1(float $expectations_home, float $expectations_away): HtmlString
{
return new HtmlString('<div class="grid grid-cols-2 justify-center font-bold text-2xl">
<span class="text-center" id="expectations_home">'.$expectations_home.'</span>
<span class="text-center" id="expectations_away">'.$expectations_away.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">Home</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">Away</span>
</div>');
}
// TEAMPLATE BOX 2
protected function template_box2(float $total_home): HtmlString
{
return new HtmlString('<div class="grid grid-cols-1 justify-center font-bold text-2xl">
<span class="text-center" id="number-of-events">'.$total_home.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">Events</span>
</div>');
}
// TEAMPLATE BOX 3
protected function template_box3(string $home_team, string $away_team, float $value_home, float $value_away): HtmlString
{
return new HtmlString('<div class="grid grid-cols-2 justify-center font-bold text-2xl">
<span class="text-center" id="average_home">'.$value_home.'</span>
<span class="text-center" id="average_away">'.$value_away.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$home_team.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$away_team.'</span>
</div>');
}
// TEAMPLATE BOX 4
protected function template_box4(string $home_team, string $away_team, float $value_home, float $value_away): HtmlString
{
return new HtmlString('<div class="grid grid-cols-2 justify-center font-bold text-2xl">
<span class="text-center" id="av_team_home">'.$value_home.'</span>
<span class="text-center" id="av_team_away">'.$value_away.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$home_team.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$away_team.'</span>
</div>');
}
// TEAMPLATE BOX 5
protected function template_box5(string $home_team, string $away_team, float $value_home, float $value_away): HtmlString
{
return new HtmlString('<div class="grid grid-cols-2 justify-center font-bold text-2xl">
<span class="text-center" id="av_league_home">'.$value_home.'</span>
<span class="text-center" id="av_league_away">'.$value_away.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$home_team.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$away_team.'</span>
</div>');
}
// TEAMPLATE BOX 6 odds
protected function templateOdds(array &$data, float $win, float $draw, float $lost): HtmlString
{
if ($data['similar_past_matches'] != 'none') {
$name_win = '<b>1</b> ('.$data['results']['w'].')';
$name_draw = '<b>X</b> ('.$data['results']['d'].')';
$name_lost = '<b>2</b> ('.$data['results']['l'].')';
} else {
$name_win = '<b>Win</b> ('.$data['results']['w'].')';
$name_draw = '<b>Draw</b> ('.$data['results']['d'].')';
$name_lost = '<b>Lost</b> ('.$data['results']['l'].')';
}
return new HtmlString('<div class="grid grid-cols-3 justify-center">
<span class="text-center font-bold text-xl" id="win">'.number_format($win, 2).'</span>
<span class="text-center font-bold text-xl" id="draw">'.number_format($draw, 2).'</span>
<span class="text-center font-bold text-xl" id="lost">'.number_format($lost, 2).'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$name_win.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$name_draw.'</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$name_lost.'</span>
</div>');
}
protected function getMedian(array $arr)
{
sort($arr);
$size = count($arr);
if ($size % 2 == 0) {
// even
$m = ($size) / 2;
$m1 = $m - 1;
$m2 = $m;
// dd($m1, $m2, $arr);
// dd('GERADE', $arr, $size, $m, $m1, $m2);
if (isset($arr[$m1]) && isset($arr[$m2])) {
return round(($arr[$m1] + $arr[$m2]) / 2, 2);
}
} else {
// odd (add 1 because array starts with 0)
$m = (int) ceil($size / 2);
// dd($m, $arr);
// dd('UNGERADE', $m, $arr, $arr[$m]);
if (isset($arr[$m])) {
return $arr[$m];
}
}
}
}
app/Filament/Widgets/Charts/LoadEvents.php
+55 -52
View File
@@ -17,7 +17,6 @@ class LoadEvents
$team_id = (int) $filter['team_id'] ?? 0;
$statistic_type = $filter['statistic_type'] ?? 'gls';
$team_position = $filter['team_position'];
$seasonmode = $filter['seasonmode'];
$accuracy = (float) $filter['accuracy'] ?? 0.5;
$similar_past_matches = $filter['similar_past_matches'];
@@ -28,6 +27,10 @@ class LoadEvents
return [];
}
if (! $team_id && $similar_past_matches == 'none') {
return [];
}
if ($statistic_type == 'none') {
$statistic_type = 'gls';
}
@@ -128,10 +131,10 @@ class LoadEvents
break;
}
if ($statistic_type == 'gls') {
$dataset_exp_home[] = (float) round($value['exp_home'], 1);
$dataset_exp_away[] = (float) round($value['exp_away'], 1);
}
// if ($statistic_type == 'gls') {
// $dataset_exp_home[] = (float) round($value['exp_home'], 1);
// $dataset_exp_away[] = (float) round($value['exp_away'], 1);
// }
} else {
if ($team_position == 'home') {
switch ($value['result_code']) {
@@ -148,10 +151,10 @@ class LoadEvents
break;
}
if ($statistic_type == 'gls') {
$dataset_exp_home[] = (float) round($value['exp_home'], 1);
$dataset_exp_away[] = (float) round($value['exp_away'], 1);
}
// if ($statistic_type == 'gls') {
// $dataset_exp_home[] = (float) round($value['exp_home'], 1);
// $dataset_exp_away[] = (float) round($value['exp_away'], 1);
// }
} elseif ($team_position == 'away') {
switch ($value['result_code']) {
@@ -168,10 +171,10 @@ class LoadEvents
break;
}
if ($statistic_type == 'gls') {
$dataset_exp_home[] = (float) round($value['exp_away'], 1);
$dataset_exp_away[] = (float) round($value['exp_home'], 1);
}
// if ($statistic_type == 'gls') {
// $dataset_exp_home[] = (float) round($value['exp_away'], 1);
// $dataset_exp_away[] = (float) round($value['exp_home'], 1);
// }
} else {
// dd($team_id, $value['home_id'], $value['away_id']);
@@ -200,10 +203,10 @@ class LoadEvents
break;
}
if ($statistic_type == 'gls') {
$dataset_exp_home[] = (float) round($value['exp_away'], 1);
$dataset_exp_away[] = (float) round($value['exp_home'], 1);
}
// if ($statistic_type == 'gls') {
// $dataset_exp_home[] = (float) round($value['exp_away'], 1);
// $dataset_exp_away[] = (float) round($value['exp_home'], 1);
// }
}
}
if (isset($val_home) && isset($val_away)) {
@@ -240,8 +243,8 @@ class LoadEvents
$dataset_home2 = [];
$dataset_away2 = [];
$home_id = $match->home_id;
$away_id = $match->away_id;
// $home_id = $match->home_id;
// $away_id = $match->away_id;
foreach ($res[$team_position] as $value) {
@@ -310,13 +313,13 @@ class LoadEvents
'results_per_event' => $results_per_event,
'data' => $dataset_home,
'tension' => 0.5,
'borderColor' => '#fb2c36',
'backgroundColor' => '#fb2c36',
'borderColor' => '#00c950',
'backgroundColor' => '#00c950',
'pointStyle' => $hasdots,
'fill' => [
'target' => 1,
'above' => '#fb2c3680',
'below' => '#fdc70080',
'above' => '#00c95080',
'below' => '#2b7fff80',
],
],
[
@@ -326,11 +329,11 @@ class LoadEvents
'results_per_event' => $results_per_event,
'data' => $dataset_away,
'tension' => 0.5,
'borderColor' => '#fdc700',
'backgroundColor' => '#fdc700',
'borderColor' => '#2b7fff',
'backgroundColor' => '#2b7fff',
'pointStyle' => $hasdots,
'fill' => false,
'hidden' => true,
'hidden' => false,
],
],
'labels' => $labels,
@@ -342,32 +345,32 @@ class LoadEvents
'expectations_home' => $expectations['home'],
'expectations_away' => $expectations['away'],
];
if ($team_id && $statistic_type == 'gls') {
$data['datasets'][] = [
'label' => 'Goals '.$label1,
'events' => $events,
'playing_date' => $playing_date,
'results_per_event' => $results_per_event,
'data' => $dataset_exp_home,
'tension' => 0.5,
'borderColor' => '#00c950',
'backgroundColor' => '#00c950',
'pointStyle' => $hasdots,
'hidden' => true,
];
$data['datasets'][] = [
'label' => 'Goals '.$label2,
'events' => $events,
'playing_date' => $playing_date,
'results_per_event' => $results_per_event,
'data' => $dataset_exp_away,
'tension' => 0.5,
'borderColor' => '#2b7fff',
'backgroundColor' => '#2b7fff',
'pointStyle' => $hasdots,
'hidden' => true,
];
}
// if ($team_id && $statistic_type == 'gls') {
// $data['datasets'][] = [
// 'label' => 'Goals '.$label1,
// 'events' => $events,
// 'playing_date' => $playing_date,
// 'results_per_event' => $results_per_event,
// 'data' => $dataset_exp_home,
// 'tension' => 0.5,
// 'borderColor' => '#00c950',
// 'backgroundColor' => '#00c950',
// 'pointStyle' => $hasdots,
// 'hidden' => true,
// ];
// $data['datasets'][] = [
// 'label' => 'Goals '.$label2,
// 'events' => $events,
// 'playing_date' => $playing_date,
// 'results_per_event' => $results_per_event,
// 'data' => $dataset_exp_away,
// 'tension' => 0.5,
// 'borderColor' => '#2b7fff',
// 'backgroundColor' => '#2b7fff',
// 'pointStyle' => $hasdots,
// 'hidden' => true,
// ];
// }
if (isset($dataset_home2) && isset($dataset_away2)) {
$data['datasets'][] = [
app/Filament/Widgets/Charts/LoadEvents/LoadEventsAverages.php
+4 -4
View File
@@ -252,8 +252,8 @@ class LoadEventsAverages
'events' => $events,
'data' => $data_team,
'tension' => 0.5,
'borderColor' => '#ad46ff',
'backgroundColor' => '#ad46ff',
'borderColor' => '#00c950',
// 'backgroundColor' => '#ad46ff',
'borderDash' => [5, 5],
'pointStyle' => false,
'hidden' => false,
@@ -265,8 +265,8 @@ class LoadEventsAverages
'events' => $events,
'data' => $data_league,
'tension' => 0.5,
'borderColor' => '#00bba7',
'backgroundColor' => '#00bba7',
'borderColor' => '#2b7fff',
// 'backgroundColor' => '#00bba7',
'borderDash' => [5, 5],
'pointStyle' => false,
'hidden' => false,
app/Filament/Widgets/Charts/LoadEvents/LoadEventsQueryAll.php
+32 -22
View File
@@ -48,17 +48,23 @@ class LoadEventsQueryAll
$matches_played = [];
if ($ss_player_id) {
// $matches_season = StatistikoEvent::whereIn('season', $season)
// ->where(function ($query) use ($team_id, $team_position) {
// switch ($team_position) {
// case 'home':
// return $query->where('home_id', '=', $team_id);
// case 'away':
// return $query->where('away_id', '=', $team_id);
// default:
// return $query->where('home_id', '=', $team_id)
// ->orWhere('away_id', '=', $team_id);
// }
// })->pluck('match_id')->toArray();
$matches_season = StatistikoEvent::whereIn('season', $season)
->where(function ($query) use ($team_id, $team_position) {
switch ($team_position) {
case 'home':
return $query->where('home_id', '=', $team_id);
case 'away':
return $query->where('away_id', '=', $team_id);
default:
return $query->where('home_id', '=', $team_id)
->orWhere('away_id', '=', $team_id);
}
->where(function ($query) use ($team_id) {
return $query->where('home_id', '=', $team_id)
->orWhere('away_id', '=', $team_id);
})->pluck('match_id')->toArray();
$matches_played = StatistikoPlayer::query()
@@ -101,19 +107,23 @@ class LoadEventsQueryAll
return $query->where('league_id', $league_id);
}
})
->where(function ($query) use ($team_id, $similar_past_matches, $team_position) {
if ($team_id && $similar_past_matches == 'none') {
switch ($team_position) {
case 'home':
return $query->where('home_id', '=', $team_id);
case 'away':
return $query->where('away_id', '=', $team_id);
default:
return $query->where('home_id', '=', $team_id)
->orWhere('away_id', '=', $team_id);
}
}
->where(function ($query) use ($team_id) {
return $query->where('home_id', '=', $team_id)
->orWhere('away_id', '=', $team_id);
})
// ->where(function ($query) use ($team_id, $similar_past_matches, $team_position) {
// if ($team_id && $similar_past_matches == 'none') {
// switch ($team_position) {
// case 'home':
// return $query->where('home_id', '=', $team_id);
// case 'away':
// return $query->where('away_id', '=', $team_id);
// default:
// return $query->where('home_id', '=', $team_id)
// ->orWhere('away_id', '=', $team_id);
// }
// }
// })
->when($matches_played, function ($query) use ($matches_played, $player_on_field) {
if ($player_on_field == 'notplayed') {
return $query->whereNotIn('match_id', $matches_played);
app/Filament/Widgets/Charts/LoadPerformance.php
+77 -4
View File
@@ -2,6 +2,7 @@
namespace App\Filament\Widgets\Charts;
use App\Filament\Pages\Selections\Helper\GetSeason;
use App\Models\SofaScoreRosa;
use App\Models\StatisticFixtures;
use App\Models\StatistikoEvent;
@@ -21,14 +22,34 @@ class LoadPerformance
$match_id = (int) $filter['match_id'] ?? 0;
$team_id = (int) $filter['team_id'] ?? 0;
$team_position = $filter['team_position'];
$similar_past_matches = $filter['similar_past_matches'];
$accuracy = (float) $filter['accuracy'] ?? 0.5;
if (! $league_id) {
return [];
}
if (! $match_id) {
return [];
}
if (! $team_id && $similar_past_matches == 'none') {
return [];
}
$start = $filter['start_date'] ?? 0;
$end = $filter['end_date'] ?? 0;
$season_or_date = $filter['season_or_date'];
$season = $filter['season'];
$seasonmode = $filter['seasonmode'];
if ($season_or_date == 'season') {
$start = 0;
$end = 0;
}
$season = GetSeason::load($season, $seasonmode);
$team_map = SofaScoreRosa::pluck('ss_team_name', 'ss_team_id')->toArray();
@@ -39,7 +60,56 @@ class LoadPerformance
$home_id = $match->home_id ?? 0;
$away_id = $match->away_id ?? 0;
$res = StatistikoEvent::where('league_id', $league_id)->get();
$handicap_range = [];
$total_range = [];
if ($similar_past_matches != 'none') {
$team_position = '';
$exp_handicap = $match->exp_away - $match->exp_home;
$exp_total = $match->exp_away + $match->exp_home;
$handicap_range = [$exp_handicap - $accuracy, $exp_handicap + $accuracy];
$total_range = [$exp_total - $accuracy, $exp_total + $accuracy];
}
// $res = LoadEventsQuery::load($filter, $handicap_range, $total_range, $match, 1);
// $res = StatistikoEvent::where('league_id', $league_id)->get();
$res = StatistikoEvent::where(function ($query) use ($league_id, $similar_past_matches) {
switch ($similar_past_matches) {
case 'none':
case 'league':
return $query->where('league_id', $league_id);
}
})
->where(function ($query) use ($home_id, $away_id, $similar_past_matches) {
if ($similar_past_matches == 'none') {
return $query->where('home_id', $home_id)->orWhere('away_id', $home_id)->orWhere('away_id', $away_id)->orWhere('away_id', $away_id);
}
})
->when($handicap_range, function ($query) use ($handicap_range) {
return $query->whereBetween('exp_handicap', $handicap_range);
})->when($total_range, function ($query) use ($total_range) {
return $query->whereBetween('exp_total', $total_range);
})
->when($start, function ($query) use ($start) {
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, $similar_past_matches) {
if ($similar_past_matches == 'none' && $season_or_date == 'season') {
return $query->whereIn('season', $season);
}
})
->orderBy('starttime', 'ASC')
->get();
$home_matches = [];
$away_matches = [];
@@ -66,7 +136,7 @@ class LoadPerformance
$labels[] = round($val->starttime->diffInDays(Carbon::now()));
$date_away[] = $val['starttime']->format('Y-m-d H:i');
$results_away[] = $val['gls_h'].' : '.$val['gls_a'];
$events_home[] = $team_map[$val->home_id].' vs '.$team_map[$val->away_id];
$events_away[] = $team_map[$val->home_id].' vs '.$team_map[$val->away_id];
$away_matches[] = $val->match_id;
}
break;
@@ -82,7 +152,7 @@ class LoadPerformance
$labels[] = round($val->starttime->diffInDays(Carbon::now()));
$date_away[] = $val['starttime']->format('Y-m-d H:i');
$results_away[] = $val['gls_h'].' : '.$val['gls_a'];
$events_home[] = $team_map[$val->home_id].' vs '.$team_map[$val->away_id];
$events_away[] = $team_map[$val->home_id].' vs '.$team_map[$val->away_id];
$away_matches[] = $val->match_id;
}
break;
@@ -98,7 +168,7 @@ class LoadPerformance
$labels[] = round($val->starttime->diffInDays(Carbon::now()));
$date_away[] = $val['starttime']->format('Y-m-d H:i');
$results_away[] = $val['gls_h'].' : '.$val['gls_a'];
$events_home[] = $team_map[$val->home_id].' vs '.$team_map[$val->away_id];
$events_away[] = $team_map[$val->home_id].' vs '.$team_map[$val->away_id];
$away_matches[] = $val->match_id;
}
break;
@@ -241,6 +311,9 @@ class LoadPerformance
'borderDash' => [5, 5],
'hidden' => true,
],
/**
* AWAY
*/
[
'label' => $team_map[$match->away_id],
'playing_date' => $date_away,