From 807cf49bc0a5434cc4913bfd0b51874da105a936 Mon Sep 17 00:00:00 2001 From: Torsten Date: Sun, 23 Jun 2019 09:18:36 +0200 Subject: [PATCH] minor updates --- .../Http/Controllers/RoundmailController.php | 29 ++++++++++------ pfosten/app/leagues/League.php | 11 +------ pfosten/doc/swap_league_members.sql | 33 +++++++++++++++++++ .../resources/views/roundmails/show.blade.php | 2 +- .../Foundation/Exceptions/views/503.blade.php | 2 +- 5 files changed, 55 insertions(+), 22 deletions(-) diff --git a/pfosten/app/Http/Controllers/RoundmailController.php b/pfosten/app/Http/Controllers/RoundmailController.php index c4183141..55e3d341 100644 --- a/pfosten/app/Http/Controllers/RoundmailController.php +++ b/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)) { - array_push($missingTippMailList,$user->email); - } + if (!$user->deleted) { + if (User::hasMissingTipp($user->id)) { + array_push($missingTippMailList, $user->email); + } - if (User::hasMissingJoker($user->id) ) { - array_push($missingJokerMailList,$user->email); + if (User::hasMissingJoker($user->id)) { + 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')); diff --git a/pfosten/app/leagues/League.php b/pfosten/app/leagues/League.php index f6a51dfa..0328fe16 100644 --- a/pfosten/app/leagues/League.php +++ b/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; } diff --git a/pfosten/doc/swap_league_members.sql b/pfosten/doc/swap_league_members.sql index e69de29b..0ed9fbc5 100644 --- a/pfosten/doc/swap_league_members.sql +++ b/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; \ No newline at end of file diff --git a/pfosten/resources/views/roundmails/show.blade.php b/pfosten/resources/views/roundmails/show.blade.php index 9a60b605..e6094010 100644 --- a/pfosten/resources/views/roundmails/show.blade.php +++ b/pfosten/resources/views/roundmails/show.blade.php @@ -46,7 +46,7 @@
    -   +      
diff --git a/pfosten/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php b/pfosten/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php index 14098cbc..756f745c 100644 --- a/pfosten/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php +++ b/pfosten/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php @@ -48,7 +48,7 @@
- Be right back. + Das Tippspiel wird gerade gewartet.