diff --git a/app/Filament/Widgets/PlayerPropsDrop.php b/app/Filament/Widgets/PlayerPropsDrop.php index 315f35d7..0e23ff61 100644 --- a/app/Filament/Widgets/PlayerPropsDrop.php +++ b/app/Filament/Widgets/PlayerPropsDrop.php @@ -605,6 +605,8 @@ class PlayerPropsDrop extends Widget $map[$val->position]['snt'] = $val->snt; } + // stesso ordine di prima: GLS, CRD, FLS, OFS, TSH, SNT + foreach ($this->players as $k => $player) { foreach ($results as $key => $result) { if ((int) $player['id'] == (int) $result['id']) { @@ -621,6 +623,12 @@ class PlayerPropsDrop extends Widget $results[$key]['finale_calc_gls'] = $final; $this->players[$k]['gls'] = $final > $tamx ? $final : $tamx; + $tamx = number_format($map[$pos]['crd'], 3); + $final = number_format($result['asp_player_cards'], 3); + $results[$key]['finale_tamx_crd'] = $tamx; + $results[$key]['finale_calc_crd'] = $final; + $this->players[$k]['crd'] = $final > $tamx ? $final : $tamx; + $tamx = number_format($map[$pos]['fls'], 3); $final = number_format($result['asp_player_fouls'], 3); $results[$key]['finale_tamx_fls'] = $tamx; @@ -633,23 +641,17 @@ class PlayerPropsDrop extends Widget $results[$key]['finale_calc_ofs'] = $final; $this->players[$k]['ofs'] = $final > $tamx ? $final : $tamx; - $tamx = number_format($map[$pos]['snt'], 3); - $final = number_format($result['asp_player_shots_on_target'], 3); - $results[$key]['finale_tamx_snt'] = $tamx; - $results[$key]['finale_calc_snt'] = $final; - $this->players[$k]['snt'] = $final > $tamx ? $final : $tamx; - $tamx = number_format($map[$pos]['tsh'], 3); $final = number_format($result['asp_player_total_shots'], 3); $results[$key]['finale_tamx_tsh'] = $tamx; $results[$key]['finale_calc_tsh'] = $final; $this->players[$k]['tsh'] = $final > $tamx ? $final : $tamx; - $tamx = number_format($map[$pos]['crd'], 3); - $final = number_format($result['asp_player_cards'], 3); - $results[$key]['finale_tamx_crd'] = $tamx; - $results[$key]['finale_calc_crd'] = $final; - $this->players[$k]['crd'] = $final > $tamx ? $final : $tamx; + $tamx = number_format($map[$pos]['snt'], 3); + $final = number_format($result['asp_player_shots_on_target'], 3); + $results[$key]['finale_tamx_snt'] = $tamx; + $results[$key]['finale_calc_snt'] = $final; + $this->players[$k]['snt'] = $final > $tamx ? $final : $tamx; } } }