diff --git a/pfosten/app/Tipp.php b/pfosten/app/Tipp.php
index 13eeb780..c387b9ed 100755
--- a/pfosten/app/Tipp.php
+++ b/pfosten/app/Tipp.php
@@ -709,19 +709,31 @@ class Tipp extends Model
foreach ($users as $user) {
$key=$last_round_id."_".$user->id;
array_push($lastroundentries, $roundtipps[$key]);
+
}
usort($lastroundentries, array('App\Tipp', 'cmpGShirtTotal'));
- $displayRanking=array();
+
+ $rankingDisplay=array();
foreach($lastroundentries as $entry) {
$user_id = $entry['user_id'];
- $displayRanking[$user_id]=array();
foreach ($round_ids as $round_id) {
$key = $round_id."_".$user_id;
- array_push($displayRanking[$user_id],$roundtipps[$key]);
+ if (!array_key_exists($user_id,$rankingDisplay)) {
+ $rankingDisplay[$user_id]=array();
+ }
+ $rankingDisplay[$user_id][$round_id]=array();
+ array_push($rankingDisplay[$user_id][$round_id],$roundtipps[$key]);
}
}
- // TO BE CONTINUED...
+
+ //Rundenreihenfolge umkehren: Neuste zuerst
+ foreach($lastroundentries as $entry){
+ $user_id = $entry['user_id'];
+ $rankingDisplay[$user_id]=array_reverse($rankingDisplay[$user_id]);
+ }
+
+ return $rankingDisplay;
}
}
diff --git a/pfosten/resources/views/layouts/nav.blade.php b/pfosten/resources/views/layouts/nav.blade.php
index c5e58729..41fb3bc2 100644
--- a/pfosten/resources/views/layouts/nav.blade.php
+++ b/pfosten/resources/views/layouts/nav.blade.php
@@ -36,6 +36,7 @@
diff --git a/pfosten/resources/views/users/gshirt_ranking.blade.php b/pfosten/resources/views/users/gshirt_ranking.blade.php
index cc8883ec..b5b827bc 100644
--- a/pfosten/resources/views/users/gshirt_ranking.blade.php
+++ b/pfosten/resources/views/users/gshirt_ranking.blade.php
@@ -5,22 +5,8 @@
-
Geldrangliste
-
-
- | Name |
- Ausschüttung |
-
+ Grünes Trikot
- @foreach($sortedPayout as $payout)
-
- | {{ $payout['name'] }} |
-
- {{ $payout['amount'] }} € |
-
-
- @endforeach
-