diff --git a/app/Filament/Widgets/Data/LoadEvents.php b/app/Filament/Widgets/Data/LoadEvents.php index 2f5c2b41..36c7a2ec 100644 --- a/app/Filament/Widgets/Data/LoadEvents.php +++ b/app/Filament/Widgets/Data/LoadEvents.php @@ -66,15 +66,21 @@ class LoadEvents $handicap_range = 0; $total_range = 0; if ($similar_past_matches != 'none') { - $res = StatisticFixtures::where('id', (int) $match_id)->first(); + $match = StatisticFixtures::with('home')->with('away')->where('id', (int) $match_id)->first(); - $exp_handicap = $res->exp_away - $res->exp_home; + $exp_handicap = $match->exp_away - $match->exp_home; - $exp_total = $res->exp_away + $res->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]; + + $home_team = $match->home->name; + $away_team = $match->away->name; + } else { + $home_team = 'Home'; + $away_team = 'Away'; } /** @@ -385,6 +391,8 @@ class LoadEvents 'labels' => $labels, 'description' => $description ?? '', 'results' => $results, + 'home_team' => $home_team, + 'away_team' => $away_team, ]; self::$last_query = $data; diff --git a/app/Filament/Widgets/StatsMedianAverage.php b/app/Filament/Widgets/StatsMedianAverage.php index 74643e1d..0af7255c 100644 --- a/app/Filament/Widgets/StatsMedianAverage.php +++ b/app/Filament/Widgets/StatsMedianAverage.php @@ -2,6 +2,7 @@ namespace App\Filament\Widgets; +use App\Filament\Widgets\Data\HelperStatisticType; use App\Filament\Widgets\Data\LoadEvents; use App\Utilities\Round; use Filament\Widgets\Concerns\InteractsWithPageFilters; @@ -26,6 +27,8 @@ class StatsMedianAverage extends StatsOverviewWidget { $data = LoadEvents::load($this->filters, 'Events'); + $statistic_type = ucfirst(HelperStatisticType::get($this->filters)); + if (! isset($data['datasets'][0])) { return []; } @@ -35,6 +38,8 @@ class StatsMedianAverage extends StatsOverviewWidget $total = count($arr); $summe = array_sum($arr); $summe2 = array_sum($arr2); + $home_team = $data['home_team']; + $away_team = $data['away_team']; if (! $total) { return []; @@ -64,10 +69,22 @@ class StatsMedianAverage extends StatsOverviewWidget return [ Stat::make('Number of events', $total)->extraAttributes([ - 'class' => 'bg-green-100 dark:bg-green-950 border border-green-300 dark:border-green-800', + 'class' => 'text-xl bg-green-100 dark:bg-green-950 border border-green-300 dark:border-green-800', + ]), + Stat::make('Average', 'Average')->view('filament.resources.events.widgets.statistic-average', [ + 'titel' => 'Average '.$statistic_type, + 'infavour' => number_format($summe / $total, 1), + 'against' => number_format($summe2 / $total, 1), + 'home' => $home_team, + 'away' => $away_team, + ]), + Stat::make('Median', 'Median')->view('filament.resources.events.widgets.statistic-average', [ + 'titel' => 'Median '.$statistic_type, + 'infavour' => $median, + 'against' => $median2, + 'home' => $home_team, + 'away' => $away_team, ]), - Stat::make('Average', 'Average')->view('filament.resources.events.widgets.statistic-average', ['titel' => 'Average', 'infavour' => number_format($summe / $total, 1), 'against' => number_format($summe2 / $total, 1)]), - Stat::make('Median', 'Median')->view('filament.resources.events.widgets.statistic-average', ['titel' => 'Median', 'infavour' => $median, 'against' => $median2]), Stat::make('Win: '.$data['results']['w'], $win) ->extraAttributes([ 'class' => 'bg-green-100 dark:bg-green-950 border border-green-300 dark:border-green-800', diff --git a/resources/css/filament/admin/theme.css b/resources/css/filament/admin/theme.css index 36aaee25..ccb75170 100644 --- a/resources/css/filament/admin/theme.css +++ b/resources/css/filament/admin/theme.css @@ -113,6 +113,13 @@ widget space to filter padding-top: 0; } +.fi-wi-stats-overview-stat-label { + @apply text-lg font-bold mx-auto +} + +.fi-wi-stats-overview-stat-value { + @apply text-center +} /** x for removing all filters (not working) */ #mapper_right .fi-ta-filter-indicators button, diff --git a/resources/views/filament/resources/events/widgets/statistic-average.blade.php b/resources/views/filament/resources/events/widgets/statistic-average.blade.php index 5728df69..db82e46a 100644 --- a/resources/views/filament/resources/events/widgets/statistic-average.blade.php +++ b/resources/views/filament/resources/events/widgets/statistic-average.blade.php @@ -8,14 +8,14 @@