Rangliste almost done

2017-06-26 17:21:30 +02:00 · 2017-06-26 17:21:30 +02:00 · 43fd8c8cbf
commit 43fd8c8cbf
parent 12651fc2e8
579 changed files with 172489 additions and 127 deletions
--- a/pfosten/resources/views/games/edit.blade.php
+++ b/pfosten/resources/views/games/edit.blade.php
@ -12,23 +12,29 @@
                    <div style="float:left; width:150px">
                        <input type="text" class="form-control" id="team1"  name="team1" value="{{ $game->team1 }}" required>
                    </div>
+
                    <div style="float:left; width:150px">
                        <input type="text" class="form-control" id="team2"  name="team2" value="{{ $game->team2 }}" required>
                    </div>
                    <div  style="float:left; width:25px">&nbsp;&nbsp;&nbsp;</div>
                    <div style="float:left; width:40px">
-                        <input type="text" class="form-control" id="score1"  name="score1" value="{{ $game->score1 }}" required>
+                        <input type="text" class="form-control" id="score1"  name="score1" value="{{ $game->score1==-1?'':$game->score1 }}" required>
                    </div>
                    <div  style="float:left; width:15px">&nbsp; : &nbsp;</div>
                    <div style="float:left; width:40px">
-                    <input type="text" class="form-control" id="score2"  name="score2" value="{{ $game->score2}}" required>
+                    <input type="text" class="form-control" id="score2"  name="score2" value="{{ $game->score2==-1?'':$game->score2 }}" required>
                    </div>
                    <div  style="float:left; width:25px">&nbsp;&nbsp;&nbsp;</div>
                    <!--<div style="float:left; width:175px">-->
-                    <div style="float:left; width:225px">
-                    <!-- <input type="datetime-local" class="form-control" id="kickoff"  name="kickoff" value="{{ $game->kickoff}}" required> -->
-                    <input type="text" class="has_datepicker" id="kickoff"  name="kickoff" value="{{ $game->kickoff }}" required>

+                    <div style="float:left; width:225px">
+                        <label class="lead">Anstoss:</label>
+                        <div class='input-group has_datetimepicker' id='datetimepicker2'>
+                            <input style="float:left;width:150px" type="text" class="form-control" id="kickoff"  name="kickoff" value="{{ $kickoff_german }}" required>
+                            <span class="input-group-addon" style="float:left;width:50px;">
+                                <span class="glyphicon glyphicon-calendar"></span>
+                            </span>
+                        </div>
                    </div>
                    <input type="hidden" name="id" value="{{ $game->id }}">
                </div>
--- a/pfosten/resources/views/layouts/footer.blade.php
+++ b/pfosten/resources/views/layouts/footer.blade.php
@ -8,12 +8,28 @@
    </div>

    <script src="/js/jquery-3.2.1.min.js"></script>
-    <script src="/js/bootstrap-datetimepicker.min.js"></script>

+    <!-- <script src="/js/bootstrap-datetimepicker.min.js"></script>-->
+    <!-- For Datetimepicker, 2nd try-->
+
+    <script type="text/javascript" src="/bower/moment/min/moment.min.js"></script>
+    <script type="text/javascript" src="/bower/moment/locale/de.js"></script>
+    <script type="text/javascript" src="/bower/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+    <link rel="stylesheet" href="/bower/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css" />
+
+    <script type="text/javascript">
+        $(".has_datetimepicker").datetimepicker({
+            locale: 'de',
+            defaultDate: new Date(  )
+        });
+    </script>


    <script type="text/javascript">
-        $(".has_datepicker").datetimepicker({format: 'yyyy-mm-dd hh:ii'});
+        $(".has_datepicker").datetimepicker({
+            locale: 'de',
+            format: 'L'
+        });
    </script>

 </footer>
--- a/pfosten/resources/views/layouts/layout.blade.php
+++ b/pfosten/resources/views/layouts/layout.blade.php
@ -8,17 +8,17 @@
        <link rel="icon" href="../../favicon.ico">
        <title>Hoschis Vollpfosten</title>
        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-        <link rel="stylesheet" href="/css/bootstrap-datetimepicker.min.css">

        <!-- Custom styles for this template -->
        <link href="/css/album.css" rel="stylesheet">
