From 21c527827027b04da29b7edf40351ab596efe718 Mon Sep 17 00:00:00 2001
From: Torsten <torsten.schneider@programmschmiede.de>
Date: Wed, 2 Jan 2019 16:59:19 +0100
Subject: [PATCH] Fix Spieleranzeige

---
 .../app/Http/Controllers/UsersController.php  |  6 +++-
 pfosten/app/Round.php                         |  2 --
 pfosten/app/User.php                          | 31 ++++++++++---------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/pfosten/app/Http/Controllers/UsersController.php b/pfosten/app/Http/Controllers/UsersController.php
index 789d6a65..a84c3eda 100755
--- a/pfosten/app/Http/Controllers/UsersController.php
+++ b/pfosten/app/Http/Controllers/UsersController.php
@@ -159,18 +159,22 @@ class UsersController extends Controller
             } else {
 
                 if (array_key_exists($user->id, $missingTipps["MISSING_TIPP"])) {
+                    Log::info("..adding missing tipp");
                     $users[$index]->missingTippText = "Tipps fehlen";
                     $users[$index]->tippStyling = "red";
                 } else {
+                    Log::info("..adding existing tipp");
                     $users[$index]->missingTippText = "Runde getippt";
                     $users[$index]->tippStyling = "green";
                 }
 
-
+                Log::info("UsersController.index: Joker Display Check for UserId=".$user->id);
                 if (array_key_exists($user->id, $missingTipps["MISSING_JOKER"])) {
+                    Log::info("UsersController.index: MISSING JOKER DETECTED -> ".$user->id);
                     $users[$index]->missingJokerText = "Joker fehlt";
                     $users[$index]->jokerStyling = "red";
                 } else {
+                    Log::info("UsersController.index:  JOKER EXISTS -> ".$user->id);
                     $users[$index]->missingJokerText = "Joker gesetzt";
                     $users[$index]->jokerStyling = "green";
                 }
diff --git a/pfosten/app/Round.php b/pfosten/app/Round.php
index 35439ec3..264f6bd4 100755
--- a/pfosten/app/Round.php
+++ b/pfosten/app/Round.php
@@ -148,8 +148,6 @@ class Round extends Model
             }
         }
 
-
-
         return null;
     }
 
diff --git a/pfosten/app/User.php b/pfosten/app/User.php
index 0fb8e6cb..6ee66d58 100644
--- a/pfosten/app/User.php
+++ b/pfosten/app/User.php
@@ -144,28 +144,35 @@ class User extends Authenticatable
     public static function getMissingTippsAndJokers($users) {
         $round = Round::getFirstTippableRound();
 
+
+
         if (!$round) {
+
+            Log::info("User::getMissingTippsandJokers(users) => no tippable round exists");
+
             $result=array();
             $result["MISSING_TIPP"]=array();
             $result["MISSING_JOKER"]=array();
             return $result;
         }
 
+        Log::info("User::getMissingTippsandJokers(users) => first tippable round= [".$round->id."] ".$round->name);
+
         $tippClock=new TimeLogger("User::getMissingTippsAndJokers()");
         Log::info($tippClock->getStartMessage());
         // expecting collection of user db objects like: $users = DB::table('users')->where('deleted',null)->orderBy('lastname')->get();
-        $idlist = array();
+
         $usersWithoutJoker=array();
         foreach($users as $key => $user) {
-            array_push($idlist,$key);
-            array_push($usersWithoutJoker,$key);
+            //array_push($usersWithoutJoker,$user->id);
+            $usersWithoutJoker[$user->id]="";
         }
 
         $games = Game::where('round_id','=',$round->id)->get();
         $gameIds=array();
-        foreach ($games as $key => $game) {
-            array_push($gameIds,$key);
-            Log::info("GAME_ID:".$key);
+        foreach ($games as $key => $game) { // Vorsicht: $key ist nur der Array index, nicht die game id
+            array_push($gameIds,$game->id);
+            Log::info("GAME_ID:".$game->id);
         }
 
         $tipps = Tipp::whereIn('game_id', $gameIds)->get();
@@ -175,26 +182,22 @@ class User extends Authenticatable
         foreach($tipps as $tipp) {
             if ($tipp->score1 == -1 || $tipp->score2 == -1) {
                 $usersWithoutTipps[$tipp->user_id]="no_tipp";
-                Log::info("UserId ".$tipp->user_id." is missing a tipp!");
+                //Log::info("UserId ".$tipp->user_id." is missing a tipp!");
             }
             if ($tipp->joker == true) {
-                Log::info("Removing from jokerlist: ".$tipp->user_id);
+                Log::info("Removing from usersWithoutJokerlist: ".$tipp->user_id);
                 unset($usersWithoutJoker[$tipp->user_id]);
             }
         }
 
-        foreach ($usersWithoutJoker as $id) {
-            Log::info("Jokerless:".$id);
+        foreach ($usersWithoutJoker as $key => $id) {
+            Log::info("Jokerless:".$key);
         }
 
         $result=array();
         $result["MISSING_TIPP"]=$usersWithoutTipps;
         $result["MISSING_JOKER"]=$usersWithoutJoker;
 
-        Log::info("USERLIST: ".implode(",",$idlist));
-        Log::info($tippClock->getEndMessage());
-
-
         foreach(array_keys($result) as $key => $value) {
             Log::info("Main key: ".$key.", value=".$value);
         }