Rangliste almost done

This commit is contained in:
Torsten 2017-06-26 17:21:30 +02:00
parent 12651fc2e8
commit 43fd8c8cbf
579 changed files with 172489 additions and 127 deletions

View file

@ -13,12 +13,21 @@
{{ csrf_field() }}
<div class="form-group">
<input style="float:left; width:50px;" type="text" class="lead" id="name" name="score1" value="{{ $tipp->score1 }}" required>
<input style="float:left; width:50px;" type="text" class="lead" id="name" name="score1" value="{{ $tipp->score1==-1? '': $tipp->score1 }}" required>
<p style="float:left; width:25px;">&nbsp; : &nbsp;</p>
<input style="float:left; width:50px;" type="text" class="lead" id="name" name="score2" value="{{ $tipp->score2 }}" required>
<input style="float:left; width:50px;" type="text" class="lead" id="name" name="score2" value="{{ $tipp->score2==-1? '': $tipp->score2 }}" required>
<label class="lead">Joker: &nbsp;</label>
{{ Form::checkbox('joker', 'yes', $tipp->joker ) }} <!-- name, value, checked -->
<label class="lead" style="float:left; width:50px;">Joker: &nbsp;</label>
<div style="float:left;width:300px;">
@if (App\Round::hasLockedGame($game->round_id))
{{ Form::checkbox('joker', 'yes', $tipp->joker, array('disabled') ) }} <!-- name, value, checked -->
<label style="float:left;width:500px;color:red;">Joker kann nicht verändert werden, weil die Runde bereits begonnen hat</label>
@else
{{ Form::checkbox('joker', 'yes', $tipp->joker) }} <!-- name, value, checked -->
@endif
</div>
<input type="hidden" name="id" value="{{ $tipp->id }}">
<input type="hidden" name="round_id" value="{{ $game->round_id }}">
</div>

View file

@ -5,30 +5,57 @@
<div class="container" style="float:left; width:800px">
@if ($activeSeason)
<label>Saison:{{ $activeSeason->name }}</label>
<label>Aktive Saison:{{ $activeSeason->name }}</label>
@endif
<p class="lead">Tipps</p>
@if ($activeSeason)
<div>
@foreach($rounds->reverse() as $round)
<div><label class="text lead">{{ $round->name }} </label></div>
@foreach($round->games as $game)
<img src="/img/joker.png" style="{{ (App\Tipp::getTipp($game->id, $user->id)->joker==true ? 'float:left;width:32px;height:32px' : 'display: none;') }}">
<table class="table-bordered">
<tr class="table-bordered">
<td class="table-bordered">Spiel</td>
<td class="table-bordered">Ergebnis</td>
<div style="width:600px"><label class="text" href="/games/edit/{{ $game->id }}">{{ $game->team1 }} : {{ $game->team2 }} [ Anstoss {{ $game->kickoff }} ] </label>
<a href="/tipps/edit/{{App\Tipp::getTipp($game->id,$user->id)->id}}">{{ App\Tipp::getTipp($game->id, $user->id)->score1 }} : {{ App\Tipp::getTipp($game->id, $user->id)->score2 }}</a>
</div>
<td class="table-bordered">Tipp</td>
<td class="table-bordered">&nbsp;Joker&nbsp;</td>
<td class="table-bordered">Punkte</td>
</tr>
<label style="float:left;width=30px;">{{ App\Tipp::getScore($game->id,$user->id) }}</label>
<p>&nbsp;</p>
@endforeach
@foreach($round->games as $game)
<tr class="table-bordered">
<td class="table-bordered" style="width:600px;"><label class="text" href="/games/edit/{{ $game->id }}">{{ $game->team1 }} : {{ $game->team2 }}</label>&nbsp;</td>
<td class="table-bordered" style="width:350px;">{{ App\Game::has_result($game->id)==true ? $game->score1 . ' : ' . $game->score2 : 'Anstoss: ' . $game->kickoff }}</td>
<td class="table-bordered" style="width:75px;">
@if(App\Round::hasLockedGame($game->id)==true)
<span>{{ App\Tipp::resultString(App\Tipp::getTipp( $user->id,$game->id)->id) }} </span>
@else
<a href="/tipps/edit/{{App\Tipp::getTipp($user->id,$game->id)->id}}">{{ App\Tipp::getTipp($user->id,$game->id)->score1== -1 ? 'Tippen': App\Tipp::resultString(App\Tipp::getTipp($user->id,$game->id)->id) }} </a>
@endif
</td>
<td class="table-bordered"><img src="/img/joker.png" style="{{ (App\Tipp::getTipp($user->id,$game->id)->joker==true ? 'float:left;width:32px;height:32px' : 'display: none;') }}"></td>
<td class="table-bordered">{{App\Tipp::getScore(App\Tipp::getTipp($user->id,$game->id)->id)}}</td>
</tr>
@endforeach
</table>
<p>&nbsp;</p>
@endforeach
</div>
@endif
</div>
</section>