+
    </head>

    <body>

        @include('layouts.nav')

-        <div class="container" width:800px">
+        <div class="container" style="width:100%;">
            @yield('content')
        </div>

--- a/pfosten/resources/views/layouts/nav.blade.php
+++ b/pfosten/resources/views/layouts/nav.blade.php
@ -1,15 +1,16 @@
 <div class="container">
-    <!-- <div class="navbar navbar-inverse bg-inverse blog-nav">-->
-    <div class="navbar blog-nav">
-        <div class="container d-flex justify-content-between">
+    <div class="navbar">
+        <div class="container text-center">
            @if (Auth::check())
-                <a class="lead" href="/seasons">Saison</a> &nbsp; &nbsp; &nbsp;
-                <a class="lead" href="/rounds">Runden</a> &nbsp; &nbsp; &nbsp;
-                <a class="lead" href="/users">Spieler</a> &nbsp; &nbsp; &nbsp;
+                @if (Auth::user()->admin)
+                    <a class="lead" href="/seasons">Saison</a> &nbsp; &nbsp; &nbsp;
+                    <a class="lead" href="/rounds">Runden</a> &nbsp; &nbsp; &nbsp;
+                    <a class="lead" href="/users">Spieler</a> &nbsp; &nbsp; &nbsp;
+                @endif
                <a class="lead" href="/tipps">Tipps</a> &nbsp; &nbsp; &nbsp;
-                <a class="lead" href="/users/ranking" >Rangliste</a> &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;
+                <a class="lead" href="/users/ranking/-1" >Rangliste</a> &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;

-                <label class="lead text ml-auto" >Spieler: {{ Auth::user()->name }}</label><a class="lead" href="/logout">(abmelden)</a>
+                <label class="lead text ml-auto" >Spieler: {{ Auth::user()->fullname }}</label><a class="lead" href="/logout">(abmelden)</a>
            @endif

        </div>
--- a/pfosten/resources/views/main.blade.php
+++ b/pfosten/resources/views/main.blade.php
@ -22,6 +22,10 @@

        <p>&nbsp;</p>
        <p>&nbsp;</p>
+
+
+
+
        <p>&nbsp;</p>
        <p>&nbsp;</p>

--- a/pfosten/resources/views/registration/create.blade.php
+++ b/pfosten/resources/views/registration/create.blade.php
@ -8,9 +8,13 @@
        <form method="POST" action="/register">
            {{ csrf_field() }}
            <div class="form-group">
-                <label for="name">Name:</label>
+                <label for="name">Kurzname(Login):</label>
                <input type="text" class="form-control" id="name"  name="name" required>
            </div>
+            <div class="form-group">
+                <label for="fullname">Spielername:</label>
+                <input type="text" class="form-control" id="fullname"  name="fullname" required>
+            </div>
            <div class="form-group">
                <label for="email">Email:</label>
                <input type="email" class="form-control" id="email"  name="email" required>
--- a/pfosten/resources/views/rounds/create.blade.php
+++ b/pfosten/resources/views/rounds/create.blade.php
@ -26,7 +26,15 @@
                        <input type="text" class="form-control"  id="game1_team2"  name="game1_team2" required>

                        <label for="game1_kickoff">Anstoss:</label>
-                        <input type="datetime-local" class="form-control"  id="game1_kickoff"  name="game1_kickoff" required>
+
+                        <div class='input-group has_datetimepicker' id='datetimepicker1'>
+                            <input style="float:left;width:150px" type="text" class="form-control" id="game1_kickoff"  name="game1_kickoff" required>
+                            <span class="input-group-addon" style="float:left;width:50px;">
+                                <span class="glyphicon glyphicon-calendar"></span>
+                            </span>
+                        </div>
+                    </span>
+

                    </span>
                    <p>&nbsp;</p>
@ -47,7 +55,13 @@
                        <input type="text" class="form-control"  id="game2_team2"  name="game2_team2" required>

                        <label for="game2_kickoff">Anstoss:</label>
