diff --git a/pfosten/app/Http/Controllers/UsersController.php b/pfosten/app/Http/Controllers/UsersController.php index b9e4856b..059ea982 100755 --- a/pfosten/app/Http/Controllers/UsersController.php +++ b/pfosten/app/Http/Controllers/UsersController.php @@ -340,12 +340,13 @@ class UsersController extends Controller if (!array_key_exists($user_id, $rankingDisplay)) { $rankingDisplay[$user_id] = array(); + /* if ($user_id==1) { Log::info("round_id=".$round_id.", rankscore from var=".$roundtipps[$key]["rankscore"]. ", old_total=" .$rankscore_total); } */ - + $rankingDisplay[$user_id]["user_id"]=$user_id; $rankingDisplay[$user_id]["dayscore"] = 0; $rankingDisplay[$user_id]["user_name"] = $roundtipps[$key]["user_name"]; $rankingDisplay[$user_id]["is_dayscorewinner"] = 0; @@ -400,9 +401,36 @@ class UsersController extends Controller $round=Round::where('id','=',$max_round_id)->first(); $games=Game::where('round_id','=',$max_round_id)->get(); $all_rounds=Round::where('season_id','=',$currentSeason->id)->get(); + + + $entries = array(); + usort($rankingDisplay, array($this,"cmp2")); + + foreach($rankingDisplay as $entry) { + array_push($entries, $entry); + } + + $rankingDisplay = $entries; + + $lastScore=-1; + $lastrank=0; + foreach($rankingDisplay as $key => $user) { + if ($user["rankscore"]==$lastScore) { + $rankingDisplay[$key]["rank"] = $lastrank; + } else { + $lastrank +=1; + $rankingDisplay[$key]["rank"] = $lastrank; + $lastScore = $user["rankscore"]; + } + } + return view('users.ranking2', compact('all_rounds','rankingDisplay','userids','round','games')); } + public function cmp2($user1, $user2) { + return ($user1['rankscore'] < $user2['rankscore']); + } + } diff --git a/pfosten/resources/views/users/edit.blade.php b/pfosten/resources/views/users/edit.blade.php index 6c4e49ef..ba91a589 100644 --- a/pfosten/resources/views/users/edit.blade.php +++ b/pfosten/resources/views/users/edit.blade.php @@ -45,7 +45,7 @@

 

- +

 

diff --git a/pfosten/resources/views/users/ranking2.blade.php b/pfosten/resources/views/users/ranking2.blade.php index f60b2972..0144c8df 100755 --- a/pfosten/resources/views/users/ranking2.blade.php +++ b/pfosten/resources/views/users/ranking2.blade.php @@ -132,26 +132,26 @@
- @foreach($userids as $userid) + @foreach($rankingDisplay as $entry) -   {{ $rankingDisplay[$userid]["rankscore"] }}  -
-  {{ $rankingDisplay[$userid]["user_name"] }}   -  {{ $rankingDisplay[$userid]["rankscore"] }}  -  {{ $rankingDisplay[$userid]["dayscore"] }}  -  {{ $rankingDisplay[$userid]["tipp_score1"] }}  -  {{ $rankingDisplay[$userid]["tipp_score2"] }}  -
-  {{$rankingDisplay[$userid]["tipp_score3"] }}  -  {{$rankingDisplay[$userid]["tipp_score4"] }}  -
-  {{$rankingDisplay[$userid]["tipp_score5"] }}  -  {{$rankingDisplay[$userid]["tipp_score6"] }}  -
-  {{$rankingDisplay[$userid]["tipp_score7"] }}  -  {{$rankingDisplay[$userid]["tipp_score8"] }}  -
+   {{ $entry["rank"] }}  +
+  {{ $entry["user_name"] }}   +  {{ $entry["rankscore"] }}  +  {{ $entry["dayscore"] }}  +  {{ $entry["tipp_score1"] }}  +  {{ $entry["tipp_score2"] }}  +
+  {{$entry["tipp_score3"] }}  +  {{$entry["tipp_score4"] }}  +
+  {{$entry["tipp_score5"] }}  +  {{$entry["tipp_score6"] }}  +
+  {{$entry["tipp_score7"] }}  +  {{$entry["tipp_score8"] }}  +
@endforeach