diff --git a/pfosten/app/Http/Controllers/UsersController.php b/pfosten/app/Http/Controllers/UsersController.php index f99e3444..879d43a3 100755 --- a/pfosten/app/Http/Controllers/UsersController.php +++ b/pfosten/app/Http/Controllers/UsersController.php @@ -573,4 +573,14 @@ class UsersController extends Controller return view ('users.payout_ranking_detail',compact('payouts','user')); } + + public function gshirt_ranking() { + if (Auth::guest()) { return redirect("/"); } + + + + + return view ('users.gshirt_ranking'); + } + } diff --git a/pfosten/app/Tipp.php b/pfosten/app/Tipp.php index e03f5376..13eeb780 100755 --- a/pfosten/app/Tipp.php +++ b/pfosten/app/Tipp.php @@ -692,4 +692,36 @@ class Tipp extends Model public static function cmpGShirt($rank1, $rank2) { return ($rank1[1] < $rank2[1]); //Feld0: user_id, Feld1: rank } + + //Used by gshirt_table: sort by gshirt_totalscore + public static function cmpGShirtTotal($ranktippEntry1, $ranktippEntry2) { + return ($ranktippEntry1['gshirt_totalscore'] < $ranktippEntry2['gshirt_totalscore']); //Feld0: user_id, Feld1: rank + } + + public static function gshirt_table() { + $rt = Tipp::getRoundTipps(); + $roundtipps = $rt['roundtipps']; + $round_ids = $rt['round_ids']; + $last_round_id = end($round_ids); + $users=User::getActives(); + + $lastroundentries=array(); + foreach ($users as $user) { + $key=$last_round_id."_".$user->id; + array_push($lastroundentries, $roundtipps[$key]); + } + usort($lastroundentries, array('App\Tipp', 'cmpGShirtTotal')); + + $displayRanking=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]); + } + } + // TO BE CONTINUED... + + } } diff --git a/pfosten/resources/views/users/gshirt_ranking.blade.php b/pfosten/resources/views/users/gshirt_ranking.blade.php new file mode 100644 index 00000000..cc8883ec --- /dev/null +++ b/pfosten/resources/views/users/gshirt_ranking.blade.php @@ -0,0 +1,28 @@ +@extends('layouts.layout') + +@section('content') +
+ +
+
+
Geldrangliste
+ + + + + + + @foreach($sortedPayout as $payout) + + + + + + + @endforeach +
Name Ausschüttung 
 {{ $payout['name'] }}  {{ $payout['amount'] }} €  
+
+
+ +
+@endsection \ No newline at end of file diff --git a/pfosten/routes/web.php b/pfosten/routes/web.php index d4ac9404..c5a577a6 100644 --- a/pfosten/routes/web.php +++ b/pfosten/routes/web.php @@ -40,6 +40,7 @@ Route::get('/users','UsersController@index'); Route::get('/users/edit/{user_id}','UsersController@edit'); Route::post('/users/store','UsersController@store'); Route::get('/users/ranking/roundid_{round_id}','UsersController@ranking'); +Route::get('/users/gshirt_ranking','UsersController@gshirt_ranking'); Route::get('/users/show_payouts','UsersController@show_payouts'); Route::get('/users/useredit/{user_id}','UsersController@useredit'); Route::post('/users/store_useredit','UsersController@storeUserEdit');