-                        <input type="datetime-local" class="form-control"  id="game2_kickoff"  name="game2_kickoff" required>
+
+                        <div class='input-group has_datetimepicker' id='datetimepicker2'>
+                            <input style="float:left;width:150px" type="text" class="form-control" id="game2_kickoff"  name="game2_kickoff" required>
+                            <span class="input-group-addon" style="float:left;width:50px;">
+                                <span class="glyphicon glyphicon-calendar"></span>
+                            </span>
+                        </div>
                    </span>
                    <p>&nbsp;</p>
                    <p>&nbsp;</p>
@ -67,7 +81,14 @@
                        <input type="text" class="form-control"  id="game3_team2_name"  name="game3_team2" required>

                        <label for="game3_kickoff">Anstoss:</label>
-                        <input type="datetime-local" class="form-control"  id="game3_kickoff"  name="game3_kickoff" required>
+
+                        <div class='input-group has_datetimepicker' id='datetimepicker2'>
+                            <input style="float:left;width:150px" type="text" class="form-control" id="game3_kickoff"  name="game3_kickoff" required>
+                            <span class="input-group-addon" style="float:left;width:50px;">
+                                <span class="glyphicon glyphicon-calendar"></span>
+                            </span>
+                        </div>
+
                    </span>
                    <p>&nbsp;</p>
                    <p>&nbsp;</p>
@ -87,7 +108,13 @@
                        <input type="text" class="form-control"  id="game4_team2"  name="game4_team2" required>

                        <label for="game4_kickoff">Anstoss:</label>
-                        <input type="datetime-local" class="form-control"  id="game4_kickoff"  name="game4_kickoff" required>
+
+                         <div class='input-group has_datetimepicker' id='datetimepicker2'>
+                            <input style="float:left;width:150px" type="text" class="form-control" id="game4_kickoff"  name="game4_kickoff" required>
+                            <span class="input-group-addon" style="float:left;width:50px;">
+                                <span class="glyphicon glyphicon-calendar"></span>
+                            </span>
+                        </div>
                    </span>
                    <p>&nbsp;</p>
                    <p>&nbsp;</p>
--- a/pfosten/resources/views/rounds/index.blade.php
+++ b/pfosten/resources/views/rounds/index.blade.php
@ -4,34 +4,44 @@
    <section class="jumbotron text-center">
        <div class="container">

-            @if ($activeSeason)
-                    <label>Saison:{{ $activeSeason->name }}</label>
-            @endif
+
+            <label>Saison:{{ $activeSeason->name }}</label>
+
+
+
+

            <div class="lead">Runden</div>
            <div><a href="/rounds/create" class="btn btn-primary">Runde hinzufügen</a></div>
                <p>&nbsp;</p>

-            @if ($activeSeason)
                <div>
                    @foreach($rounds->reverse() as $round)
                        <div><a class="text lead" href="/rounds/editname/{{ $round->id }}">{{ $round->name }} </a></div>
+
+                        <table class="table-bordered">
+                            <tr class="table-bordered">
+                                <td class="table-bordered">Spiel</td>
+                                <td class="table-bordered">Ergebnis</td>
+                            </tr>
+                            <p>&nbsp;</p>
+
                        @foreach($round->games as $game)
-                            <div><a class="text" href="/games/edit/{{ $game->id }}">{{ $game->team1 }} : {{ $game->team2 }} [ Anstoss {{ $game->kickoff }} ] </a></div>
+                            <tr class="table-bordered">
+                                <td>{{$game->team1 . " : " . $game->team2}}</td>
+                                <td><a href="/games/edit/{{$game->id}}">{{ App\Game::resultString($game->id) }}  </a></td>
+                            </tr>
                        @endforeach
+
+                        </table>
                        <p>&nbsp;</p>
                    @endforeach

                </div>
-            @endif
-
-
-
-


        </div>


    </section>
-@endsection
+@endsection
--- a/pfosten/resources/views/seasons/index.blade.php
+++ b/pfosten/resources/views/seasons/index.blade.php
@ -4,14 +4,14 @@
    <section class="jumbotron text-center">
        <div class="container">
            @if ($activeSeason)
