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

Unification of quota index names

Browse source
This commit is contained in:
Torsten 2018-01-26 10:09:20 +01:00
parent 747b20049c
commit 85868e5599
5 changed files with 79 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

46
pfosten/app/Http/Controllers/SeasonsController.php
View file

@ -145,7 +145,7 @@ class SeasonsController extends Controller
'einsatz' => 'required',
'tagessieg' => 'required',
'pokal' => 'required',
'gruenes_trikot' => 'required',
'gshirt' => 'required',
'platzierung' => 'required',
'liga' => 'required',
'liga_platz1' => 'required',
@ -165,29 +165,29 @@ class SeasonsController extends Controller
// Create and save the season
Quota::setQuota('Runden', request('round_count'));
Quota::setQuota('Einsatz', request('einsatz'));
Quota::setQuota('Tagessieg', str_replace(",",".",request('tagessieg')));
Quota::setQuota('Gruenes Trikot', str_replace(",",".",request('gruenes_trikot')));
Quota::setQuota('Pokal', str_replace(",",".",request('pokal')));
Quota::setQuota('runden', request('round_count'));
Quota::setQuota('einsatz', request('einsatz'));
Quota::setQuota('tagessieg', str_replace(",",".",request('tagessieg')));
Quota::setQuota('gshirt', str_replace(",",".",request('gshirt')));
Quota::setQuota('pokal', str_replace(",",".",request('pokal')));
Quota::setQuota('Platzierung', str_replace(",",".",request('platzierung')));
Quota::setQuota('Platz 1', str_replace(",",".",request('platz1')));
Quota::setQuota('Platz 2', str_replace(",",".",request('platz2')));
Quota::setQuota('Platz 3', str_replace(",",".",request('platz3')));
Quota::setQuota('Platz 4', str_replace(",",".",request('platz4')));
Quota::setQuota('Platz 5', str_replace(",",".",request('platz5')));
Quota::setQuota('Platz 6', str_replace(",",".",request('platz6')));
Quota::setQuota('Platz 7', str_replace(",",".",request('platz7')));
Quota::setQuota('Platz 8', str_replace(",",".",request('platz8')));
Quota::setQuota('Platz 9', str_replace(",",".",request('platz9')));
Quota::setQuota('Platz 10', str_replace(",",".",request('platz10')));
Quota::setQuota('Liga-Wertung', str_replace(",",".",request('liga')));
Quota::setQuota('Liga Platz 1', str_replace(",",".",request('liga_platz1')));
Quota::setQuota('Liga Platz 2', str_replace(",",".",request('liga_platz2')));
Quota::setQuota('Liga Platz 3', str_replace(",",".",request('liga_platz3')));
Quota::setQuota('Liga Platz 2_1', str_replace(",",".",request('liga_platz2_1')));
Quota::setQuota('Liga Platz 3_1', str_replace(",",".",request('liga_platz3_1')));
Quota::setQuota('platzierung', str_replace(",",".",request('platzierung')));
Quota::setQuota('platz1', str_replace(",",".",request('platz1')));
Quota::setQuota('platz2', str_replace(",",".",request('platz2')));
Quota::setQuota('platz 3', str_replace(",",".",request('platz3')));
Quota::setQuota('platz 4', str_replace(",",".",request('platz4')));
Quota::setQuota('platz 5', str_replace(",",".",request('platz5')));
Quota::setQuota('platz 6', str_replace(",",".",request('platz6')));
Quota::setQuota('platz 7', str_replace(",",".",request('platz7')));
Quota::setQuota('platz 8', str_replace(",",".",request('platz8')));
Quota::setQuota('platz 9', str_replace(",",".",request('platz9')));
Quota::setQuota('platz 10', str_replace(",",".",request('platz10')));
Quota::setQuota('liga', str_replace(",",".",request('liga')));
Quota::setQuota('liga_platz1', str_replace(",",".",request('liga_platz1')));
Quota::setQuota('liga platz2', str_replace(",",".",request('liga_platz2')));
Quota::setQuota('liga platz3', str_replace(",",".",request('liga_platz3')));
Quota::setQuota('liga platz2_1', str_replace(",",".",request('liga_platz2_1')));
Quota::setQuota('liga platz3_1', str_replace(",",".",request('liga_platz3_1')));
// Redirect to the home page
return redirect('/seasons');

76
pfosten/app/Quota.php
View file

