torsten/tippspiel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Geldrangliste

Browse source
This commit is contained in:
Torsten 2017-09-04 12:45:08 +02:00
parent 0b97ae656f
commit 27dd7d97f3
8 changed files with 8432 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8303
d0274241_2017-09-03_0835.sql Normal file
View file

File diff suppressed because it is too large Load diff

49
pfosten/app/Http/Controllers/UsersController.php
View file

@ -448,6 +448,8 @@ class UsersController extends Controller
return redirect("/users");
}
public function money_ranking() {
$currentSeason = Season::getCurrent();
@ -463,17 +465,19 @@ class UsersController extends Controller
$round_ids = $response['round_ids'];
$payoutTotal = array();
$cnt=0;
foreach($round_ids as $round_id) {
foreach($user_ids as $user_id) {
$key=$round_id."_".$user_id;
$payout = str_replace(",",".",$roundtipps[$key]['payout']);
if (strlen( $payout )>0) {
if (!in_array($user_id, $payoutTotal)) {
if ($user_id==68) { Log::info('round_id '.$round_id.", payout=".$payout);}
if (!array_key_exists($user_id, $payoutTotal)) {
$payoutTotal[$user_id]['amount']=0;
$payoutTotal[$user_id]['name']=$roundtipps[$key]['user_name'];
$payoutTotal[$user_id]['user_id']=$roundtipps[$key]['user_id'];
}
$payoutTotal[$user_id]['amount'] += $payout;
}
@ -489,7 +493,7 @@ class UsersController extends Controller
array_push($sortedPayout,$payment);
}
//usort($sortedPayout,'cmpPayment');
usort($sortedPayout,array($this,'cmpPayment'));
return view ('users.payout_ranking_index',compact('sortedPayout'));
}
@ -497,4 +501,41 @@ class UsersController extends Controller
public function cmpPayment($payment1, $payment2) {
return ($payment1['amount'] < $payment2['amount']);
}
public function money_ranking_detail($user_id) {
$currentSeason = Season::getCurrent();
// Payment made ?
if (! User::payment_date(Auth::user()->id, $currentSeason->id) && Auth::user()->name!="Torsten Schneider") {
return view('users.no_payment');
}
$response = Tipp::getRoundTipps();
$roundtipps = $response['roundtipps'];
//$roundData = $response['roundData'];
//$user_ids = $response['user_ids'];
$round_ids = $response['round_ids'];
$payouts = array();
$cnt=0;
foreach($round_ids as $round_id) {
$key=$round_id."_".$user_id;
$payout = $roundtipps[$key]['payout'];
if (strlen( $payout )>0) {
$round = Round::where('id','=',$round_id)->first();
$item=array();
$item['roundname']=$round->name . " (Tagessieg)";
$item['payout'] =$payout;
array_push($payouts,$item);
}
}
$user = User::where('id','=',$user_id)->first();
return view ('users.payout_ranking_detail',compact('payouts','user'));
}
}

30
pfosten/public/css/album.css
View file

@ -82,3 +82,33 @@ footer p {
@keyframes blinker {
50% { opacity: 0; }
}
.main-container {
float: left;
position: relative;
left: 50%;
}
.fixer-container {
float: left;
position: relative;
left: -50%;
}
/*
<div class="main-container">
<div class="fixer-container">
<ul class="list-of-floating-elements">
<li class="floated">Floated element</li>
<li class="floated">Floated element</li>
<li class="floated">Floated element</li>
</ul>
</div>
</div>
*/

2
pfosten/resources/views/layouts/nav.blade.php
View file

@ -13,7 +13,7 @@
<a class="lead" href="/roundmails">Rundmail</a> &nbsp; &nbsp; &nbsp;
@endif
<a class="lead" href="/users/show_payouts">Quoten</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/users/payout">Geldrangliste</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/users/payout#playerid_{{Auth::user()->id}}">Geldrangliste</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/tipps#{{\App\Round::getFirstTippableRound()->id}}">Tipps</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/users/ranking/roundid_-1#playerid_{{Auth::user()->id}}" >Rangliste</a> &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;

7
pfosten/resources/views/seasons/index.blade.php
View file

@ -160,10 +160,10 @@
</h4>
</div>
<p>&nbsp;</p><p>&nbsp;</p>
<p>&nbsp;
</div>
<p>&nbsp;</p><p>&nbsp;</p>
@ -184,8 +184,5 @@
</section>
@endsection

34
pfosten/resources/views/users/payout_ranking_detail.blade.php Normal file
View file

@ -0,0 +1,34 @@
@extends('layouts.layout')
@section('content')
<section class="jumbotron text-center container">
<div class="main-container">
<div class="fixer-container">
<div class="lead" >Ausschüttungsübersicht {{$user->name}} </div>
<table class="table-bordered" >
<tr class="table-bordered">
<td class="table-bordered col-md-4">Quoten-Titel</td>
<td class="table-bordered col-md-4">&nbsp;Ausschüttung&nbsp;</td>
</tr>
@foreach($payouts as $payout)
<tr>
<td class="table-bordered col-md-4" >&nbsp;{{$payout['roundname']}}<a class="text list-unstyled"> &nbsp;</a></td>
<td class="table-bordered col-md-4"> {{ $payout['payout'] }} € &nbsp; </td>
</tr>
@endforeach
</table>
</div>
</div>
</section>
<div class="main-container">
<div class="fixer-container">
<a href="/users/payout#playerid_{{Auth::user()->id}}" class="btn btn-primary">Zurück</a>
</div>
</div>
@endsection

21
pfosten/resources/views/users/payout_ranking_index.blade.php
View file

@ -3,30 +3,25 @@
@section('content')
<section class="jumbotron text-center container">
<div class="lead col-md-8" >Geldrangliste </div>
<p>&nbsp;</p>
<div class="col-md-12">
<div class="main-container">
<div class="fixer-container">
<div class="lead" >Geldrangliste </div>
<table class="table-bordered" >
<tr class="table-bordered">
<td class="table-bordered col-std-2">Name</td>
<td class="table-bordered col-std-2">&nbsp;Ausschüttung&nbsp;</td>
<td class="table-bordered col-md-4">Name</td>
<td class="table-bordered col-md-4">&nbsp;Ausschüttung&nbsp;</td>
</tr>
@foreach($sortedPayout as $payout)
<tr>
<td class="table-bordered col-md-4" >&nbsp;<a class="text list-unstyled" name="playerid_{{$payout['user_id']}}" href="#">{{ $payout['name'] }}&nbsp;</a></td>
<td class="table-bordered col-md-4" >&nbsp;<a class="text list-unstyled {{ $payout['user_id']==Auth::user()->id ? 'blink_text' : '' }}" name="playerid_{{$payout['user_id']}}" href="/users/payout/{{$payout['user_id'] }}">{{ $payout['name'] }}&nbsp;</a></td>
<td> {{ $payout['amount'] }} € &nbsp; </td>
<td class="table-bordered col-md-4"> {{ $payout['amount'] }} € &nbsp; </td>
</tr>
@endforeach
</table>
<p>&nbsp;</p>
</div>
</div>
</section>

1
pfosten/routes/web.php
View file

@ -50,6 +50,7 @@ Route::post('/users/store_useredit','UsersController@storeUserEdit');
Route::get('/users/no_payment');
Route::get('/users/delete/{user_id}','UsersController@delete');
Route::get('/users/payout','UsersController@money_ranking');
Route::get('/users/payout/{user_id}','UsersController@money_ranking_detail');
Route::get('/tipps','TippsController@index');
Route::get('/tipps/edit/{tipp_id}','TippsController@edit');