-                <div class="lead">Saison: {{ $activeSeason->name }}</div>
+                <div class="lead">Aktive Saison: {{ $activeSeason->name }}</div>
            @endif

            @if ($activeSeason)
                <div>
                    <ul>
                        @foreach($seasons as $season)
-                            <li class="text list-unstyled">{{ $season->name }}</li>
+                            <li class="text list-unstyled" ><a href="/seasons/setcurrent/{{ $season->id }}">{{ $season->name }}</a></li>
                        @endforeach
                    </ul>
                </div>
--- a/pfosten/resources/views/sessions/create.blade.php
+++ b/pfosten/resources/views/sessions/create.blade.php
@ -8,7 +8,7 @@
            <form method="POST" action="/login">
                {{ csrf_field() }}
                <div class="form-group">
-                    <label for="name">Name:</label>
+                    <label for="name">Login:</label>
                    <input type="text" class="form-control" id="name"  name="name" required>
                </div>

--- a/pfosten/resources/views/tipps/edit.blade.php
+++ b/pfosten/resources/views/tipps/edit.blade.php
@ -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>
--- a/pfosten/resources/views/tipps/index.blade.php
+++ b/pfosten/resources/views/tipps/index.blade.php
@ -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>
--- a/pfosten/resources/views/users/edit.blade.php
+++ b/pfosten/resources/views/users/edit.blade.php
@ -14,15 +14,29 @@
            <div class="form-group">

                <div>
-                    <label style="float:left; width:150px" for="name">Name:</label>
+                    <label style="float:left; width:150px" for="name">Login:</label>
                    <input type="text" class="form-control" id="name"  name="name" value="{{ $user->name }}" required>
+                </div>
+                <div>
+                    <label style="float:left; width:150px" for="fullname">Spielername:</label>
+                    <input type="text" class="form-control" id="fullname"  name="fullname" value="{{ $user->fullname }}" required>
                </div>
                    <p>&nbsp;</p>
                <div>
                    <label style="float:left; width:150px" for="name">Zahlung für Saison:</label>
-                    <input style="width:150px" type="text" class="form-control has_datepicker" id="paid"  name="paid" value="{{ $paid_date_str }}" >
+
+                    <div class='input-group has_datepicker' id='datetimepicker1'>
+                        <input style="float:left;width:150px" type="text" class="form-control" id="paid"  name="paid" value="{{ $paid_date_str }}" >
+                        <span class="input-group-addon" style="float:left;width:50px;">
+                        <span class="glyphicon glyphicon-calendar"></span>
+                    </span>
+                    </div>
+                </div>
+
+

                </div>
+
                <p>&nbsp;</p>
                <div>
                    <label style="float:left; width:150px" for="name">Email:</label>
--- a/pfosten/resources/views/users/index.blade.php
+++ b/pfosten/resources/views/users/index.blade.php
@ -17,7 +17,7 @@
                    </tr>
                    @foreach($users as $user)
                        <tr>
-                            <td class="table-bordered">&nbsp;<a class="text list-unstyled" href="/users/edit/{{$user->id}}">{{ $user->name }}&nbsp;</a></td>
+                            <td class="table-bordered">&nbsp;<a class="text list-unstyled" href="/users/edit/{{$user->id}}">{{ $user->fullname }}&nbsp;</a></td>
                            <td class="table-bordered">{{ App\User::is_season_paid($user->id) }}</td>
                            <td class="table-bordered">&nbsp;{{ ($user->admin ? "Administrator":"Spieler") }}&nbsp;</td>
                        </tr>
--- a/pfosten/resources/views/users/no_payment.blade.php
+++ b/pfosten/resources/views/users/no_payment.blade.php
@ -0,0 +1,21 @@
+@extends('layouts.layout')
+
+@section('content')
+<section class="jumbotron text-center">
+    <div class="container">
+        <h1 class="jumbotron-heading"></h1>
+        <p class="lead text-muted" style="color:red;">Dein Zahlungseingang für die Saison wurde noch nicht registriert.</p>
+        <div><p></p><p></p><p></p></div>
+
+        <div>
+            <a href="/" class="btn btn-primary">Ok</a>
+        </div>
+        <div><p></p><p></p><p></p></div>
+    </div>
+
+    </div>
+
+
+</section>
+
+@endsection
--- a/pfosten/resources/views/users/ranking.blade.php
+++ b/pfosten/resources/views/users/ranking.blade.php
@ -1,26 +1,116 @@
@extends('layouts.layout')

