From b60e7c2f99bff14abb3ee8dfa5349f5f7a870629 Mon Sep 17 00:00:00 2001 From: salam Date: Tue, 13 Oct 2026 12:50:45 +0200 Subject: [PATCH] wip PP --- .../Widgets/Boxes/LoadPlayerAverages.php | 1 + app/Livewire/PlayerCalculator.php | 52 +++++++------------ 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/app/Filament/Widgets/Boxes/LoadPlayerAverages.php b/app/Filament/Widgets/Boxes/LoadPlayerAverages.php index a4a242c6..2b9fbeae 100644 --- a/app/Filament/Widgets/Boxes/LoadPlayerAverages.php +++ b/app/Filament/Widgets/Boxes/LoadPlayerAverages.php @@ -101,6 +101,7 @@ class LoadPlayerAverages if (isset($arr[$value->ss_player_id])) { $arr[$value->ss_player_id]['position'] = $value->position; $arr[$value->ss_player_id]['player_name'] = $value->player_name; + $arr[$value->ss_player_id]['preferred_foot'] = $value->preferred_foot; } } diff --git a/app/Livewire/PlayerCalculator.php b/app/Livewire/PlayerCalculator.php index 7beddaa9..329ec1eb 100644 --- a/app/Livewire/PlayerCalculator.php +++ b/app/Livewire/PlayerCalculator.php @@ -19,15 +19,9 @@ class PlayerCalculator extends Component $tmp = []; $tmp['id'] = $val['ss_player_id']; - if (! isset($val->details)) { - $tmp['name'] = $val['player_name']; - $tmp['pos_ori'] = 'GK'; - $tmp['foot'] = 'Both'; - } else { - $tmp['name'] = $val['player_name']; - $tmp['pos_ori'] = $val['position']; - $tmp['foot'] = $val['preferred_foot']; - } + $tmp['name'] = $val['player_name']; + $tmp['pos_ori'] = $val['position']; + $tmp['foot'] = $val['preferred_foot']; $tmp['pos'] = ''; $tmp['active'] = 0; $tmp['tot_evt'] = $val['total_events']; @@ -51,32 +45,26 @@ class PlayerCalculator extends Component } } - if (! isset($val->details)) { + if (in_array($val['position'], $positions_map['MIDFIELD'])) { + $tmp['area'] = 'midfield'; + $tmp['color_pos'] = 'info'; + $tmp['order'] = 2; + } elseif (in_array($val['position'], $positions_map['DEFENCE'])) { + $tmp['area'] = 'defence'; + $tmp['color_pos'] = 'success'; + $tmp['order'] = 1; + } elseif (in_array($val['position'], $positions_map['ATTACK'])) { + $tmp['area'] = 'attack'; + $tmp['color_pos'] = 'warning'; + $tmp['order'] = 3; + } elseif (in_array($val['position'], $positions_map['GOALKEEPER'])) { $tmp['area'] = 'goalkeeper'; $tmp['color_pos'] = 'gray'; - $tmp['order'] = 5; + $tmp['order'] = 4; } else { - if (in_array($val['position'], $positions_map['MIDFIELD'])) { - $tmp['area'] = 'midfield'; - $tmp['color_pos'] = 'info'; - $tmp['order'] = 2; - } elseif (in_array($val['position'], $positions_map['DEFENCE'])) { - $tmp['area'] = 'defence'; - $tmp['color_pos'] = 'success'; - $tmp['order'] = 1; - } elseif (in_array($val['position'], $positions_map['ATTACK'])) { - $tmp['area'] = 'attack'; - $tmp['color_pos'] = 'warning'; - $tmp['order'] = 3; - } elseif (in_array($val['position'], $positions_map['GOALKEEPER'])) { - $tmp['area'] = 'goalkeeper'; - $tmp['color_pos'] = 'gray'; - $tmp['order'] = 4; - } else { - $tmp['area'] = 'defence'; - $tmp['color_pos'] = 'success'; - $tmp['order'] = 5; - } + $tmp['area'] = 'defence'; + $tmp['color_pos'] = 'success'; + $tmp['order'] = 5; } $result[] = $tmp;