@ -23,53 +23,49 @@ class Quota extends Model
}
$active_user_count = sizeof(User::getActives());
$euro_pott = $active_user_count * $quotas["Einsatz"];
$euro_pott = $active_user_count * $quotas["einsatz"];
$euro_tagessieg_sum = intval ($euro_pott * ( $quotas["Tagessieg"] / 100 ) );
$euro_tagessieg_sum = intval ($euro_pott * ( $quotas["tagessieg"] / 100 ) );
$euro_tagessieg = Quota::get6Divisor( intval($euro_tagessieg_sum / $roundCount));
$euro_gruenes_trikot = intval($euro_pott * (($quotas["Gruenes Trikot"] / 100)));
$euro_gruenes_trikot = intval($euro_pott * (($quotas["gshirt"] / 100)));
$euro_gruenes_trikot = Quota::get6Divisor($euro_gruenes_trikot);
$euro_pokal= intval ($euro_pott * (($quotas["pokal"] / 100)));
$euro_pokal= Quota::get6Divisor($euro_pokal);
$euro_platzierung = intval ( $euro_pott * (($quotas["Platzierung"] / 100)));
$euro_platzierung = intval ( $euro_pott * (($quotas["platzierung"] / 100)));
$tagessieg_rest = $euro_tagessieg_sum - ($euro_tagessieg * $roundCount);
//Log::info("Tagessieg Rest=".$tagessieg_rest." €");
$euro_platzierung += $tagessieg_rest;
$euro_platz1 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 1"] / 100))));
$euro_platz1 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz1"] / 100))));
//Log::info("Platz 1=".$euro_platz1);
$euro_platz2 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 2"] / 100))));
$euro_platz3 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 3"] / 100))));
$euro_platz4 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 4"] / 100))));
$euro_platz5 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 5"] / 100))));
$euro_platz6 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 6"] / 100))));
$euro_platz7 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 7"] / 100))));
$euro_platz8 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 8"] / 100))));
$euro_platz9 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 9"] / 100))));
$euro_platz10= Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 10"] / 100))));
$euro_platz2 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz2"] / 100))));
$euro_platz3 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz3"] / 100))));
$euro_platz4 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz4"] / 100))));
$euro_platz5 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz5"] / 100))));
$euro_platz6 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz6"] / 100))));
$euro_platz7 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz7"] / 100))));
$euro_platz8 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz8"] / 100))));
$euro_platz9 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz9"] / 100))));
$euro_platz10= Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["platz10"] / 100))));
$euro_liga=intval($euro_pott *(($quotas["Liga-Wertung"] / 100)));
$euro_liga_platz1 = Quota::get6Divisor(intval($euro_liga*(($quotas["Liga Platz 1"] / 100))));
$euro_liga_platz2 = Quota::get6Divisor(intval($euro_liga*(($quotas["Liga Platz 2"] / 100))));
$euro_liga_platz3 = Quota::get6Divisor(intval($euro_liga*(($quotas["Liga Platz 3"] / 100))));
$euro_liga_platz2_1 = Quota::get6Divisor(intval($euro_liga*(($quotas["Liga Platz 2_1"] / 100))));
$euro_liga_platz3_1 = Quota::get6Divisor(intval($euro_liga*(($quotas["Liga Platz 3_1"] / 100))));
$euro_liga=intval($euro_pott *(($quotas["liga"] / 100)));
$euro_liga_platz1 = Quota::get6Divisor(intval($euro_liga*(($quotas["liga_platz1"] / 100))));
$euro_liga_platz2 = Quota::get6Divisor(intval($euro_liga*(($quotas["liga_platz2"] / 100))));
$euro_liga_platz3 = Quota::get6Divisor(intval($euro_liga*(($quotas["liga_platz3"] / 100))));
$euro_liga_platz2_1 = Quota::get6Divisor(intval($euro_liga*(($quotas["liga_platz2_1"] / 100))));
$euro_liga_platz3_1 = Quota::get6Divisor(intval($euro_liga*(($quotas["liga_platz3_1"] / 100))));
$finaler_rest = $euro_pott - ( $roundCount*$euro_tagessieg + $euro_gruenes_trikot + $euro_pokal + $euro_platz1
+ $euro_platz2 + $euro_platz3+ $euro_platz4 + $euro_platz5
+ $euro_platz6 + $euro_platz7 + $euro_platz8 + $euro_platz9 + $euro_platz10
+ $euro_liga_platz1 + $euro_liga_platz2 + $euro_liga_platz3 + $euro_liga_platz2_1
+ $euro_liga_platz3_1);
//dd("Euro-Pott: ".$euro_pott);
//dd("Gruenes Trikot: ".$euro_gruenes_trikot);
//dd("P");
//dd("Liga 2_1=".$euro_liga_platz2_1.", Liga 3_1=".$euro_liga_platz3_1.", Finaler Rest: ".$finaler_rest);
@ -93,7 +89,7 @@ class Quota extends Model
$payouts['liga_platz3'] = $euro_liga_platz3;
$payouts['liga_platz2_1'] = $euro_liga_platz2_1;
$payouts['liga_platz3_1'] = $euro_liga_platz3_1;
$payouts['gruenes_trikot'] = $euro_gruenes_trikot;
$payouts['gshirt'] = $euro_gruenes_trikot;
$payouts['pokal'] = $euro_pokal;
@ -160,32 +156,32 @@ class Quota extends Model
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Einsatz";
$quota->name = "einsatz";
$quota->prc = 40;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Tagessieg";
$quota->name = "tagessieg";
$quota->prc = 45;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platzierung";
$quota->name = "platzierung";
$quota->prc = 45;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Gruenes Trikot";
$quota->name = "gshirt";
$quota->prc = 10;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Liga-Wertung";
$quota->name = "liga";
$quota->prc = 20;
$quota->save();
@ -197,70 +193,70 @@ class Quota extends Model
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 1";
$quota->name = "platz1";
$quota->order = 1;
$quota->prc = 21;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 2";
$quota->name = "platz2";
$quota->order = 2;
$quota->prc = 17;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 3";
$quota->name = "platz3";
$quota->order = 3;
$quota->prc = 13;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 4";
$quota->name = "platz4";
$quota->order = 4;
$quota->prc = 10;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 5";
$quota->name = "platz5";
$quota->order = 5;
$quota->prc = 9;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 6";
$quota->name = "platz6";
$quota->order = 6;
$quota->prc = 8;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 7";
$quota->name = "platz7";
$quota->order = 7;
$quota->prc = 7;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 8";
$quota->name = "platz8";
$quota->order = 8;
$quota->prc = 6;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 9";
$quota->name = "platz9";
$quota->order = 9;
$quota->prc = 5;
$quota->save();
$quota = new Quota;
$quota->season_id = $season_id;
$quota->name = "Platz 10";
$quota->name = "platz10";
$quota->order = 10;
$quota->prc = 4;
$quota->save();

