diff --git a/pfosten/app/Http/Controllers/SeasonsController.php b/pfosten/app/Http/Controllers/SeasonsController.php index 202e1556..28b1c4af 100644 --- a/pfosten/app/Http/Controllers/SeasonsController.php +++ b/pfosten/app/Http/Controllers/SeasonsController.php @@ -33,6 +33,7 @@ class SeasonsController extends Controller } $winnerNames=array(); + /* $manualPayoutTypes=array('liga_platz1','liga_platz2','liga_platz3', 'liga_platz2_1', 'liga_platz3_1', 'pokal'); foreach($manualPayoutTypes as $payoutType) { $user = ManualPayout::getWinner($payoutType); @@ -40,6 +41,7 @@ class SeasonsController extends Controller if ($user) $name = $user->name; $winnerNames[$payoutType] = $name; } + */ return view('seasons.index', compact('seasons','currentSeason','active_user_count','quotas','payouts', 'users', 'winnerNames')); } @@ -135,6 +137,8 @@ class SeasonsController extends Controller public function store_quota() { if (Auth::guest()) { return redirect("/"); } if (!Auth::user()->admin) { return redirect("/"); } + Log::info("--store_quota--"); + Log::info(request()); $currentSeason=Season::getCurrent(); @@ -144,13 +148,7 @@ class SeasonsController extends Controller 'season_id' => 'required', 'einsatz' => 'required', 'tagessieg' => 'required', - 'pokal' => 'required', - 'gshirt' => 'required', 'platzierung' => 'required', - 'liga' => 'required', - 'liga_platz1' => 'required', - 'liga_platz2' => 'required', - 'liga_platz3' => 'required', 'platz1' => 'required', 'platz2' => 'required', 'platz3' => 'required', @@ -162,33 +160,24 @@ class SeasonsController extends Controller 'platz9' => 'required', 'platz10' => 'required' ]); - + Log::info("request validated"); // 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('gshirt', str_replace(",",".",request('gshirt'))); - Quota::setQuota('pokal', str_replace(",",".",request('pokal'))); - 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'))); - + Quota::setQuota('platz3', str_replace(",",".",request('platz3'))); + Quota::setQuota('platz4', str_replace(",",".",request('platz4'))); + Quota::setQuota('platz5', str_replace(",",".",request('platz5'))); + Quota::setQuota('platz6', str_replace(",",".",request('platz6'))); + Quota::setQuota('platz7', str_replace(",",".",request('platz7'))); + Quota::setQuota('platz8', str_replace(",",".",request('platz8'))); + Quota::setQuota('platz9', str_replace(",",".",request('platz9'))); + Quota::setQuota('platz10', str_replace(",",".",request('platz10'))); + // Redirect to the home page return redirect('/seasons'); } diff --git a/pfosten/resources/views/layouts/nav.blade.php b/pfosten/resources/views/layouts/nav.blade.php index a89e3a68..dbfec4b4 100644 --- a/pfosten/resources/views/layouts/nav.blade.php +++ b/pfosten/resources/views/layouts/nav.blade.php @@ -11,8 +11,7 @@ @@ -22,24 +21,12 @@   Rangliste   -     diff --git a/pfosten/resources/views/seasons/index.blade.php b/pfosten/resources/views/seasons/index.blade.php index 3884c973..74e46cd8 100644 --- a/pfosten/resources/views/seasons/index.blade.php +++ b/pfosten/resources/views/seasons/index.blade.php @@ -60,35 +60,8 @@  

 

- - - -   -

 

- - - - - - - - - - - - - -

 

- - - - -

 

+ @@ -153,120 +126,6 @@ -

Liga:

- @if($currentSeason) -
- Liga bearbeiten -
- @endif -
-

- - - - - - - - - - - - - - - -

 

- - - - - - - - - - - - - - -

 

- - - - - - - - - - - - - - -

 

- - - - - - - - - - - - - - - - - - -

 

- - - - - - - - - - - - - -

 

-

-
-

  - - - - diff --git a/pfosten/resources/views/users/ranking.blade.php b/pfosten/resources/views/users/ranking.blade.php index 29b0cdf1..56c740d9 100755 --- a/pfosten/resources/views/users/ranking.blade.php +++ b/pfosten/resources/views/users/ranking.blade.php @@ -60,12 +60,13 @@ Tagessieg +

Spieler @@ -158,29 +159,24 @@ Preisgeld Platzierung
- -
- Preisgeld grünes Trikot -
- - -
- Preisgeld Pokal -
- - -
- Preisgeld Playoff + + + + + + +
- @endif +@endif @foreach($rankingDisplay as $entry)   {{ $entry["rank"] }} 
- -     + + +  {{ $entry["user_name"] }}    {{ $entry["totalRankScore"] }}   {{ $entry["rankscore"] }}  @@ -201,9 +197,9 @@  {{ $entry["payout"] }} {{ $entry["payout"]>0 ? '€': '' }} @if($isFinalRound)  {{ $entry["ranking_payout"]>0 ? $entry["ranking_payout"].'€': '' }}   -  {{ $entry["gshirt_payout"]>0 ? $entry["gshirt_payout"].'€': '' }}   -  {{ $entry["pokal"]>0 ? $entry["pokal"].'€': '' }}   -  {{ $entry["playoff"]>0 ? $entry["playoff"].'€': '' }}   + + + @endif @endforeach