torsten/tippspiel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor updates

Browse source
This commit is contained in:
Torsten 2019-06-23 09:18:36 +02:00
parent a2667bbc2f
commit 807cf49bc0
5 changed files with 55 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
pfosten/app/Http/Controllers/RoundmailController.php
View file

@ -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'));