diff --git a/pfosten/app/Http/Controllers/SeasonsController.php b/pfosten/app/Http/Controllers/SeasonsController.php index 59973bbe..36a58e10 100644 --- a/pfosten/app/Http/Controllers/SeasonsController.php +++ b/pfosten/app/Http/Controllers/SeasonsController.php @@ -65,7 +65,7 @@ class SeasonsController extends Controller $nr=1; $roundcount=request('roundcount'); $seasonId = Season::getCurrent()->id; - $endOfYear = Carbon\Carbon::createFromDate(Carbon\Carbon::now()->year,12,31); + $endOfSeason = Carbon\Carbon::now()->addMonth(7); while($nr<=$roundcount) { $roundname="Runde ".$nr; @@ -82,7 +82,7 @@ class SeasonsController extends Controller 'team1' => "Mannschaft 1", 'team2' => "Mannschaft 2", //'kickoff' => User::toDBDate(request('game1_kickoff')) - 'kickoff' => $endOfYear + 'kickoff' => $endOfSeason ]); $game1->save(); @@ -90,7 +90,7 @@ class SeasonsController extends Controller 'round_id' => $round_id, 'team1' => "Mannschaft 3", 'team2' => "Mannschaft 4", - 'kickoff' => $endOfYear + 'kickoff' => $endOfSeason ]); $game2->save(); @@ -98,7 +98,7 @@ class SeasonsController extends Controller 'round_id' => $round_id, 'team1' => "Mannschaft 5", 'team2' => "Mannschaft 6", - 'kickoff' => $endOfYear + 'kickoff' => $endOfSeason ]); $game3->save(); @@ -106,7 +106,7 @@ class SeasonsController extends Controller 'round_id' => $round_id, 'team1' => "Mannschaft 7", 'team2' => "Mannschaft 8", - 'kickoff' => $endOfYear + 'kickoff' => $endOfSeason ]); $game4->save(); // Sign them in diff --git a/pfosten/resources/views/layouts/layout.blade.php b/pfosten/resources/views/layouts/layout.blade.php index 4bbbc274..f04482be 100644 --- a/pfosten/resources/views/layouts/layout.blade.php +++ b/pfosten/resources/views/layouts/layout.blade.php @@ -19,7 +19,7 @@ @include('layouts.nav') -
+
@yield('content')
diff --git a/pfosten/resources/views/users/gshirt_ranking.blade.php b/pfosten/resources/views/users/gshirt_ranking.blade.php index 6bee5d81..edc091fa 100644 --- a/pfosten/resources/views/users/gshirt_ranking.blade.php +++ b/pfosten/resources/views/users/gshirt_ranking.blade.php @@ -1,35 +1,37 @@ @extends('layouts.layout') @section('content') -
- +

Grünes Trikot

- - - - @foreach ($roundnames as $roundname) - - @endforeach - - @foreach ($rankingDisplay as $rounds) - - - @foreach($rounds as $round) -     - @endforeach - +
Spieler {{ $roundname }}
{{$rounds[0]['user_name']}} {{ $round['gshirt_totalscore']}}  ( +{{$round['gshirt_score']}} ) [{{$round['gshirt_foulcount']}} fouls]
+ + + @foreach ($roundnames as $roundname) + + @endforeach + + @foreach ($rankingDisplay as $rounds) + + + @foreach($rounds as $round) + @endforeach + + @endforeach +
+
+ Spieler +
+
+
+ {{ $roundname }} +
+
{{$rounds[0]['user_name']}} {{ $round['gshirt_totalscore']}}
( +{{$round['gshirt_score']}} )
[{{$round['gshirt_foulcount']}} fouls]
- - - +
+ @endsection \ No newline at end of file