This commit is contained in:
Torsten 2017-08-01 13:35:34 +02:00
parent 09b75172d8
commit 64e4959884
9 changed files with 91 additions and 67 deletions

View file

@ -1,14 +1,15 @@
@extends('layouts.layout')
@section('content')
<div class="col-md-8">
<div>
<h1>Spieltipp:</h1>
<p>&nbsp;</p>
<div class="lead">{{ $game->team1 }} : {{ $game->team2 }}</div>
<div style="float:left;width:250px" class="lead">{{ $game->team1 }} : {{ $game->team2 }}</div>
<div style="float:left;width:150px" >
<div >
<form method="POST" action="/tipps/store">
{{ csrf_field() }}
<div class="form-group">
@ -17,24 +18,25 @@
<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==-1? '': $tipp->score2 }}" required>
<label class="lead" style="float:left; width:50px;">Joker: &nbsp;</label>
<div style="float:left;width:300px;">
<label class="lead" style="float:left; width:50px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Joker &nbsp;</label>
<span >
@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>
</span>
<input type="hidden" name="id" value="{{ $tipp->id }}">
<input type="hidden" name="round_id" value="{{ $game->round_id }}">
</div>
<div class="form-group">
<p>&nbsp;</p>
<button type="submit" class="btn btn-primary">Ok</button>
</div>
</form>

View file

@ -2,64 +2,73 @@
@section('content')
<section class="jumbotron text-center">
<div class="container" style="float:left; width:800px">
<div class="container">
@if ($activeSeason)
<label>Aktive Saison:{{ $activeSeason->name }}</label>
@endif
<p class="lead">Tipps</p>
<p class="lead" style="font-size: 32px;">Tipps</p>
<p>&nbsp;</p>
</div>
<span class="container-fluid col-md-12">
@if ($activeSeason)
<div>
@foreach($rounds->reverse() as $round)
<div><label class="text lead">{{ $round->name }} </label></div>
<table class="table-bordered">
<tr class="table-bordered">
<td class="table-bordered">Spiel</td>
<td class="table-bordered">Anstoss</td>
<td class="table-bordered">Ergebnis</td>
<td class="table-bordered">Tipp</td>
<td class="table-bordered">&nbsp;Joker&nbsp;</td>
<td class="table-bordered">Punkte</td>
</tr>
<span class="col-md-12">
@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:600px;"><label class="text" > {{ App\User::toGermanDate($game->kickoff) }}</label></td>
<span class="col-md-4"></span>
<td class="table-bordered" style="width:350px;">{{ $game->hasResult() ? $game->score1 . ' : ' . $game->score2 : ' Tippen ' }}</td>
<span class="col-md-5">
<table class="table-bordered">
<tr class="table-bordered">
<td class="table-bordered">Spiel</td>
<td class="table-bordered">Anstoss</td>
<td class="table-bordered">Ergebnis</td>
<td class="table-bordered" style="width:75px;">
@if(App\Round::hasLockedGame($round->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 class="table-bordered">Tipp</td>
<td class="table-bordered">&nbsp;Joker&nbsp;</td>
<td class="table-bordered">Punkte</td>
</tr>
</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>
@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:600px;"><label class="text" > {{ App\User::toGermanDate($game->kickoff) }}</label></td>
<td class="table-bordered" style="width:350px;">{{ $game->hasResult() ? $game->score1 . ' : ' . $game->score2 : ' Tippen ' }}</td>
<td class="table-bordered" style="width:75px;">
@if(App\Round::hasLockedGame($round->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>
</span>
</span>
<p>&nbsp;</p>
@endforeach
</div>
@endif
</div>
</span>
</section>
@endsection