diff --git a/pfosten/app/Http/Controllers/UsersController.php b/pfosten/app/Http/Controllers/UsersController.php index b1aef02a..bf1ad706 100755 --- a/pfosten/app/Http/Controllers/UsersController.php +++ b/pfosten/app/Http/Controllers/UsersController.php @@ -254,6 +254,13 @@ class UsersController extends Controller $rankingDisplay=array(); $isFinalRound=false; + foreach ($user_ids as $user_id) { + $round_id = $max_round_id; + $key = $round_id . "_" . $user_id; + if ($roundtipps[$key]["ranking_payout"]>0) { + $isFinalRound=true; + } + } $payoutList = Quota::getPayoutList($response); @@ -284,9 +291,7 @@ class UsersController extends Controller $rankingDisplay[$user_id]["gshirt_leader"] = $roundtipps[$key]["gshirt_leader"]; $rankingDisplay[$user_id]["ranking_payout"] = $roundtipps[$key]["ranking_payout"]; - if ($roundtipps[$key]["ranking_payout"]>0) { - $isFinalRound=true; - } + $rankingDisplay[$user_id]["rankscore"] = $roundtipps[$key]["rankscore"]; // Summe Rangwertung alle 4 Spiele/Tipps der letzten durchlaufenen Runde, NICHT in init stellen !! $rankingDisplay[$user_id]["dayscore"] = $roundtipps[$key]["dayscore"]; // Dayscore der letzten durchlaufenen Runde, NICHT in init stellen !! $rankingDisplay[$user_id]["dayScoreWithRankScore"] = $roundtipps[$key]["dayScoreWithRankScore"]; // Dayscore der letzten durchlaufenen Runde, NICHT in init stellen !! @@ -337,18 +342,33 @@ class UsersController extends Controller $roundtipps[$key]["tipps"][6],$roundtipps[$key]["tipps"][7], $roundtipps[$key]["joker"][3]); - // Add GShirt payout - if (Season::hasGreenShirtGame()) { - $rankingDisplay[$user_id]['gshirt_payout']=0; + if ($isFinalRound==true) { + // Add GShirt, Playoff, Pokal payout + Log::info("!> ".$user_id); + $rankingDisplay[$user_id]['gshirt_payout'] = 0; + $rankingDisplay[$user_id]['pokal'] = 0;Log::info("Setting pokal for user_id ".$user_id); + $rankingDisplay[$user_id]['playoff'] = 0; $userPayouts = $payoutList[$user_id]; + $hasGreenShirtGame=Season::hasGreenShirtGame(); foreach ($userPayouts as $payoutItem) { - if ($payoutItem['roundname']=="Grünes Trikot") { - $rankingDisplay[$user_id]["gshirt_payout"] = $payoutItem['payout']; + if ($hasGreenShirtGame) { + if ($payoutItem['roundname'] == "Grünes Trikot") { + $rankingDisplay[$user_id]["gshirt_payout"] = $payoutItem['payout']; + } + } + if ($payoutItem['roundname'] == 'Pokal') { + $rankingDisplay[$user_id]["pokal"] = $payoutItem['payout']; + Log::info("Pokal goes to: ".$user_id); + } + + if (strpos($payoutItem['roundname'], 'Liga') !== false) { + $rankingDisplay[$user_id]["playoff"] = $payoutItem['payout']; } } } + } @@ -373,6 +393,7 @@ class UsersController extends Controller array_push($game_results,$rankingDisplay[0]["result_score1"],$rankingDisplay[0]["result_score2"],$rankingDisplay[0]["result_score3"],$rankingDisplay[0]["result_score4"],$rankingDisplay[0]["result_score5"],$rankingDisplay[0]["result_score6"],$rankingDisplay[0]["result_score7"],$rankingDisplay[0]["result_score8"]); Log::info("UserController::ranking: ExecutionTime: " . number_format(( microtime(true) - $startTime), 4) . " Seconds\n"); + //dd($rankingDisplay); return view('users.ranking', compact('all_rounds','rankingDisplay','userids','round','games','game_results','isFinalRound')); } diff --git a/pfosten/resources/views/users/ranking.blade.php b/pfosten/resources/views/users/ranking.blade.php index debca69d..29b0cdf1 100755 --- a/pfosten/resources/views/users/ranking.blade.php +++ b/pfosten/resources/views/users/ranking.blade.php @@ -163,7 +163,17 @@ Preisgeld grünes Trikot -@endif +