Minor view and usability fixes, refactoring for Quota/Payout
This commit is contained in:
parent
76947b1df9
commit
b9e4fcca7f
12 changed files with 5736 additions and 139 deletions
|
|
@ -14,7 +14,7 @@
|
|||
@endif
|
||||
<a class="lead" href="/users/show_payouts">Quoten</a>
|
||||
<a class="lead" href="/tipps#{{\App\Round::getFirstTippableRound()->id}}">Tipps</a>
|
||||
<a class="lead" href="/users/ranking/-1" >Rangliste</a>
|
||||
<a class="lead" href="/users/ranking/roundid_-1#playerid_{{Auth::user()->id}}" >Rangliste</a>
|
||||
|
||||
<label class="lead text ml-auto" >Spieler: <a href="/users/useredit/{{ Auth::user()->id }}">{{ Auth::user()->name }}</a></label><a class="lead" href="/logout">(abmelden)</a>
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
<section class="jumbotron text-center">
|
||||
<div class="container">
|
||||
|
||||
<label>Saison:{{ $activeSeason->name }}</label>
|
||||
<label>{{ $activeSeason->name }}</label>
|
||||
|
||||
<div class="lead" style="font-size: 42px;">Runden</div>
|
||||
@if (sizeof($rounds)<$round_count)
|
||||
<div><a href="/rounds/create" class="btn btn-primary" >Runde hinzufügen</a></div>
|
||||
<p> </p>
|
||||
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
|
|
|
|||
|
|
@ -22,11 +22,21 @@
|
|||
|
||||
@if ($currentSeason)
|
||||
<div>
|
||||
<h3>Spiel-Einsatz</h3>
|
||||
|
||||
|
||||
|
||||
<form method="POST" action="/seasons/store_quota">
|
||||
{{ csrf_field() }}
|
||||
<h3>Anzahl Runden</h3>
|
||||
<div class="form-group" >
|
||||
<h4>
|
||||
<label style="float:left; width:200px;">Anzahl Runden:</label>
|
||||
<input type="text" class="form-control" id="round_count" name="round_count" value="{{ $quotas['Runden'] }}" style="float:left; width:50px;"required>
|
||||
|
||||
</h4>
|
||||
</div>
|
||||
<p> </p>
|
||||
<h3>Spiel-Einsatz</h3>
|
||||
|
||||
<div class="form-group" >
|
||||
<h4>
|
||||
|
|
@ -45,7 +55,7 @@
|
|||
<h4>
|
||||
<label style="float:left; width:200px;">Tagessieg:</label>
|
||||
<input type="text" class="form-control" id="tagessieg" name="tagessieg" value="{{ $quotas['Tagessieg'] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_tagessieg}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['tagessieg']}} € </label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platzierung:</label>
|
||||
|
|
@ -54,7 +64,12 @@
|
|||
|
||||
<label style="float:left; width:200px;">Grünes Trikot:</label>
|
||||
<input type="text" class="form-control" id="gruenes_trikot" name="gruenes_trikot" value="{{ $quotas['Gruenes Trikot'] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> %</label>
|
||||
<label style="float:left;"> % = {{$payouts['gruenes_trikot']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Pokal:</label>
|
||||
<input type="text" class="form-control" id="pokal" name="pokal" value="{{ $quotas['Pokal'] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{ $payouts['pokal'] }} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Liga:</label>
|
||||
|
|
@ -62,10 +77,6 @@
|
|||
<label style="float:left;"> %</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Pokal:</label>
|
||||
<input type="text" class="form-control" id="pokal" name="pokal" value="{{ $quotas['Pokal'] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> %</label>
|
||||
<p> </p>
|
||||
</h4>
|
||||
</div>
|
||||
<p> </p><p> </p>
|
||||
|
|
@ -78,53 +89,53 @@
|
|||
<h4>
|
||||
<label style="float:left; width:200px;">Platz 1:</label>
|
||||
<input type="text" class="form-control" id="platz1" name="platz1" value="{{ $quotas["Platz 1"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz1}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz1']}} €</label>
|
||||
<!-- <label>Test</label>-->
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 2:</label>
|
||||
<input type="text" class="form-control" id="platz2" name="platz2" value="{{ $quotas["Platz 2"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz2}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz2']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 3:</label>
|
||||
<input type="text" class="form-control" id="platz3" name="platz3" value="{{ $quotas["Platz 3"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz3}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz3']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 4:</label>
|
||||
<input type="text" class="form-control" id="platz4" name="platz4" value="{{ $quotas["Platz 4"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz4}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz4']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 5:</label>
|
||||
<input type="text" class="form-control" id="platz5" name="platz5" value="{{ $quotas["Platz 5"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz5}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz5']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 6:</label>
|
||||
<input type="text" class="form-control" id="platz6" name="platz6" value="{{ $quotas["Platz 6"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz6}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz6']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 7:</label>
|
||||
<input type="text" class="form-control" id="platz7" name="platz7" value="{{ $quotas["Platz 7"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz7}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz7']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 8:</label>
|
||||
<input type="text" class="form-control" id="platz8" name="platz8" value="{{ $quotas["Platz 8"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz8}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz8']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 9:</label>
|
||||
<input type="text" class="form-control" id="platz9" name="platz9" value="{{ $quotas["Platz 9"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz9}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz9']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 10:</label>
|
||||
<input type="text" class="form-control" id="platz10" name="platz10" value="{{ $quotas["Platz 10"] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> % = {{$euro_platz10}} €</label>
|
||||
<label style="float:left;"> % = {{$payouts['platz10']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
</h4>
|
||||
|
|
@ -134,17 +145,17 @@
|
|||
<h4>
|
||||
<label style="float:left; width:200px;">Platz 1:</label>
|
||||
<input type="text" class="form-control" id="liga_platz1" name="liga_platz1" value="{{ $quotas['Liga Platz 1'] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left"> %</label>
|
||||
<label style="float:left"> % = {{$payouts['liga_platz1']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 2:</label>
|
||||
<input type="text" class="form-control" id="liga_platz2" name="liga_platz2" value="{{ $quotas['Liga Platz 2'] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> %</label>
|
||||
<label style="float:left;"> % = {{$payouts['liga_platz2']}} €</label>
|
||||
<p> </p>
|
||||
|
||||
<label style="float:left; width:200px;">Platz 3:</label>
|
||||
<input type="text" class="form-control" id="liga_platz3" name="liga_platz3" value="{{ $quotas['Liga Platz 3'] }}" style="float:left; width:50px;"required>
|
||||
<label style="float:left;"> %</label>
|
||||
<label style="float:left;"> % = {{ $payouts['liga_platz3'] }} €</label>
|
||||
<p> </p>
|
||||
|
||||
</h4>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
@if ($r->id == $round->id)
|
||||
<label>{{$r->name}}</label>
|
||||
@else
|
||||
<a href="/users/ranking/{{$r->id}}">{{$r->name}}</a>
|
||||
<a href="/users/ranking/roundid_{{$r->id}}/playerid_{{Auth::user()->id}}">{{$r->name}}</a>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -146,15 +146,12 @@
|
|||
</div>
|
||||
</th>
|
||||
|
||||
|
||||
|
||||
@foreach($rankingDisplay as $entry)
|
||||
|
||||
<tr>
|
||||
<td class="table-bordered"> <span class="text list-unstyled" href="#" > {{ $entry["rank"] }} </span></td>
|
||||
<td class="table-bordered" > <span class="text list-unstyled" href="#" > {{ $entry["rank"] }} </span></td>
|
||||
<!-- <td class="table-bordered" align="center"> $entry["dayScoreWithRankScore"] </td> -->
|
||||
<td class="table-bordered"><div style="margin: 0 auto; width: 32px;"><img src="/img/crown.png" style="{{ ($entry["is_dayscorewinner"] ? 'float:left;width:32px;height:32px' : 'display: none;') }}"></div></td>
|
||||
<td class="table-bordered"> <a class="text list-unstyled" href="#" style="vertical-align: middle;">{{ $entry["user_name"] }} </a></td>
|
||||
<td class="table-bordered"> <a class="text list-unstyled {{ $entry['user_id']==Auth::user()->id ? 'blink_text' : '' }}" name="playerid_{{$entry['user_id']}}" href="#" style="vertical-align: middle;">{{ $entry["user_name"] }} </a></td>
|
||||
<td class="table-bordered" align="center"> {{ $entry["totalRankScore"] }} </td>
|
||||
<td class="table-bordered" align="center"> {{ $entry["rankscore"] }} </td>
|
||||
<td class="table-bordered" align="center" style="border: 0px"> </td> <!-- Spacer column -->
|
||||
|
|
@ -173,7 +170,6 @@
|
|||
<td class="table-bordered" align="center" style="border: 0px"> </td> <!-- Spacer column -->
|
||||
<td class="table-bordered" align="center" > {{ $entry["payout"] }} {{ $entry["payout"]>0 ? '€': '' }}</td>
|
||||
</tr>
|
||||
|
||||
@endforeach
|
||||
|
||||
<!-- Spielergebnis als letzte Zeile -->
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<div class="form-group" >
|
||||
<h4>
|
||||
<label style="float:left; width:200px;">Einsatz pro Spieler:</label>
|
||||
<label style="float:left;"> {{$einsatz}} €</label>
|
||||
<label style="float:left;"> {{$quotas['Einsatz']}} €</label>
|
||||
</h4>
|
||||
</div>
|
||||
<p> </p><p> </p>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
<div class="form-group" >
|
||||
<h4>
|
||||
<label style="float:left; width:200px;">Tagessieg:</label>
|
||||
<label style="float:left;"> {{$payouts["Tagessieg"]}} €</label>
|
||||
<label style="float:left;"> {{$payouts["tagessieg"]}} €</label>
|
||||
<p> </p>
|
||||
|
||||
@if($payouts["gruenes_trikot"]>0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue