From b914a534efee68860eafec8a0ff6089ba965cca6 Mon Sep 17 00:00:00 2001 From: salam Date: Thu, 9 Jul 2026 12:34:35 +0200 Subject: [PATCH] wip design --- app/Filament/Widgets/Data/LoadPlayer.php | 2 +- app/Filament/Widgets/StatsMedianAverage.php | 84 +++++++++++---------- resources/css/filament/admin/theme.css | 2 +- 3 files changed, 47 insertions(+), 41 deletions(-) diff --git a/app/Filament/Widgets/Data/LoadPlayer.php b/app/Filament/Widgets/Data/LoadPlayer.php index 3589e0be..30018394 100644 --- a/app/Filament/Widgets/Data/LoadPlayer.php +++ b/app/Filament/Widgets/Data/LoadPlayer.php @@ -10,7 +10,7 @@ class LoadPlayer { public static $last_query = []; - public static function load($filter, bool $hasdots) + public static function load(array $filter, bool $hasdots) { // dd($filter); diff --git a/app/Filament/Widgets/StatsMedianAverage.php b/app/Filament/Widgets/StatsMedianAverage.php index 4bce8ab6..dd494e29 100644 --- a/app/Filament/Widgets/StatsMedianAverage.php +++ b/app/Filament/Widgets/StatsMedianAverage.php @@ -9,7 +9,7 @@ use App\Utilities\Round; use Filament\Widgets\Concerns\InteractsWithPageFilters; use Filament\Widgets\StatsOverviewWidget; use Filament\Widgets\StatsOverviewWidget\Stat; -use Illuminate\Support\Facades\Log; +// use Illuminate\Support\Facades\Log; use Illuminate\Support\HtmlString; use Livewire\Attributes\Reactive; @@ -39,8 +39,9 @@ class StatsMedianAverage extends StatsOverviewWidget $team_position = HelperTeamPosition::get($this->filters); - if (!$data) + if (! $data) { return []; + } $arr_home = []; $arr_away = []; @@ -67,14 +68,16 @@ class StatsMedianAverage extends StatsOverviewWidget $away_team = $data['away_team']; } - if ($arr_home) + if ($arr_home) { $median_home = self::getMedian($arr_home); - else + } else { $median_home = 0; - if ($arr_away) + } + if ($arr_away) { $median_away = self::getMedian($arr_away); - else + } else { $median_away = 0; + } if (isset($data['results'])) { $win = $data['results']['w'] ? number_format(Round::odd($total_home / $data['results']['w']), 2) : 0; @@ -84,14 +87,16 @@ class StatsMedianAverage extends StatsOverviewWidget return []; } - if ($total_home) + if ($total_home) { $value_home = number_format($summe_home / $total_home, 1); - else + } else { $value_home = 0; - if ($total_away) + } + if ($total_away) { $value_away = number_format($summe_away / $total_away, 1); - else + } else { $value_away = 0; + } $max_boxes = 3; $average_team_home = 0; @@ -100,12 +105,12 @@ class StatsMedianAverage extends StatsOverviewWidget $average_league_away = 0; foreach ($data['datasets'] as $value) { - if ($value['label'] == "Average Team") { + 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") { + if ($value['label'] == 'Average League') { $average_league_home = $value['average_league_home'] ?? 0; $average_league_away = $value['average_league_away'] ?? 0; $max_boxes++; @@ -113,31 +118,31 @@ class StatsMedianAverage extends StatsOverviewWidget } $boxes = []; - # BOX 1 - $boxes[] = Stat::make('Number', new HtmlString('
' . $total_home . '
')) + // BOX 1 + $boxes[] = Stat::make('Number', new HtmlString('
'.$total_home.'
')) ->description('Events') ->extraAttributes(['x-init' => "animate('number-of-events', $total_home, 0)"]); - # BOX 2 - $boxes[] = Stat::make('Average ' . $statistic_type, self::template('avhome', 'avaway', $home_team, $away_team)) - ->description('Team ' . $team_position) + // BOX 2 + $boxes[] = Stat::make('Average '.$statistic_type, self::template('avhome', 'avaway', $home_team, $away_team)) + ->description('Team '.$team_position) ->extraAttributes(['x-init' => "animate('avhome', $value_home); animate('avaway', $value_away)"]); - - # BOX 3 - $boxes[] = Stat::make('Average ' . $statistic_type, self::template('av_team_home', 'av_team_away', $home_team, $away_team, $average_team_home, $average_team_away)) + + // BOX 3 + $boxes[] = Stat::make('Average '.$statistic_type, self::template('av_team_home', 'av_team_away', $home_team, $away_team, $average_team_home, $average_team_away)) ->description('Team Season') ->extraAttributes(['x-init' => "animate('av_team_home', $average_team_home); animate('av_team_away', $average_team_away)"]); - - # BOX 4 - $boxes[] = Stat::make('Average ' . $statistic_type, self::template('av_league_home', 'av_league_away', 'Home', 'Away', $average_league_home, $average_league_away)) + + // BOX 4 + $boxes[] = Stat::make('Average '.$statistic_type, self::template('av_league_home', 'av_league_away', 'Home', 'Away', $average_league_home, $average_league_away)) ->description('League Season') ->extraAttributes(['x-init' => "animate('av_league_home', $average_league_home); animate('av_league_away', $average_league_away)"]); - - # BOX 5 + + // BOX 5 $boxes[] = Stat::make('Odds', self::templateOdds($data, $win, $draw, $lost)) ->description($team_position) ->extraAttributes(['x-init' => "animate('mehome', $median_home); animate('meaway', $median_away, 0)"]); - + $this->columns = [ 'default' => 1, 'sm' => 2, @@ -151,16 +156,16 @@ class StatsMedianAverage extends StatsOverviewWidget protected function templateOdds(&$data, float $win, float $draw, float $lost): HtmlString { - if($data['similar_past_matches'] != 'none') { + if ($data['similar_past_matches'] != 'none') { $name_win = '1 ('.$data['results']['w'].')'; $name_draw = 'X ('.$data['results']['d'].')'; $name_lost = '2 ('.$data['results']['l'].')'; - } - else { + } else { $name_win = 'Win ('.$data['results']['w'].')'; $name_draw = 'Draw ('.$data['results']['d'].')'; $name_lost = 'Lost ('.$data['results']['l'].')'; } + return new HtmlString('
'.number_format($win, 2).' '.number_format($draw, 2).' @@ -171,21 +176,21 @@ class StatsMedianAverage extends StatsOverviewWidget
'); } - protected function template($home_id, $away_id, $home_name, $away_name, $val_home =0, $val_away =0): HtmlString + protected function template(string $home_id, string $away_id, string $home_name, string $away_name, $val_home = 0, $val_away = 0): HtmlString { return new HtmlString('
- '.$val_home.' - '.$val_away.' - ' . $home_name . ' - ' . $away_name . ' + '.$val_home.' + '.$val_away.' + '.$home_name.' + '.$away_name.'
'); } protected function getMedian(array $arr) { sort($arr); - $size = count($arr); + $size = count($arr); if ($size % 2 == 0) { // even @@ -196,16 +201,17 @@ class StatsMedianAverage extends StatsOverviewWidget // dd($m1, $m2, $arr); // dd('GERADE', $arr, $size, $m, $m1, $m2); - if (isset($arr[$m1]) && isset($arr[$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 = ceil(($size) / 2); + $m = ceil($size / 2); // dd($m, $arr); - // dd('UNGERADE', $m, $arr, $arr[$m]); - if (isset($arr[$m])) + if (isset($arr[$m])) { return $arr[$m]; + } } } } diff --git a/resources/css/filament/admin/theme.css b/resources/css/filament/admin/theme.css index 19e09f03..791c5649 100644 --- a/resources/css/filament/admin/theme.css +++ b/resources/css/filament/admin/theme.css @@ -105,7 +105,7 @@ input[type="radio"].fi-radio-input { Green Stat Widgets */ .fi-sc-component .fi-wi-stats-overview-stat { - @apply bg-green-50 dark:bg-green-900 border border-green-300 dark:border-green-700 p-3 + @apply bg-green-50 dark:bg-green-500/10 border border-green-500/30 dark:border-green-700/50 p-3 } /*