Rangliste almost done

pfosten/app/Http/Controllers/UsersController.php

@@ -6,15 +6,25 @@ use Illuminate\Http\Request;
 use App\User;
 use App\Season;
 use App\Payment;
+use App\Round;
+use App\Game;
+use App\Tipp;
 use DB;
+use Auth;
+use Log;
 
 class UsersController extends Controller
 {
     public function main() {
+
+
         return view('main');
     }
 
     public function index() {
+        if (Auth::guest()) { return redirect("/"); }
+        if (!Auth::user()->admin) { return redirect("/"); }
+
         $users = DB::table('users')->where('deleted',null)->get();
         return view('users.index', compact('users'));
     }
@@ -36,17 +46,25 @@ class UsersController extends Controller
 
 
     public function edit($user_id) {
+        if (Auth::guest()) { return redirect("/"); }
+        if (!Auth::user()->admin) { return redirect("/"); }
+
         $user = User::where('id',$user_id)->first();
         $season_id = Season::getCurrent()->id;
 
         $paid_date_str="";
         $val=User::payment_date($user_id, $season_id);
-        if ($val) { $paid_date_str=$val;}
+        Log::info("UserController:edit => payment_date=".$val);
+
+        if ($val) { $paid_date_str=User::toGermanDate($val);}
+        Log::info("German Date=".$paid_date_str);
 
         return view ('users.edit', compact('user','paid_date_str'));
     }
 
     public function store() {
+        if (Auth::guest()) { return redirect("/"); }
+
         $season_id = Season::getCurrent()->id;
 
 
@@ -55,14 +73,16 @@ class UsersController extends Controller
         $this->validate(request(), [
             'id'   => 'required',
             'name' => 'required',
+            'fullname' => 'required',
             'email'=> 'required'
         ]);
 
-        // Create and save the season
+
 
         $user=User::where('id', request('id'))->first();
 
         $user->name=request('name');
+        $user->fullname=request('fullname');
         $user->email=request('email');
 
         if (request()->has('admin')) {
@@ -72,6 +92,8 @@ class UsersController extends Controller
             $user->admin=false;
         }
 
+
+
         //
 
         $user->save();
@@ -84,10 +106,77 @@ class UsersController extends Controller
         return redirect('/users');
     }
 
-    public function ranking() {
+
+
+    public function ranking($round_id) {
+        $currentSeason=Season::getCurrent();
+        if (!$currentSeason) { return redirect("/"); }
+
+        if($round_id==-1) {
+            $round_id = Round::getLastCompleteRoundId();
+            //Log::info("Last complete round id=" . $round_id);
+            if ($round_id==-1) {return redirect("/");}
+        }
+
+        if (Auth::guest()) { return redirect("/"); }
+
+
+
+
         TippsController::createAllTips();
 
         $users = DB::table('users')->where('deleted',null)->get();
-        return view('users.ranking', compact('users'));
+
+        foreach($users as $user) {
+            $user->totalScore=0;
+            $user->dayScore=0;
+        }
+
+        $rounds=Round::where([['season_id','=',$currentSeason->id],['id','<=',$round_id]])->orderBy('id')->get();
+
+        foreach($rounds as $round) {
+            $games=Game::where('round_id','=',$round->id)->orderBy('id')->get();
+            $index=0;
+            foreach($games as $game) {
+                foreach($users as $user) {
+                    $tipp = Tipp::where('game_id','=',$game->id)->where('user_id','=',$user->id)->first();
+                    if ($tipp) {
+                        $score = Tipp::getScoreLocal($game->score1,$game->score2,$tipp->score1,$tipp->score2,$tipp->joker);
+                        $user->totalScore += $score;
+
+
+                        if ($game->round_id == $round_id) {
+                            $user->dayScore += $score;
+                        }
+
+                        //if ($user->id==3 && $score>0) { Log::info("Adding score=" . $score. "from game_id=".$game->id."(".$game->team1." - ".$game->team2.", ".$round->name.")  totalScore=".$user->totalScore.", dayScore=".$user->dayScore); }
+
+                        $tippDisplay[$user->id][$game->id][0] = $tipp->score1 ==-1 ? 'x' : $tipp->score1;
+                        $tippDisplay[$user->id][$game->id][1] = $tipp->score2 ==-1 ? 'x' : $tipp->score2;
+                        $tippDisplay[$user->id][$game->id][2] = $tipp->joker;
+                    }
+
+                }
+                $index+=1;
+            }
+        }
+
+        $arr=[];
+        foreach($users as $user) {
+            array_push($arr, $user);
+        }
+        usort($arr, array($this,"cmp"));
+        $users=$arr;
+
+        $round=Round::where('id','=',$round_id)->first();
+        $games=Game::where('round_id','=',$round->id)->get();
+
+        return view('users.ranking', compact('users','round','games','tippDisplay'));
+
     }
+
+    public function cmp($user1, $user2) {
+        return ($user1->totalScore < $user2->totalScore);
+    }
+
 }