diff --git a/pfosten/app/Tipp.php b/pfosten/app/Tipp.php index e6937867..32db595d 100755 --- a/pfosten/app/Tipp.php +++ b/pfosten/app/Tipp.php @@ -370,22 +370,15 @@ class Tipp extends Model // // ADD-ON: Scores für GreenShirt(grünes Trikot) - $dayScore1 = Tipp::getScoreLocal($roundtipps[$key]['results'][0],$roundtipps[$key]['results'][1],$roundtipps[$key]['tipps'][0],$roundtipps[$key]['tipps'][1],$roundtipps[$key]['joker'][0]); - $dayScore2 = Tipp::getScoreLocal($roundtipps[$key]['results'][2],$roundtipps[$key]['results'][3],$roundtipps[$key]['tipps'][2],$roundtipps[$key]['tipps'][3],$roundtipps[$key]['joker'][1]); - $dayScore3 = Tipp::getScoreLocal($roundtipps[$key]['results'][4],$roundtipps[$key]['results'][5],$roundtipps[$key]['tipps'][4],$roundtipps[$key]['tipps'][5],$roundtipps[$key]['joker'][2]); - $dayScore4 = Tipp::getScoreLocal($roundtipps[$key]['results'][6],$roundtipps[$key]['results'][7],$roundtipps[$key]['tipps'][6],$roundtipps[$key]['tipps'][7],$roundtipps[$key]['joker'][3], false); - $dayScoreValue = $dayScore1 + $dayScore2 + $dayScore3 + $dayScore4; - - $isFoul = ( $dayScoreValue == 0 ); + // + $isFoul = ( $roundtipps[$key]["rankscore"] == 0 ); if ( $isFoul ) { $foulCount += 1; } if ( $foulCount > 2 ) { $totalGShirtScore = 0; $foulCount = 0; } else { - - - $totalGShirtScore += $dayScoreValue; - Log::info("!!!!> Adding score: ".$dayScoreValue); + $totalGShirtScore += $roundtipps[$key]["rankscore"]; + Log::info("!!!!> Adding score: ".$roundtipps[$key]["rankscore"]); } $roundtipps[$key]['gshirt_totalscore'] = $totalGShirtScore; @@ -508,6 +501,8 @@ class Tipp extends Model } } + ///// END OF HURTFUL 6 PLACE RESTRICTION + $quotas=Quota::getQuotas(); error_log("Round-Count=".$round_count);