Updating repo for cross-computer work

pfosten/resources/views/tipps/index.blade.php

@@ -17,8 +17,13 @@
                 <div>
 
                     @foreach($rounds as $round)
+
                         <div><a class="text lead col-md-12" name="{{$round->id}}" style="font-size: 38px">{{ $round->name }} </a></div>
                         <div>Runde sperrt sich: {{$round->getLockTime()}}</div>
+                        <div>&nbsp;</div>
+                        <div>Bereits verwendete Joker: {{ App\Tipp::getJokerUsageString($user->id, $round->id) }}   </div>
+                        <div>Maximale Anzahl gleicher Joker: {{ $max_identical_jokertipps }}</div>
+                        <div>&nbsp;</div>
 
                         <span class="col-md-12">
 
@@ -37,6 +42,7 @@
                                     </tr>
 
                                     @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>
@@ -44,6 +50,9 @@
                                             <td class="table-bordered" style="width:350px;">{{ $game->hasResult() ? $game->score1 . ' : ' . $game->score2 : ' ' }}</td>
 
                                             <td class="table-bordered" style="width:75px;">
+
+                                                <!--  <p>tipp_id: { { App\Tipp::getTipp($user->id,$game->id)->id </p> } }  -->
+
                                                 @if(App\Round::hasLockedGame($round->id)==true)
                                                     <span>{{ App\Tipp::resultString(App\Tipp::getTipp( $user->id,$game->id)->id) }}  </span>
                                                 @else

pfosten/resources/views/tipps/joker_impossible.blade.php

@@ -0,0 +1,12 @@
+@extends('layouts.layout')
+
+@section('content')
+    <section class="jumbotron text-center">
+        <div class="container">
+
+                <h2>Ungültige Tippeingabe: Joker wurde zu oft verwendet.</h2>
+            <div><a href="/tipps" class="btn btn-primary">Zu den Tipps</a></div>
+        </div>
+
+    </section>
+@endsection

pfosten/resources/views/users/edit.blade.php

@@ -46,7 +46,10 @@
                     <input type="text" class="form-control" id="kontonr"  name="kontonr" value="{{ $user->kontonr }}" >
                 </div>
 
-
+                <div>
+                    <label style="float:left; width:150px" for="kontonr">Handynummer:</label>
+                    <input type="text" class="form-control" id="mobile"  name="mobile" value="{{ $user->mobile }}" >
+                </div>
 
 
                 <p>&nbsp;</p>

pfosten/resources/views/users/useredit.blade.php

@@ -43,7 +43,10 @@
                     <label style="float:left; width:150px" for="kontonr">Kontonummer:</label>
                     <input type="text" class="form-control" id="kontonr"  name="kontonr" value="{{ $user->kontonr }}" >
                 </div>
-
+                <div>
+                    <label style="float:left; width:150px" for="kontonr">Handynummer:</label>
+                    <input type="text" class="form-control" id="mobile"  name="mobile" value="{{ $user->mobile }}" >
+                </div>
 
 
                 <p>&nbsp;</p>