2
pfosten/app/Season.php
View file

@ -85,7 +85,7 @@ class Season extends Model
if (!$season) return false;
$seasonId=$season->id;
}
$quota=Quota::getQuota("Gruenes Trikot");
$quota=Quota::getQuota("gshirt");
return $quota>0;
}

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

@ -38,7 +38,7 @@
<div class="form-group" >
<h4>
<label style="float:left; width:200px;">Einsatz pro Spieler:</label>
<input type="text" class="form-control" id="einsatz" name="einsatz" value="{{ $quotas['Einsatz'] }}" style="float:left; width:75px;" required>
<input type="text" class="form-control" id="einsatz" name="einsatz" value="{{ $quotas['einsatz'] }}" style="float:left; width:75px;" required>
<label style="float:left;">&nbsp;€</label>
</h4>
</div>
@ -49,32 +49,32 @@
<div class="form-group" style="width:650px;">
<h4>
<label style="float:left; width:200px;">Tagessieg:</label>
<input type="text" class="form-control" id="tagessieg" name="tagessieg" value="{{ $quotas['Tagessieg'] }}" style="float:left; width:75px;" required>
<input type="text" class="form-control" id="tagessieg" name="tagessieg" value="{{ $quotas['tagessieg'] }}" style="float:left; width:75px;" required>
<label style="float:left;">&nbsp;% = {{$payouts['tagessieg']}} € </label>
<span>&nbsp;</span>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platzierung:</label>
<input type="text" class="form-control" id="platzierung" name="platzierung" value="{{ $quotas['Platzierung'] }}" style="float:left; width:75px;" required>
<input type="text" class="form-control" id="platzierung" name="platzierung" value="{{ $quotas['platzierung'] }}" style="float:left; width:75px;" required>
<label style="float:left;">&nbsp;% = {{$payouts['platz1']+$payouts['platz2']+$payouts['platz3']+$payouts['platz4']+$payouts['platz5']+$payouts['platz6']+$payouts['platz7']+$payouts['platz8']+$payouts['platz9']+$payouts['platz10'] }} € </label>
<span>&nbsp;</span>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Grünes Trikot:</label>
<input type="text" class="form-control" id="gruenes_trikot" name="gruenes_trikot" value="{{ $quotas['Gruenes Trikot'] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['gruenes_trikot']}} €</label>
<input type="text" class="form-control" id="gshirt" name="gshirt" value="{{ $quotas['gshirt'] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['gshirt']}} €</label>
<span>&nbsp;</span>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Pokal:</label>
<input type="text" class="form-control" id="pokal" name="pokal" value="{{ $quotas['Pokal'] }}" style="float:left; width:75px;" required>
<input type="text" class="form-control" id="pokal" name="pokal" value="{{ $quotas['pokal'] }}" style="float:left; width:75px;" required>
<label style="float:left;">&nbsp;% = {{ $payouts['pokal'] }} €</label>
<span class="dropdown" id="dropdown6">
<button id="btn_winner" onclick="toggleDropdown('dropdown_winner'); return false;" class="dropbtn">{{ $winnerNames['pokal'] }}</button>
<div id="dropdown_winner" class="dropdown-content" style="width:250px;">
@foreach($users as $user)
<a onclick=" setWinner('{{$user->id}}','Pokal');return false;" style="width:250px";>{{$user->name}}</a>
<a onclick=" setWinner('{{$user->id}}','pokal');return false;" style="width:250px";>{{$user->name}}</a>
@endforeach
</div>
</span>
@ -82,7 +82,7 @@
<p>&nbsp;</p>
<label style="float:left; width:200px;">Liga:</label>
<input type="text" class="form-control" id="liga" name="liga" value="{{ $quotas['Liga-Wertung'] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="liga" name="liga" value="{{ $quotas['liga'] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{ $payouts['liga_platz1']+$payouts['liga_platz2']+$payouts['liga_platz3']+$payouts['liga_platz2_1']+$payouts['liga_platz3_1'] }} €</label>
<p>&nbsp;</p>
@ -97,53 +97,53 @@
<div class="form-group" style="width:650px;" >
<h4>
<label style="float:left; width:200px;">Platz 1:</label>
<input type="text" class="form-control" id="platz1" name="platz1" value="{{ $quotas["Platz 1"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz1" name="platz1" value="{{ $quotas["platz1"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz1']}} €</label>
<!-- <label>Test</label>-->
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platz 2:</label>
<input type="text" class="form-control" id="platz2" name="platz2" value="{{ $quotas["Platz 2"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz2" name="platz2" value="{{ $quotas["platz2"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz2']}} €</label>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platz 3:</label>
<input type="text" class="form-control" id="platz3" name="platz3" value="{{ $quotas["Platz 3"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz3" name="platz3" value="{{ $quotas["platz3"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz3']}} €</label>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platz 4:</label>
<input type="text" class="form-control" id="platz4" name="platz4" value="{{ $quotas["Platz 4"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz4" name="platz4" value="{{ $quotas["platz4"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz4']}} €</label>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platz 5:</label>
<input type="text" class="form-control" id="platz5" name="platz5" value="{{ $quotas["Platz 5"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz5" name="platz5" value="{{ $quotas["platz5"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz5']}} €</label>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platz 6:</label>
<input type="text" class="form-control" id="platz6" name="platz6" value="{{ $quotas["Platz 6"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz6" name="platz6" value="{{ $quotas["platz6"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz6']}} €</label>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platz 7:</label>
<input type="text" class="form-control" id="platz7" name="platz7" value="{{ $quotas["Platz 7"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz7" name="platz7" value="{{ $quotas["platz7"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz7']}} €</label>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platz 8:</label>
<input type="text" class="form-control" id="platz8" name="platz8" value="{{ $quotas["Platz 8"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz8" name="platz8" value="{{ $quotas["platz8"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz8']}} €</label>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platz 9:</label>
<input type="text" class="form-control" id="platz9" name="platz9" value="{{ $quotas["Platz 9"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz9" name="platz9" value="{{ $quotas["platz9"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz9']}} €</label>
<p>&nbsp;</p>
<label style="float:left; width:200px;">Platz 10:</label>
<input type="text" class="form-control" id="platz10" name="platz10" value="{{ $quotas["Platz 10"] }}" style="float:left; width:75px;"required>
<input type="text" class="form-control" id="platz10" name="platz10" value="{{ $quotas["platz10"] }}" style="float:left; width:75px;"required>
<label style="float:left;">&nbsp;% = {{$payouts['platz10']}} €</label>
<p>&nbsp;</p>

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

@ -23,7 +23,7 @@
</h4>
<h4>
<label style="float:left; width:200px;">Einsatz pro Spieler:</label>
<label style="float:left;">&nbsp;{{$quotas['Einsatz']}} €</label>
<label style="float:left;">&nbsp;{{$quotas['einsatz']}} €</label>
</h4>
</div>
<p>&nbsp;</p><p>&nbsp;</p>