@section('content')
-    <section class="jumbotron text-center">
-        <div class="container">

-            <div class="lead">Rangliste:</div>
+    <div style="float:left;left:10%">
+        <div>Runde1</div>
+        <div>Runde2</div>
+        <div>Runde3</div>
+        <div>Runde4</div>
+        <div>Runde5</div>
+        <div>Runde6</div>
+        <div>Runde7</div>
+        <div>Runde8</div>
+        <div>Runde9</div>
+        <div>Runde10</div>

+        <div>Runde11</div>
+        <div>Runde12</div>
+        <div>Runde13</div>
+        <div>Runde14</div>
+        <div>Runde15</div>
+        <div>Runde16</div>
+        <div>Runde17</div>
+        <div>Runde18</div>
+        <div>Runde19</div>
+        <div>Runde20</div>
+
+        <div>Runde21</div>
+        <div>Runde22</div>
+        <div>Runde23</div>
+        <div>Runde24</div>
+        <div>Runde25</div>
+        <div>Runde26</div>
+        <div>Runde27</div>
+        <div>Runde28</div>
+        <div>Runde29</div>
+        <div>Runde30</div>
+
+        <div>Runde31</div>
+        <div>Runde32</div>
+        <div>Runde33</div>
+        <div>Runde34</div>
+        <div>Runde35</div>
+        <div>Runde36</div>
+        <div>Runde37</div>
+        <div>Runde38</div>
+        <div>Runde39</div>
+        <div>Runde40</div>
+
+    </div>
+        <div style="float:left; position:relative;left:47%">
+            <div style="float:left; position:relative; left:-50%;">
+
+            <h3>Saison: {{ App\Season::getCurrent()->name }}</h3>
+            <h4>Runde: {{ $round->name }}</h4>
+                <h4>Rangliste und Tippübersicht</h4>
+                <table>
+                    <tr>
+                        <td style="width:50px;background-color:grey"></td>
+                        <td style="width:250px;">=richtige Tendenz</td>
+                    </tr>
+                    <tr>
+                        <td style="width:50px;background-color:orange"></td>
+                        <td style="width:250px;">=richtiges Ergebnis</td>
+                    </tr>
+                    <tr>
+                        <td style="width:50px;background-color:red"></td>
+                        <td style="width:250px;">=richtiges Ergebnis mit Joker</td>
+                    </tr>
+                </table>
            <p>&nbsp;</p>

-            <div>
+
                <table class="table-bordered">
                    <tr class="table-bordered">
-                        <td class="table-bordered">Name</td>
-                        <td class="table-bordered">&nbsp;Punkte&nbsp;</td>
-
+                        <td class="table-bordered" align="center" style="width:200px;">Name</td>
+                        <td class="table-bordered" align="center">&nbsp;Total&nbsp;</td>
+                        <td class="table-bordered" align="center">&nbsp;Tag&nbsp;</td>
+                        <td class="table-bordered" align="center" style="width:150px;">&nbsp;{{$games[0]->team1}}&nbsp;</td>
+                        <td class="table-bordered" align="center" style="width:150px;">&nbsp;{{$games[0]->team2}}&nbsp;</td>
+                        <td class="table-bordered" align="center">&nbsp;Joker&nbsp;</td>
+                        <td class="table-bordered" align="center" style="width:150px;">&nbsp;{{$games[1]->team1}}&nbsp;</td>
+                        <td class="table-bordered" align="center" style="width:150px;">&nbsp;{{$games[1]->team2}}&nbsp;</td>
+                        <td class="table-bordered" align="center">&nbsp;Joker&nbsp;</td>
+                        <td class="table-bordered" align="center" style="width:150px;">&nbsp;{{$games[2]->team1}}&nbsp;</td>
+                        <td class="table-bordered" align="center" style="width:150px;">&nbsp;{{$games[2]->team2}}&nbsp;</td>
+                        <td class="table-bordered" align="center">&nbsp;Joker&nbsp;</td>
+                        <td class="table-bordered" align="center" style="width:150px;">&nbsp;{{$games[3]->team1}}&nbsp;</td>
+                        <td class="table-bordered" align="center" style="width:150px;">&nbsp;{{$games[3]->team2}}&nbsp;</td>
+                        <td class="table-bordered" align="center">&nbsp;Joker&nbsp;</td>
                    </tr>
                    @foreach($users as $user)
