minor updates

pfosten/app/Http/Controllers/RoundmailController.php

@@ -57,7 +57,7 @@ class RoundmailController extends Controller
 
         $user_id=Auth::user()->id;
 
-        $users = DB::table('users')->where('deleted',null)->orderBy('lastname')->get();
+        $users = DB::table('users')->orderBy('lastname')->get();
 
         $active_users=array();
         $activeMailList=array();
@@ -76,10 +76,13 @@ class RoundmailController extends Controller
 
         Log::info("Users to check for missing tipps:" . sizeof($users));
         foreach($users as $user) {
-            if (User::is_season_paid($user->id)) {
+            Log::info("Season paytest user_id=".$user->id);
+            if (User::is_season_paid($user->id)=="Ja") {
+                Log::info("Season is paid.");
                 array_push($active_users,$user);
                 array_push($activeMailList,$user->email);
             } else {
+                Log::info("Season is NOT paid.");
                 array_push($inactive_users, $user);
                 array_push($inactiveMailList,$user->email);
             }
@@ -87,17 +90,20 @@ class RoundmailController extends Controller
             //Log::info("user-id=".$user->id.", ".$user->name);
             //Log::info("Tipp: ".User::hasMissingTipp($user->id));
 
-            if (User::hasMissingTipp($user->id)) {
+            if (!$user->deleted) {
-            array_push($missingTippMailList,$user->email);
+                if (User::hasMissingTipp($user->id)) {
-        }
+                    array_push($missingTippMailList, $user->email);
+                }
 
-            if (User::hasMissingJoker($user->id) ) {
+                if (User::hasMissingJoker($user->id)) {
-                array_push($missingJokerMailList,$user->email);
+                    array_push($missingJokerMailList, $user->email);
+                }
+
+                if ($user->admin == true) {
+                    array_push($adminMailList, $user->email);
+                }
             }
 
-            if ($user->admin==true) {
-                array_push($adminMailList,$user->email);
-            }
         }
 
         Log::info("Size of missingMailist=".sizeof($missingTippMailList));
@@ -133,6 +139,9 @@ class RoundmailController extends Controller
             if ($sender) {$sender_name = $sender->name;}
         }
 
+
+        Log::info("!!! inactiveMailList content=". $inactiveMailList);
+
         Log::info($a->getEndMessage());
 
        return view('roundmails.show',compact('mail_id','activeMailList','inactiveMailList','missingTippMailList','missingJokerMailList','adminMailList','send_date','user_id','topic',  'mail_message', 'recipients', 'sender_name','viewmode','tippSpielLink'));

pfosten/app/leagues/League.php

@@ -315,7 +315,6 @@ class League extends Model
             $uid=$totalRanking[27][0];
             Log::info("Aufstieg in Liga 1: [".$uid."] ".$userNames[$uid]);
 
-
             $totalRanking[38][4]=3;
             $uid=$totalRanking[38][0];
             Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
@@ -370,10 +369,6 @@ class League extends Model
             usort($totalRanking, array('App\Leagues\League','cmpScore'));
         }
 
-
-
-
-
         // HACK TO BE REMOVED: SET POSITIONS MANUALLY 2018-08
 
         /*
@@ -391,13 +386,9 @@ class League extends Model
 
         // END OF HACK
 
-
-
-
 		Log::info($a->getEndMessage());
 		//error_log($a->getEndMessage());  
-		
+
-		
         return $totalRanking;
 
     }

pfosten/doc/swap_league_members.sql

@@ -0,0 +1,33 @@
+-- Liga Tausch user_id 74 <-> 81
+-- Liga Tausch user_id 97 <-> 46
+
+update leagues_members set user_id=1000 where league_id>28 and user_id=74;
+update leagues_members set user_id=74 where league_id>28 and user_id=81;
+update leagues_members set user_id=81 where league_id>28 and user_id=1000;
+
+update leagues_members set user_id=1000 where league_id>28 and user_id=97;
+update leagues_members set user_id=97 where league_id>28 and user_id=46;
+update leagues_members set user_id=46 where league_id>28 and user_id=1000;
+
+
+
+
+-- Match Tausch 74 <-> 81
+-- Match Tausch 97 <-> 46
+
+update leagues_matches set user1_id=1000 where league_id>28 and user1_id=74;
+update leagues_matches set user1_id=74 where league_id>28 and user1_id=81;
+update leagues_matches set user1_id=81 where league_id>28 and user1_id=1000;
+
+update leagues_matches set user2_id=1000 where league_id>28 and user2_id=74;
+update leagues_matches set user2_id=74 where league_id>28 and user2_id=81;
+update leagues_matches set user2_id=81 where league_id>28 and user2_id=1000;
+
+
+update leagues_matches set user1_id=1000 where league_id>28 and user1_id=97;
+update leagues_matches set user1_id=97 where league_id>28 and user1_id=46;
+update leagues_matches set user1_id=46 where league_id>28 and user1_id=1000;
+
+update leagues_matches set user2_id=1000 where league_id>28 and user2_id=97;
+update leagues_matches set user2_id=97 where league_id>28 and user2_id=46;
+update leagues_matches set user2_id=46 where league_id>28 and user2_id=1000;

pfosten/resources/views/roundmails/show.blade.php

@@ -46,7 +46,7 @@
             <div>
                 <button onClick="setAdminRecipient(); return false;">Alle Administatoren</button>&nbsp;
                 <button onClick="setActiveRecipient(); return false;">Alle aktiven Spieler</button>&nbsp;
-                <button onClick="setInactiveRecipient(); return false;">Alle inaktiven Spieler (keine Zahlung)</button>&nbsp;
+                <button onClick="setInactiveRecipient(); return false;">Alle inaktiven Spieler (unbezahlt oder gelöscht)</button>&nbsp;
                 <button onClick="setMissingTippRecipient(); return false;">Alle Spieler mit fehlenden Tipps</button>&nbsp;
                 <button onClick="setMissingJokerRecipient(); return false;">Alle Spieler mit fehlenden Jokern</button>&nbsp;
             <div>

pfosten/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php

@@ -48,7 +48,7 @@
         <div class="flex-center position-ref full-height">
             <div class="content">
                 <div class="title">
-                    Be right back.
+                    Das Tippspiel wird gerade gewartet.
                 </div>
             </div>
         </div>