diff --git a/app/Filament/Widgets/ChartMovingAverageEvent.php b/app/Filament/Widgets/ChartMovingAverageEvent.php index 9ccd7f15..b6997b34 100644 --- a/app/Filament/Widgets/ChartMovingAverageEvent.php +++ b/app/Filament/Widgets/ChartMovingAverageEvent.php @@ -46,7 +46,7 @@ class ChartMovingAverageEvent extends ChartWidget tooltip: { callbacks: { label: (context) => { - return [' '+context.parsed.y, context.dataset.events[context.dataIndex]]; + return [' '+context.parsed.y, context.dataset.events[context.dataIndex], context.dataset.results_per_event[context.dataIndex]]; }, } }, diff --git a/app/Filament/Widgets/ChartPunctualEvent.php b/app/Filament/Widgets/ChartPunctualEvent.php index 6870de35..1b16b0e8 100644 --- a/app/Filament/Widgets/ChartPunctualEvent.php +++ b/app/Filament/Widgets/ChartPunctualEvent.php @@ -43,7 +43,7 @@ class ChartPunctualEvent extends ChartWidget tooltip: { callbacks: { label: (context) => { - return [' '+context.parsed.y, context.dataset.events[context.dataIndex]]; + return [' '+context.parsed.y, context.dataset.events[context.dataIndex], context.dataset.results_per_event[context.dataIndex]]; }, } }, diff --git a/app/Filament/Widgets/Data/LoadEvents.php b/app/Filament/Widgets/Data/LoadEvents.php index 66aed4f6..9da139b9 100644 --- a/app/Filament/Widgets/Data/LoadEvents.php +++ b/app/Filament/Widgets/Data/LoadEvents.php @@ -105,10 +105,14 @@ class LoadEvents $dataset_home = []; $dataset_away = []; + $results_per_event = []; $labels = []; $events = []; $labels_since = []; - $results = ['w' => 0, 'd' => 0, 'l' => 0]; + // win in favor (w) against (w2) + // draw in favor (d) against (d2) + // lost in favor (l) against (l2) + $results = ['w' => 0, 'd' => 0, 'l' => 0, 'w2' => 0, 'l2' => 0]; /** * IF WITH PLAYER @@ -121,16 +125,20 @@ class LoadEvents $labels[] = $value['starttime']->format('d.M.Y H:i'); + $results_per_event[] = $value['gls_h'].' : '.$value['gls_a']; + if ($team_position == 'home') { switch ($value['result_code']) { case '1': $results['w']++; + $results['l2']++; break; case 'X': $results['d']++; break; case '2': $results['l']++; + $results['w2']++; break; } @@ -164,17 +172,22 @@ class LoadEvents $val_away = (int) $value['tsh_a']; break; } + + $results_per_event[] = $val_home.' : '.$val_away; + } elseif ($team_position == 'away') { switch ($value['result_code']) { case '1': $results['l']++; + $results['w2']++; break; case 'X': $results['d']++; break; case '2': $results['w']++; + $results['l2']++; break; } @@ -212,8 +225,10 @@ class LoadEvents switch ($value['result_code']) { case '1': if ($team_id == $value['home_id']) { + $results['l2']++; $results['w']++; } else { + $results['w2']++; $results['l']++; } break; @@ -223,7 +238,9 @@ class LoadEvents case '2': if ($team_id == $value['home_id']) { $results['l']++; + $results['w2']++; } else { + $results['l2']++; $results['w']++; } break; @@ -307,6 +324,7 @@ class LoadEvents [ 'label' => 'In Favor', 'events' => $events, + 'results_per_event' => $results_per_event, 'data' => $dataset_home, 'fill' => false, 'tension' => 0.5, @@ -315,6 +333,7 @@ class LoadEvents [ 'label' => 'Against', 'events' => $events, + 'results_per_event' => $results_per_event, 'data' => $dataset_away, 'fill' => false, 'tension' => 0.5, diff --git a/app/Filament/Widgets/StatsMedianAverage.php b/app/Filament/Widgets/StatsMedianAverage.php index 680b5889..65a56044 100644 --- a/app/Filament/Widgets/StatsMedianAverage.php +++ b/app/Filament/Widgets/StatsMedianAverage.php @@ -55,17 +55,19 @@ class StatsMedianAverage extends StatsOverviewWidget $median = $arr[$m]; } - $win = $data['results']['w'] ? number_format(Round::odd($total / $data['results']['w']), 2) : 0; + $win_infavor = $data['results']['w'] ? number_format(Round::odd($total / $data['results']['w']), 2) : 0; + $win_against = $data['results']['w2'] ? number_format(Round::odd($total / $data['results']['w2']), 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; + $lost_infavor = $data['results']['l'] ? number_format(Round::odd($total / $data['results']['l']), 2) : 0; + $lost_against = $data['results']['l2'] ? number_format(Round::odd($total / $data['results']['l2']), 2) : 0; return [ Stat::make('Number of events', $total), Stat::make('Average', round($summe / $total, 1)), Stat::make('Median', $median), - Stat::make('Win: '.$data['results']['w'], $win), + Stat::make('Win: '.$data['results']['w'], $win_infavor.' - '.$win_against)->description('In Favor - Against'), Stat::make('Draw: '.$data['results']['d'], $draw), - Stat::make('Lost: '.$data['results']['l'], $lost), + Stat::make('Lost: '.$data['results']['l'], $lost_infavor.' - '.$lost_against)->description('In Favor - Against'), ]; } }