-
+                        @if (App\User::is_season_paid($user->id)=="Ja")
                        <tr>
-                            <td class="table-bordered">&nbsp;<a class="text list-unstyled" href="/users/edit/{{$user->id}}">{{ $user->name }}&nbsp;</a></td>
-                            <td class="table-bordered">&nbsp;{{ App\User::getScore($user->id) }}&nbsp;</td>
+                            <td class="table-bordered">&nbsp;<a class="text list-unstyled" href="#" style="width:350px;">{{ $user->fullname }}&nbsp;</a></td>
+                            <td class="table-bordered" align="center">&nbsp;{{ $user->totalScore }}&nbsp;</td>
+
+                            <td class="table-bordered" align="center">&nbsp;{{ $user->dayScore }}&nbsp;</td>
+                            <td class="table-bordered" align="center" style="width:150px;{{App\Tipp::getCol($user->id,$games[0]->id)}}">&nbsp;{{ $tippDisplay[$user->id][$games[0]->id][0] }}&nbsp;</td>
+                            <td class="table-bordered" align="center" style="width:150px;{{App\Tipp::getCol($user->id,$games[0]->id)}}">&nbsp;{{ $tippDisplay[$user->id][$games[0]->id][1] }}&nbsp;</td>
+                            <td class="table-bordered"><img src="/img/joker.png" style="{{ ($tippDisplay[$user->id][$games[0]->id][2]==true ? 'float:left;width:32px;height:32px' : 'display: none;') }}"></td>
+                            <td class="table-bordered" align="center" style="width:150px;{{App\Tipp::getCol($user->id,$games[1]->id)}}">&nbsp;{{$tippDisplay[$user->id][$games[1]->id][0] }}&nbsp;</td>
+                            <td class="table-bordered" align="center" style="width:150px;{{App\Tipp::getCol($user->id,$games[1]->id)}}">&nbsp;{{$tippDisplay[$user->id][$games[1]->id][1] }}&nbsp;</td>
+                            <td class="table-bordered"><img src="/img/joker.png" style="{{ ($tippDisplay[$user->id][$games[1]->id][2]==true ? 'float:left;width:32px;height:32px' : 'display: none;') }}"></td>
+                            <td class="table-bordered" align="center" style="width:150px;{{App\Tipp::getCol($user->id,$games[2]->id)}}">&nbsp;{{$tippDisplay[$user->id][$games[2]->id][0] }}&nbsp;</td>
+                            <td class="table-bordered" align="center" style="width:150px;{{App\Tipp::getCol($user->id,$games[2]->id)}}">&nbsp;{{$tippDisplay[$user->id][$games[2]->id][1] }}&nbsp;</td>
+                            <td class="table-bordered"><img src="/img/joker.png" style="{{ ($tippDisplay[$user->id][$games[2]->id][2]==true ? 'float:left;width:32px;height:32px' : 'display: none;') }}"></td>
+                            <td class="table-bordered" align="center" style="width:150px;{{App\Tipp::getCol($user->id,$games[3]->id)}}">&nbsp;{{$tippDisplay[$user->id][$games[3]->id][0] }}&nbsp;</td>
+                            <td class="table-bordered" align="center" style="width:150px;{{App\Tipp::getCol($user->id,$games[3]->id)}}">&nbsp;{{$tippDisplay[$user->id][$games[3]->id][1] }}&nbsp;</td>
+                            <td class="table-bordered"><img src="/img/joker.png" style="{{ ($tippDisplay[$user->id][$games[3]->id][2]==true ? 'float:left;width:32px;height:32px' : 'display: none;') }}"></td>
+
                        </tr>
+                        @endif
                    @endforeach

                </table>
@ -32,7 +122,7 @@
        </div>


-    </section>
+
@endsection