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

gshirt index

Browse source
This commit is contained in:
Torsten 2017-12-29 10:10:04 +01:00
parent b41a8f4051
commit 16231357b4
7 changed files with 123 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -356,7 +356,7 @@ class UsersController extends Controller
$game_results=array(); // 4 Spielergebnisse der angezeigten Runde
array_push($game_results,$rankingDisplay[0]["result_score1"],$rankingDisplay[0]["result_score2"],$rankingDisplay[0]["result_score3"],$rankingDisplay[0]["result_score4"],$rankingDisplay[0]["result_score5"],$rankingDisplay[0]["result_score6"],$rankingDisplay[0]["result_score7"],$rankingDisplay[0]["result_score8"]);
Log::info("UserController::ranking: ExecutionTime: " . number_format(( microtime(true) - $startTime), 4) . " Seconds\n");
//Log::info("UserController::ranking: ExecutionTime: " . number_format(( microtime(true) - $startTime), 4) . " Seconds\n");
return view('users.ranking', compact('all_rounds','rankingDisplay','userids','round','games','game_results','isFinalRound'));
}
@ -381,6 +381,7 @@ class UsersController extends Controller
}
public function mailtest() {
// Works:
// $user = User::where('id','=',1)->first();
@ -538,6 +539,75 @@ class UsersController extends Controller
return view ('users.payout_ranking_index',compact('sortedPayout'));
}
public function money_ranking_with_iban() {
if (Auth::guest()) { return redirect("/"); }
$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'];
$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) { $payout=0; }
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;
$payout_ranking = $roundtipps[$key]['ranking_payout'];
$payoutTotal[$user_id]['amount'] += $payout_ranking;
}
}
$sortedPayout=array();
foreach($payoutTotal as $payout) {
$payment=array();
$payment['user_id']=$payout['user_id'];
$payment['name']=$payout['name'];
$payment['amount']=$payout['amount'];
$user=User::where('id','=',$payout['user_id'])->first();
$payment['iban']=$user->iban;
$payment['blz']=$user->blz;
$payment['bankname']=$user->bankname;
$payment['kontonr']=$user->kontonr;
array_push($sortedPayout,$payment);
}
usort($sortedPayout,array($this,'cmpPayment'));
$users=User::getActives();
return view ('users.payout_ranking_index_with_iban',compact('sortedPayout','users'));
}
public function cmpPayment($payment1, $payment2) {
return ($payment1['amount'] < $payment2['amount']);
}

8
pfosten/app/Round.php
View file

@ -174,7 +174,9 @@ class Round extends Model
public static function getTippSpielLink() // Mit Verweis auf den aktuellen Tipp
{
$firstTippableRoundId=Round::getFirstTippableRound()->id;
$firstTippableRound=Round::getFirstTippableRound();
if (!$firstTippableRound) return "";
$firstTippableRoundId=$firstTippableRound->id;
$tippSpielLink="http://hoschis-tippspiel.de/tipps#".$firstTippableRoundId;
return $tippSpielLink;
}
@ -210,9 +212,9 @@ class Round extends Model
if ($seasonId!=-1) { $season = Season::where('id','=',$seasonId)->first(); }
$rounds = Round::where('season_id','=',$season->id)->get();
Log::info("Number of rounds:".sizeof($rounds));
//Log::info("Number of rounds:".sizeof($rounds));
Log::info("START");
//Log::info("START");
$roundnames = array();
foreach($rounds as $round) {
$roundnames[$round->id] = $round->name;

2
pfosten/app/User.php
View file

@ -195,6 +195,8 @@ class User extends Authenticatable
$season=Season::getCurrent();
if (!$season) return array();
if ($seasonId != -1) { $season = Season::where('id','=',$seasonId)->first(); }
$seasonId = $season->id;

2
pfosten/resources/views/users/index.blade.php
View file

@ -5,7 +5,7 @@
<!-- <div class="container"> -->
<div class="lead col-md-8" >registrierte Spieler: {{ $total_user_count }} , davon bezahlt: {{$active_user_count}}</div>
<p>&nbsp;</p>
<p>&nbsp;<a href="/users/payout_with_iban">Kontoliste</a></p>
<div class="col-md-12">
<table class="table-bordered" >

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

@ -18,6 +18,11 @@
<td class="table-bordered col-md-4"> {{ $payout['amount'] }} € &nbsp; </td>
<td class="table-bordered col-md-2"> {{ $users[$payout['user_id']]['bankname'] }} &nbsp; </td>
<td class="table-bordered col-md-2"> {{ $users[$payout['user_id']]['iban'] }} &nbsp; </td>
<td class="table-bordered col-md-2"> {{ $users[$payout['user_id']]['blz'] }} &nbsp; </td>
<td class="table-bordered col-md-2"> {{ $users[$payout['user_id']]['kontonr'] }} &nbsp; </td>
</tr>
@endforeach
</table>

38
pfosten/resources/views/users/payout_ranking_index_with_iban.blade.php Normal file
View file

@ -0,0 +1,38 @@
@extends('layouts.layout')
@section('content')
<section class="jumbotron text-center container">
<div class="main-container">
<div class="fixer-container">
<div class="lead" >Konto &amp; Ausschüttungsübersicht </div>
<table class="table-bordered" >
<tr class="table-bordered">
<td class="table-bordered col-md-2">Name</td>
<td class="table-bordered col-md-2">&nbsp;Ausschüttung&nbsp;</td>
<td class="table-bordered col-md-2">&nbsp;Bankname&nbsp;</td>
<td class="table-bordered col-md-2">&nbsp;IBAN&nbsp;</td>
<td class="table-bordered col-md-2">&nbsp;BLZ&nbsp;</td>
<td class="table-bordered col-md-2">&nbsp;Kontonummer&nbsp;</td>
</tr>
@foreach($sortedPayout as $payout)
<tr>
<td class="table-bordered col-md-2" >&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 class="table-bordered col-md-2"> {{ $payout['amount'] }} € &nbsp; </td>
<td class="table-bordered col-md-2"> {{ $payout['bankname'] }} &nbsp; </td>
<td class="table-bordered col-md-2"> {{ $payout['iban'] }} &nbsp; </td>
<td class="table-bordered col-md-2"> {{ $payout['blz'] }} &nbsp; </td>
<td class="table-bordered col-md-2"> {{ $payout['kontonr'] }} &nbsp; </td>
</tr>
@endforeach
</table>
</div>
</div>
</section>
@endsection

1
pfosten/routes/web.php
View file

@ -47,6 +47,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_with_iban','UsersController@money_ranking_with_iban');
Route::get('/users/payout/{user_id}','UsersController@money_ranking_detail');
Route::get('/tipps','TippsController@index');