diff --git a/pfosten/app/Http/Controllers/SeasonsController.php b/pfosten/app/Http/Controllers/SeasonsController.php index 36a58e10..23b209f0 100644 --- a/pfosten/app/Http/Controllers/SeasonsController.php +++ b/pfosten/app/Http/Controllers/SeasonsController.php @@ -135,6 +135,7 @@ class SeasonsController extends Controller 'tagessieg' => 'required', 'pokal' => 'required', 'gruenes_trikot' => 'required', + 'cleague' => 'required', 'platzierung' => 'required', 'liga' => 'required', 'liga_platz1' => 'required', @@ -160,6 +161,7 @@ class SeasonsController extends Controller Quota::setQuota('Tagessieg', request('tagessieg')); Quota::setQuota('Gruenes Trikot', request('gruenes_trikot')); Quota::setQuota('Pokal', request('pokal')); + Quota::setQuota('Champions-League', request('cleague')); Quota::setQuota('Platzierung', request('platzierung')); Quota::setQuota('Platz 1', request('platz1')); Quota::setQuota('Platz 2', request('platz2')); @@ -175,6 +177,8 @@ class SeasonsController extends Controller Quota::setQuota('Liga Platz 1', request('liga_platz1')); Quota::setQuota('Liga Platz 2', request('liga_platz2')); Quota::setQuota('Liga Platz 3', request('liga_platz3')); + Quota::setQuota('Liga Platz 2_1', request('liga_platz2_1')); + Quota::setQuota('Liga Platz 3_1', request('liga_platz3_1')); // Redirect to the home page return redirect('/seasons'); diff --git a/pfosten/app/Quota.php b/pfosten/app/Quota.php index 5516d7a7..de2d8078 100644 --- a/pfosten/app/Quota.php +++ b/pfosten/app/Quota.php @@ -31,6 +31,7 @@ class Quota extends Model $euro_gruenes_trikot = intval($euro_pott * (($quotas["Gruenes Trikot"] / 100))); $euro_gruenes_trikot = Quota::get6Divisor($euro_gruenes_trikot); $euro_pokal= intval ($euro_pott * (($quotas["Pokal"] / 100))); + $euro_cleague = intval ($euro_pott * (($quotas["Champions-League"] / 100))); $euro_pokal= Quota::get6Divisor($euro_pokal); $euro_platzierung = intval ( $euro_pott * (($quotas["Platzierung"] / 100))); @@ -41,6 +42,7 @@ class Quota extends Model $euro_platz1 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 1"] / 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)))); @@ -55,11 +57,20 @@ class Quota extends Model $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)))); $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_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); + + $euro_platz1 = $euro_platz1 + $finaler_rest; //Log::info("PLatz 1 mit Rest(".$finaler_rest.") = ".$euro_platz1); @@ -79,9 +90,13 @@ class Quota extends Model $payouts['liga_platz1'] = $euro_liga_platz1; $payouts['liga_platz2'] = $euro_liga_platz2; $payouts['liga_platz3'] = $euro_liga_platz3; + $payouts['liga_platz2_1'] = $euro_liga_platz3; + $payouts['liga_platz3_1'] = $euro_liga_platz3; $payouts['gruenes_trikot'] = $euro_gruenes_trikot; + $payouts['Champions-League'] = $euro_cleague; $payouts['pokal'] = $euro_pokal; + return $payouts; } @@ -163,13 +178,19 @@ class Quota extends Model $quota = new Quota; $quota->season_id = $season_id; $quota->name = "Liga-Wertung"; - $quota->prc = 0; + $quota->prc = 20; $quota->save(); $quota = new Quota; $quota->season_id = $season_id; $quota->name = "Pokal"; - $quota->prc = 0; + $quota->prc = 15; + $quota->save(); + + $quota = new Quota; + $quota->season_id = $season_id; + $quota->name = "Champions-League"; + $quota->prc = 10; $quota->save(); /// ####################################### @@ -252,21 +273,35 @@ class Quota extends Model $quota->season_id = $season_id; $quota->name = "Liga Platz 1"; $quota->order = 10; - $quota->prc = 60; + $quota->prc = 50; $quota->save(); $quota = new Quota; $quota->season_id = $season_id; $quota->name = "Liga Platz 2"; $quota->order = 10; - $quota->prc = 25; + $quota->prc = 20; $quota->save(); $quota = new Quota; $quota->season_id = $season_id; $quota->name = "Liga Platz 3"; $quota->order = 10; - $quota->prc = 15; + $quota->prc = 17; + $quota->save(); + + $quota = new Quota; + $quota->season_id = $season_id; + $quota->name = "Liga Platz 2_1"; + $quota->order = 10; + $quota->prc = 8; + $quota->save(); + + $quota = new Quota; + $quota->season_id = $season_id; + $quota->name = "Liga Platz 3_1"; + $quota->order = 10; + $quota->prc = 5; $quota->save(); } diff --git a/pfosten/resources/views/seasons/index.blade.php b/pfosten/resources/views/seasons/index.blade.php index 95aab44f..17dde90f 100644 --- a/pfosten/resources/views/seasons/index.blade.php +++ b/pfosten/resources/views/seasons/index.blade.php @@ -57,7 +57,8 @@ - + + @@ -69,9 +70,14 @@
+ + + +
+ - +
@@ -145,21 +151,30 @@ @endif
- +
- +
+ + + +
+ + + + +