From fcbf718492ad309c08d9f0e10cf51812434adc31 Mon Sep 17 00:00:00 2001 From: salam Date: Sun, 31 May 2026 12:13:22 +0200 Subject: [PATCH] design changes to save space --- app/Filament/Pages/Statistic.php | 91 +++++++---- app/Filament/Widgets/ChartPlayer.php | 6 +- app/Filament/Widgets/Data/LoadPlayer.php | 119 +++++--------- .../Widgets/Data/LoadPlayerBackup.php | 107 ------------- app/Filament/Widgets/Data/LoadPlayerMulti.php | 148 ++++++++++++++++++ app/Filament/Widgets/StatsMedianAverage.php | 82 +++++----- composer.lock | 12 +- .../views/filament/pages/statistic.blade.php | 5 +- .../widgets/statistic-average.blade.php | 31 ++-- .../widgets/statistic-regular.blade.php | 22 +-- 10 files changed, 319 insertions(+), 304 deletions(-) delete mode 100644 app/Filament/Widgets/Data/LoadPlayerBackup.php create mode 100644 app/Filament/Widgets/Data/LoadPlayerMulti.php diff --git a/app/Filament/Pages/Statistic.php b/app/Filament/Pages/Statistic.php index 8ad54432..da7cdc02 100644 --- a/app/Filament/Pages/Statistic.php +++ b/app/Filament/Pages/Statistic.php @@ -73,10 +73,9 @@ class Statistic extends BaseDashboard return $schema ->components([ Grid::make([ - 'default' => 2, + 'default' => 1, 'sm' => 2, - 'md' => 3, - 'lg' => 4, + 'md' => 4, ]) ->columnSpanFull() ->extraAttributes([ @@ -84,17 +83,21 @@ class Statistic extends BaseDashboard ]) ->schema([ Select::make('league_id') - ->prefixIconColor('primary') + // ->prefixIconColor('primary') + ->prefixIconColor(fn (Get $get): string => $get('league_id') ? 'success' : 'danger') ->prefixIcon('phosphor-trophy') + ->hiddenLabel() ->options(fn () => LoadStatisticFixturesLeaguesOptions::load(1)) ->live() - ->label('League') + ->placeholder('League') ->afterStateUpdated(function (callable $set, $state) { $set('match_id', null); + $set('team_id', null); $this->dispatch('filterChanged', filterValue: $state); }), Select::make('match_id') - ->prefixIconColor('primary') + ->hiddenLabel() + ->prefixIconColor(fn (Get $get): string => $get('match_id') ? 'success' : 'danger') ->prefixIcon('phosphor-calendar-check') ->options(function (Get $get) { return LoadStatisticFixturesMatchOptions::load($get('league_id')); @@ -104,9 +107,20 @@ class Statistic extends BaseDashboard $set('tm_player_id', null); }) ->live() - ->label('Events'), + ->placeholder('Events'), + Select::make('team_id') - ->prefixIconColor(fn (Get $get): string => $get('similar_past_matches') == 'none' ? 'primary' : '') + ->hiddenLabel() + ->prefixIconColor(function (Get $get): string { + if ($get('team_id')) { + return 'success'; + } elseif ($get('similar_past_matches') != 'none') { + return 'gray'; + } else { + return 'danger'; + } + }) + // ->prefixIconColor(fn (Get $get): string => $get('similar_past_matches') == 'none' ? 'primary' : '') ->prefixIcon('phosphor-users-three') ->disabled(fn (Get $get) => $get('similar_past_matches') != 'none') ->options(function (Get $get) { @@ -125,10 +139,13 @@ class Statistic extends BaseDashboard $set('tm_player_id', null); }) ->live() - ->label('Team'), + ->placeholder('Team'), Select::make('team_position') - ->prefixIconColor(fn (Get $get): string => $get('similar_past_matches') == 'none' ? 'primary' : '') + ->hiddenLabel() + ->placeholder('Positiom') + ->prefix('Positiom') + // ->prefixIconColor(fn (Get $get): string => $get('similar_past_matches') == 'none' ? 'primary' : '') ->prefixIcon('phosphor-map-pin') ->disabled(fn (Get $get) => $get('similar_past_matches') != 'none') ->default('all') @@ -140,10 +157,12 @@ class Statistic extends BaseDashboard ]), DatePicker::make('start_date') + ->hiddenLabel() ->native(false) - ->prefixIconColor('primary') + // ->prefixIconColor('primary') ->prefixIcon('phosphor-calendar') ->live() + ->prefix('Start') ->suffixAction( Action::make('clear_start') ->icon('phosphor-x') @@ -151,10 +170,12 @@ class Statistic extends BaseDashboard ->action(fn (Set $set) => $set('start_date', null)) ), DatePicker::make('end_date') + ->hiddenLabel() ->native(false) - ->prefixIconColor('primary') + // ->prefixIconColor('primary') ->prefixIcon('phosphor-calendar') ->live() + ->prefix('End') ->suffixAction( Action::make('clear_end') ->icon('phosphor-x') @@ -162,12 +183,10 @@ class Statistic extends BaseDashboard ->action(fn (Set $set) => $set('end_date', null)) ), Select::make('statistic_type') - ->columnSpan([ - 'default' => 1, - 'xl' => 2, - ]) - ->prefixIconColor('primary') - ->prefixIcon('phosphor-dots-three-outline') + ->hiddenLabel() + ->placeholder('Statistic Type') + ->prefixIconColor('success') + ->prefixIcon('phosphor-arrows-out-line-vertical') ->default('none') ->selectablePlaceholder(false) ->options([ @@ -180,8 +199,14 @@ class Statistic extends BaseDashboard 'tsh' => 'Total shots', ]), Select::make('similar_past_matches') + ->hiddenLabel() + ->placeholder('Similar Past Matches') ->prefixIconColor('primary') ->prefixIcon('phosphor-approximate-equals') + ->columnSpan([ + 'default' => 1, + 'xl' => 2, + ]) ->suffixAction( Action::make('iconInfo') ->color('gray') @@ -196,25 +221,30 @@ class Statistic extends BaseDashboard $set('tm_player_id', null); }) ->options([ - 'none' => 'None', - 'league' => 'League', - 'all' => 'All Database', + 'none' => 'Similar Past Matches: None', + 'league' => 'Similar Past Matches: League', + 'all' => 'Similar Past Matches All: Database', ]), Slider::make('accuracy') ->label('Accuracy max: 0.25, steps: 0.025') ->hiddenLabel() - ->disabled(fn (Get $get) => $get('similar_past_matches') == 'none') + ->hidden(fn (Get $get) => $get('similar_past_matches') == 'none') // ->fillTrack() ->range(minValue: 0, maxValue: 0.25) ->step(0.025) ->decimalPlaces(1) ->decimalPlaces(3) ->tooltips() + ->columnSpan([ + 'default' => 1, + 'xl' => 2, + ]) // ->pips() ->live(), Select::make('tm_player_id') - ->label('Player') - ->disabled(fn (Get $get) => $get('similar_past_matches') != 'none') + ->hiddenLabel() + ->placeholder('Player') + ->hidden(fn (Get $get) => $get('similar_past_matches') != 'none') ->prefixIconColor(fn (Get $get): string => $get('similar_past_matches') == 'none' ? 'primary' : '') ->prefixIcon('icon-player') ->suffixAction( @@ -232,10 +262,11 @@ class Statistic extends BaseDashboard }) ->live(), Select::make('player_on_field') - ->label('Time on field') + ->hiddenLabel() + ->placeholder('Time on field') ->prefixIcon('phosphor-watch') ->default('all') - ->disabled(fn (Get $get) => ! $get('tm_player_id') or $get('similar_past_matches') != 'none') + ->hidden(fn (Get $get) => ! $get('tm_player_id') or $get('similar_past_matches') != 'none') ->prefixIconColor(fn (Get $get): string => ($get('tm_player_id') and $get('similar_past_matches') == 'none') ? 'primary' : '') ->selectablePlaceholder(false) ->options([ @@ -248,14 +279,6 @@ class Statistic extends BaseDashboard ]); } - public function getFooterWidgetsColumns(): int|array - { - return [ - 'default' => 1, - 'md' => 2, - ]; - } - protected function tooltip_similar_past_matches(): HtmlString { $str = '
'; diff --git a/app/Filament/Widgets/ChartPlayer.php b/app/Filament/Widgets/ChartPlayer.php index 5e1ee6b1..42c13006 100644 --- a/app/Filament/Widgets/ChartPlayer.php +++ b/app/Filament/Widgets/ChartPlayer.php @@ -2,6 +2,7 @@ namespace App\Filament\Widgets; +use App\Filament\Widgets\Data\HelperStatisticType; use App\Filament\Widgets\Data\LoadPlayer; use Filament\Support\RawJs; use Filament\Widgets\ChartWidget; @@ -25,7 +26,10 @@ class ChartPlayer extends ChartWidget $data = LoadPlayer::load($this->filters); if ($data) { - $this->description = $data['player_name']; + $this->description = ucfirst(HelperStatisticType::get($this->filters)); + if ($data['player_name']) { + $this->description .= ' '.$data['player_name']; + } } return $data; diff --git a/app/Filament/Widgets/Data/LoadPlayer.php b/app/Filament/Widgets/Data/LoadPlayer.php index 638b43c7..5454e669 100644 --- a/app/Filament/Widgets/Data/LoadPlayer.php +++ b/app/Filament/Widgets/Data/LoadPlayer.php @@ -28,6 +28,8 @@ class LoadPlayer $end = $filter['end_date'] ?? 0; + $statistic_type = $filter['statistic_type']; + $team_position = $filter['team_position']; if (! $league_id) { @@ -40,101 +42,62 @@ class LoadPlayer return []; } + if ($statistic_type == 'none') { + $statistic_type = 'gls'; + } + $player_name = StatistikoDetail::where('tm_player_id', (int) $tm_player_id)->value('name'); - $res = StatistikoPlayer::with('event.home')->with('event.away')->where('tm_player_id', (int) $tm_player_id)->get(); + $res = StatistikoPlayer::with('event')->where('tm_player_id', (int) $tm_player_id)->get(); $labels = []; - $playing_date = []; - $events = []; - $datasets_goals = []; - $datasets_fouls = []; - $datasets_offside = []; - $datasets_card = []; - $datasets_shots_on = []; - $datasets_shots_off = []; + $datasets = []; foreach ($res as $value) { + // dd($value); + + $val = 0; + if (isset($value->event->starttime)) { + // $labels[] = $value->event->starttime->format('d.M.y'); + $labels[] = round($value->event->starttime->diffInDays(Carbon::now())); - $events[] = $value->event->home->name.' vs '.$value->event->away->name; - - $playing_date[] = $value->event->starttime->format('d. F Y H:i'); - - $datasets_goals[] = (int) $value->goals; - - $datasets_fouls[] = (int) $value->fouls; - - $datasets_offside[] = (int) $value->offsides; - - $datasets_card[] = (int) $value->card_yellow + $value->card_red + $value->card_yellowred; - - $datasets_shots_on[] = (int) $value->shots_on_target; - - $datasets_shots_off[] = (int) $value->shots_off_target; - + switch ($statistic_type) { + case 'gls': + $val = (int) $value->goals; + break; + case 'crn': + $val = (int) 0; + break; + case 'fls': + $val = (int) $value->fouls; + break; + case 'ofs': + $val = (int) $value->offsides; + break; + case 'crd': + $val = (int) $value->card_yellow + $value->card_red + $value->card_yellowred; + break; + case 'snt': + $val = (int) $value->shots_on_target; + break; + case 'tsh': + $val = (int) $value->shots_off_target; + break; + } } + $datasets[] = $val; } $data = [ 'datasets' => [ [ - 'label' => 'Goals', - 'data' => $datasets_goals, - 'dates' => $playing_date, - 'events' => $events, + 'label' => ucfirst($team_position), + 'data' => $datasets, 'tension' => 0.5, - 'borderColor' => '#fb2c36', - 'backgroundColor' => '#fb2c36', - ], - [ - 'label' => 'Fouls Commited', - 'data' => $datasets_fouls, - 'dates' => $playing_date, - 'events' => $events, - 'tension' => 0.5, - 'borderColor' => '#f0b100', - 'backgroundColor' => '#f0b100', - 'dates' => $playing_date, - 'events' => $events, - ], - [ - 'label' => 'Offside', - 'data' => $datasets_offside, - 'dates' => $playing_date, - 'events' => $events, - 'tension' => 0.5, - 'borderColor' => '#7ccf00', - 'backgroundColor' => '#7ccf00', - ], - [ - 'label' => 'Cards', - 'data' => $datasets_card, - 'dates' => $playing_date, - 'events' => $events, - 'tension' => 0.5, - 'borderColor' => '#00b8db', - 'backgroundColor' => '#00b8db', - ], - [ - 'label' => 'Shots On Target', - 'data' => $datasets_shots_on, - 'dates' => $playing_date, - 'events' => $events, - 'tension' => 0.5, - 'borderColor' => '#615fff', - 'backgroundColor' => '#615fff', - ], - [ - 'label' => 'Shots Off Target', - 'data' => $datasets_shots_off, - 'dates' => $playing_date, - 'events' => $events, - 'tension' => 0.5, - 'borderColor' => '#e12afb', - 'backgroundColor' => '#e12afb', + 'borderColor' => '#36A2EB', ], ], 'labels' => $labels, diff --git a/app/Filament/Widgets/Data/LoadPlayerBackup.php b/app/Filament/Widgets/Data/LoadPlayerBackup.php deleted file mode 100644 index 21a396a0..00000000 --- a/app/Filament/Widgets/Data/LoadPlayerBackup.php +++ /dev/null @@ -1,107 +0,0 @@ -where('tm_player_id', (int) $tm_player_id)->get(); - - $labels = []; - $datasets = []; - foreach ($res as $value) { - - // dd($value); - - $val = 0; - - if (isset($value->event->starttime)) { - - // $labels[] = $value->event->starttime->format('d.M.y'); - - $labels[] = round($value->event->starttime->diffInDays(Carbon::now())); - - switch ($statistic_type) { - case 'gls': - $val = (int) $value->goals; - break; - case 'crn': - $val = (int) 0; - break; - case 'fls': - $val = (int) $value->fouls; - break; - case 'ofs': - $val = (int) $value->offsides; - break; - case 'crd': - $val = (int) $value->card_yellow + $value->card_red + $value->card_yellowred; - break; - case 'snt': - $val = (int) $value->shots_on_target; - break; - case 'tsh': - $val = (int) $value->shots_off_target; - break; - } - } - $datasets[] = $val; - } - - $data = [ - 'datasets' => [ - [ - 'label' => ucfirst($team_position), - 'data' => $datasets, - 'tension' => 0.5, - 'borderColor' => '#36A2EB', - ], - ], - 'labels' => $labels, - ]; - - self::$last_query = $data; - - return $data; - } -} diff --git a/app/Filament/Widgets/Data/LoadPlayerMulti.php b/app/Filament/Widgets/Data/LoadPlayerMulti.php new file mode 100644 index 00000000..a787663d --- /dev/null +++ b/app/Filament/Widgets/Data/LoadPlayerMulti.php @@ -0,0 +1,148 @@ +value('name'); + + $res = StatistikoPlayer::with('event.home')->with('event.away')->where('tm_player_id', (int) $tm_player_id)->get(); + + $labels = []; + $playing_date = []; + $events = []; + $datasets_goals = []; + $datasets_fouls = []; + $datasets_offside = []; + $datasets_card = []; + $datasets_shots_on = []; + $datasets_shots_off = []; + foreach ($res as $value) { + + if (isset($value->event->starttime)) { + + $labels[] = round($value->event->starttime->diffInDays(Carbon::now())); + + $events[] = $value->event->home->name.' vs '.$value->event->away->name; + + $playing_date[] = $value->event->starttime->format('d. F Y H:i'); + + $datasets_goals[] = (int) $value->goals; + + $datasets_fouls[] = (int) $value->fouls; + + $datasets_offside[] = (int) $value->offsides; + + $datasets_card[] = (int) $value->card_yellow + $value->card_red + $value->card_yellowred; + + $datasets_shots_on[] = (int) $value->shots_on_target; + + $datasets_shots_off[] = (int) $value->shots_off_target; + + } + } + + $data = [ + 'datasets' => [ + [ + 'label' => 'Goals', + 'data' => $datasets_goals, + 'dates' => $playing_date, + 'events' => $events, + 'tension' => 0.5, + 'borderColor' => '#fb2c36', + 'backgroundColor' => '#fb2c36', + ], + [ + 'label' => 'Fouls Commited', + 'data' => $datasets_fouls, + 'dates' => $playing_date, + 'events' => $events, + 'tension' => 0.5, + 'borderColor' => '#f0b100', + 'backgroundColor' => '#f0b100', + 'dates' => $playing_date, + 'events' => $events, + ], + [ + 'label' => 'Offside', + 'data' => $datasets_offside, + 'dates' => $playing_date, + 'events' => $events, + 'tension' => 0.5, + 'borderColor' => '#7ccf00', + 'backgroundColor' => '#7ccf00', + ], + [ + 'label' => 'Cards', + 'data' => $datasets_card, + 'dates' => $playing_date, + 'events' => $events, + 'tension' => 0.5, + 'borderColor' => '#00b8db', + 'backgroundColor' => '#00b8db', + ], + [ + 'label' => 'Shots On Target', + 'data' => $datasets_shots_on, + 'dates' => $playing_date, + 'events' => $events, + 'tension' => 0.5, + 'borderColor' => '#615fff', + 'backgroundColor' => '#615fff', + ], + [ + 'label' => 'Shots Off Target', + 'data' => $datasets_shots_off, + 'dates' => $playing_date, + 'events' => $events, + 'tension' => 0.5, + 'borderColor' => '#e12afb', + 'backgroundColor' => '#e12afb', + ], + ], + 'labels' => $labels, + 'player_name' => $player_name, + ]; + + self::$last_query = $data; + + return $data; + } +} diff --git a/app/Filament/Widgets/StatsMedianAverage.php b/app/Filament/Widgets/StatsMedianAverage.php index 697dc1d4..8cfa2896 100644 --- a/app/Filament/Widgets/StatsMedianAverage.php +++ b/app/Filament/Widgets/StatsMedianAverage.php @@ -24,7 +24,8 @@ class StatsMedianAverage extends StatsOverviewWidget public function getColumns(): int|array { return [ - 'md' => 3, + 'default' => 2, + 'sm' => 3, 'xl' => 6, ]; } @@ -39,67 +40,78 @@ class StatsMedianAverage extends StatsOverviewWidget return []; } - $arr = $data['datasets'][0]['data']; - $arr2 = $data['datasets'][1]['data']; - $total = count($arr); - $summe = array_sum($arr); - $summe2 = array_sum($arr2); + $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 (! $total) { + if (! $total_home) { return []; } + // if (! $total_home || ! $total_away) { + // return []; + // } - sort($arr); - sort($arr2); + sort($arr_home); + sort($arr_away); - if ($total % 2 == 0) { + if ($total_home % 2 == 0) { // even - $m = $total / 2; + $m = $total_home / 2; $m1 = floor($m); $m2 = ceil($m); - $median = round(($arr[$m1] + $arr[$m2]) / 2, 2); - $median2 = round(($arr2[$m1] + $arr2[$m2]) / 2, 2); + $median_home = round(($arr_home[$m1] + $arr_home[$m2]) / 2, 2); + $m = $total_away / 2; + $m1 = floor($m); + $m2 = ceil($m); + $median_away = round(($arr_away[$m1] + $arr_away[$m2]) / 2, 2); } else { // odd - $m = floor($total / 2); - $median = $arr[$m]; - $median2 = $arr2[$m]; + $m = $total_home / 2; + $median_home = $arr_home[$m]; + $m = floor($total_away / 2); + $median_away = $arr_away[$m]; } - $win = $data['results']['w'] ? number_format(Round::odd($total / $data['results']['w']), 2) : 0; - $draw = $data['results']['d'] ? number_format(Round::odd($total / $data['results']['d']), 2) : 0; - $lost = $data['results']['l'] ? number_format(Round::odd($total / $data['results']['l']), 2) : 0; + $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; return [ - Stat::make('Number of events', $total)->extraAttributes([ - 'class' => 'text-xl bg-green-100 dark:bg-green-950 border border-green-300 dark:border-green-800', + Stat::make('stat1', 'stat1')->view('filament.resources.events.widgets.statistic-regular', [ + 'titel' => 'Number of events', + 'value' => $total_home, ]), - Stat::make('Average', 'Average')->view('filament.resources.events.widgets.statistic-average', [ + Stat::make('stat2', 'stat2')->view('filament.resources.events.widgets.statistic-average', [ 'titel' => 'Average '.$statistic_type, - 'infavour' => number_format($summe / $total, 1), - 'against' => number_format($summe2 / $total, 1), + 'value1' => number_format($summe_home / $total_home, 1), + 'value2' => number_format($summe_away / $total_away, 1), 'home' => $home_team, 'away' => $away_team, ]), - Stat::make('Median', 'Median')->view('filament.resources.events.widgets.statistic-average', [ + Stat::make('stat3', 'stat3')->view('filament.resources.events.widgets.statistic-average', [ 'titel' => 'Median '.$statistic_type, - 'infavour' => $median, - 'against' => $median2, + 'value1' => $median_home, + 'value2' => $median_away, 'home' => $home_team, 'away' => $away_team, ]), - Stat::make('Win: '.$data['results']['w'], $win) - ->extraAttributes([ - 'class' => 'bg-green-100 dark:bg-green-950 border border-green-300 dark:border-green-800', - ]), - Stat::make('Draw: '.$data['results']['d'], $draw)->extraAttributes([ - 'class' => 'bg-green-100 dark:bg-green-950 border border-green-300 dark:border-green-800', + Stat::make('stat4', 'stat4')->view('filament.resources.events.widgets.statistic-regular', [ + 'titel' => 'Win: '.$data['results']['w'], + 'value' => $win, ]), - Stat::make('Lost: '.$data['results']['l'], $lost)->extraAttributes([ - 'class' => 'bg-green-100 dark:bg-green-950 border border-green-300 dark:border-green-800', + Stat::make('stat5', 'stat5')->view('filament.resources.events.widgets.statistic-regular', [ + 'titel' => 'Draw: '.$data['results']['d'], + 'value' => $draw, + ]), + Stat::make('stat6', 'stat6')->view('filament.resources.events.widgets.statistic-regular', [ + 'titel' => 'Lost: '.$data['results']['l'], + 'value' => $lost, ]), ]; } diff --git a/composer.lock b/composer.lock index 26cc49ae..0f611f8f 100644 --- a/composer.lock +++ b/composer.lock @@ -6581,16 +6581,16 @@ }, { "name": "spatie/laravel-permission", - "version": "7.4.1", + "version": "7.4.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "ef42ecb781e5534d368a3853fa161e420ad51397" + "reference": "15a9daf02ba02d3ae77aaa6da582708231ef999b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/ef42ecb781e5534d368a3853fa161e420ad51397", - "reference": "ef42ecb781e5534d368a3853fa161e420ad51397", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/15a9daf02ba02d3ae77aaa6da582708231ef999b", + "reference": "15a9daf02ba02d3ae77aaa6da582708231ef999b", "shasum": "" }, "require": { @@ -6656,7 +6656,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/7.4.1" + "source": "https://github.com/spatie/laravel-permission/tree/7.4.2" }, "funding": [ { @@ -6664,7 +6664,7 @@ "type": "github" } ], - "time": "2026-04-29T07:59:45+00:00" + "time": "2026-05-30T19:21:26+00:00" }, { "name": "spatie/shiki-php", diff --git a/resources/views/filament/pages/statistic.blade.php b/resources/views/filament/pages/statistic.blade.php index 25e67be8..73b5f5ff 100644 --- a/resources/views/filament/pages/statistic.blade.php +++ b/resources/views/filament/pages/statistic.blade.php @@ -1,11 +1,12 @@ + {{ $this->filtersForm }} @livewire(\App\Filament\Widgets\StatsMedianAverage::class, ['filters' => $this->filters])
- + Events @@ -24,7 +25,7 @@ -
+
@livewire(\App\Filament\Widgets\ChartEvent::class, ['filters' => $this->filters]) 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 db82e46a..51b3d314 100644 --- a/resources/views/filament/resources/events/widgets/statistic-average.blade.php +++ b/resources/views/filament/resources/events/widgets/statistic-average.blade.php @@ -1,24 +1,11 @@ -
-
-
-
- - {{ $titel }} - -
- -
-
{{ $infavour }}
-
{{ $against }}
-
- -
- -
{{ $home }}
-
{{ $away }}
- -
- -
+
+ {{ $titel }} +
+ {{ $value1 }} + {{ $value2 }} +
+
+ {{ $home }} + {{ $away }}
diff --git a/resources/views/filament/resources/events/widgets/statistic-regular.blade.php b/resources/views/filament/resources/events/widgets/statistic-regular.blade.php index 68e71584..6752bff2 100644 --- a/resources/views/filament/resources/events/widgets/statistic-regular.blade.php +++ b/resources/views/filament/resources/events/widgets/statistic-regular.blade.php @@ -1,20 +1,4 @@ -
-
-
-
- - {{ $titel }} - -
- -
- {{ $value }} -
- - -
-
-
-
-
+
+ {{ $titel }} + {{ $value }}