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

TimeLogger moved, League ranking also for not completed but started rounds

Browse source
This commit is contained in:
Torsten 2018-08-17 17:16:01 +02:00
parent 78a4a04cdf
commit 90c6d60ecd
26 changed files with 692 additions and 376 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pfosten/app/Http/Controllers/GamesController.php
View file

@ -9,7 +9,7 @@ use Carbon\Carbon;
use Auth;
use App\User;
use Log;
use App\MyClasses\TimeLogger;
class GamesController extends Controller
{
@ -23,8 +23,11 @@ class GamesController extends Controller
public function store() {
if (Auth::guest()) { return redirect("/login"); }
// Validate form
$a=new TimeLogger("GamesController::store");
Log::info($a->getStartMessage());
// Validate form
Log::info("Starting validation");
$this->validate(request(), [
'id' => 'required',
@ -60,6 +63,8 @@ class GamesController extends Controller
$game->kickoff=User::toDBDate(request('kickoff'));
$game->save();
Log::info($a->getEndMessage());
// Redirect to the Rounds Index
return redirect('/rounds#'.$game->round_id);
}

28
pfosten/app/Http/Controllers/Leagues/LeaguesController.php
View file

@ -20,9 +20,14 @@ use App\Leagues\Match;
use Log;
use DB;
use App\MyClasses\TimeLogger;
class LeaguesController extends Controller
{
public function index() {
$a=new TimeLogger("LeaguesController.index");
Log::info($a->getStartMessage());
$season=Season::getCurrent();
if (Auth::guest()) { return redirect("/"); }
@ -62,14 +67,18 @@ class LeaguesController extends Controller
//
Log::info($a->getEndMessage());
return view('leagues.index', compact('season','rounds','start_round_id','start_round_name','league_mode','round_count'));
}
public function createLeagues($start_round_id, $round_count) {
$a=new TimeLogger("LeaguesController::createLeagues()");
Log::info($a->getStartMessage());
$users=User::getActives();
if (sizeof($users)==0){
Log::info($a->getEndMessage());
return view("leagues.no_users");
}
@ -79,12 +88,16 @@ class LeaguesController extends Controller
Match::createMatchups();
Log::info($a->getEndMessage());
return redirect("/seasons");
}
public function showLeagueRounds() {
if (Auth::guest()) { return redirect("/"); }
$a=new TimeLogger("LeaguesController::showLeagueRounds()");
Log::info($a->getStartMessage());
$season=Season::getCurrent();
$roundNames = Round::getNames();
@ -106,18 +119,26 @@ class LeaguesController extends Controller
$matchesTotal[$match->round_id][$league->id] = $lg;
}
}
Log::info($a->getEndMessage());
return view ('leagues.matches', compact('season', 'matchesTotal','leagues','leagueNames','roundNames'));
}
public static function showLeagueRanking() {
$a=new TimeLogger("LeaguesController::showLeagueRanking()");
Log::info($a->getStartMessage());
$season = Season::getCurrent();
//$leagues = array_reverse(League::getRanking($rank));
$leagueNames = League::getNames();
$userNames = User::getNames();
$leagues = League::where('season_id','=',$season->id)->where('rank','<=', 4)->orderBy('id')->get();
if (!sizeof($leagues)) return redirect("/");
if (!sizeof($leagues)) {
Log::info($a->getEndMessage());
return redirect("/");
}
$totalRanking = League::getTotalRankingOverall(); // Nur für Auf/Abstiegsinfo benötigt.
$rankInfo=array();
@ -138,6 +159,9 @@ class LeaguesController extends Controller
$leagueScores[$rank] = League::getRanking($rank);
}
Log::info($a->getEndMessage());
//error_log($a->getEndMessage());
return view ('leagues.chart',compact('season', 'leagueNames', 'userNames','leagueScores','rankInfo','rank','cols'));
}

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

@ -13,6 +13,7 @@ use Auth;
use DB;
use Log;
use Carbon;
use App\MyClasses\TimeLogger;
class RoundmailController extends Controller
{
@ -22,6 +23,9 @@ class RoundmailController extends Controller
if (Auth::guest()) { return redirect("/"); }
if (!Auth::user()->admin) { return redirect("/"); }
$a=new TimeLogger("RoundmailController::index()");
Log::info($a->getStartMessage());
$mails_db = Roundmail::all();
$mails=array();
foreach($mails_db as $mail_db) {
@ -39,6 +43,8 @@ class RoundmailController extends Controller
}
$mails=array_reverse($mails);
Log::info($a->getEndMessage());
return view('roundmails.index',compact('mails'));
}
@ -46,6 +52,9 @@ class RoundmailController extends Controller
if (Auth::guest()) { return redirect("/"); }
if (!Auth::user()->admin) { return redirect("/"); }
$a=new TimeLogger("RoundmailController::show start");
Log::info($a->getStartMessage());
$user_id=Auth::user()->id;
$users = DB::table('users')->where('deleted',null)->orderBy('lastname')->get();
@ -124,6 +133,8 @@ class RoundmailController extends Controller
if ($sender) {$sender_name = $sender->name;}
}
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'));
}

20
pfosten/app/Http/Controllers/RoundsController.php
View file

@ -12,6 +12,7 @@ use App\Quota;
use DB;
use Auth;
use Log;
use App\MyClasses\TimeLogger;
class RoundsController extends Controller
{
@ -19,6 +20,9 @@ class RoundsController extends Controller
if (Auth::guest()) { return redirect("/"); }
if (!Auth::user()->admin) { return redirect("/"); }
$a=new TimeLogger("RoundsController::index()");
Log::info($a->getStartMessage());
$activeSeason=Season::getCurrent();
$rounds =null;
@ -30,6 +34,8 @@ class RoundsController extends Controller
$quotas = Quota::getQuotas();
$round_count = Round::getCount();
Log::info($a->getEndMessage());
return view('rounds.index', compact('rounds','activeSeason', 'round_count'));
}
@ -51,6 +57,9 @@ class RoundsController extends Controller
if (Auth::guest()) { return redirect("/"); }
if (!Auth::user()->admin) { return redirect("/"); }
$a=new TimeLogger("RoundsController::store() start");
Log::info($a->getStartMessage());
// Validate form
$this->validate(request(), [
'name' => 'required',
@ -108,6 +117,8 @@ class RoundsController extends Controller
Tipp::createAllTips();
Log::info($a->getEndMessage());
// Redirect to the home page
return redirect('/rounds');
}
@ -116,6 +127,9 @@ class RoundsController extends Controller
if (Auth::guest()) { return redirect("/"); }
if (!Auth::user()->admin) { return redirect("/"); }
$a=new TimeLogger("RoundsController::store_report()");
Log::info($a->getStartMessage());
// Validate form
$this->validate(request(), [
'round_id' => 'required'
@ -133,6 +147,7 @@ class RoundsController extends Controller
}
$round->save();
Log::info($a->getEndMessage());
// Redirect to the home page
return redirect('/rounds');
@ -150,6 +165,9 @@ class RoundsController extends Controller
if (Auth::guest()) { return redirect("/"); }
if (!Auth::user()->admin) { return redirect("/"); }
$a=new TimeLogger("RoundsController::storename()");
Log::info($a->getStartMessage());
// Validate form
$this->validate(request(), [
'round_id' => 'required',
@ -160,6 +178,8 @@ class RoundsController extends Controller
$round->name = request('name');
$round->save();
Log::info($a->getEndMessage());
return redirect('/rounds');
}
}

12
pfosten/app/Http/Controllers/TippsController.php
View file

@ -13,12 +13,17 @@ use Auth;
use Log;
use DB;
use App\MyClasses\TimeLogger;
class TippsController extends Controller
{
//Duplicate from Tipps model
//TODO: Refactor usage to use only the Tipps version
public static function createTipps($user_id) {
$a=new TimeLogger("TippsController::createTipps()");
Log::info($a->getStartMessage());
$activeSeason = Season::getCurrent();
$rounds = Round::all()->where('season_id', '=', $activeSeason->id);
@ -44,15 +49,22 @@ class TippsController extends Controller
}
}
}
Log::info($a->getEndMessage());
}
//Duplicate from Tipps model
//TODO: Refactor usage to use only the Tipps version
public static function createAllTips(){
$a=new TimeLogger("TippsController::createAllTipps()");
Log::info($a->getStartMessage());
$users = DB::table('users')->where('deleted',null)->get();
foreach($users as $user) {
TippsController::createTipps($user->id);
}
Log::info($a->getEndMessage());
}
public function index()

99
pfosten/app/Http/Controllers/UsersController.php
View file

@ -22,10 +22,15 @@ use Auth;
use Log;
use Carbon;
use App\MyClasses\TimeLogger;
class UsersController extends Controller
{
public function main() {
$a=new TimeLogger("UsersController::main()");
Log::info($a->getStartMessage());
//error_log($a->getStartMessage());
$currentSeason=Season::getCurrent();
$roundname="";
$report="";
@ -90,15 +95,30 @@ class UsersController extends Controller
}
}
Log::info($a->getEndMessage());
//error_log($a->getEndMessage());
return view('main',compact('roundname','display_rounds','message_text_joker','message_text_tipps','nextRoundName','nextRoundLockTime', 'hourDiffToLock'));
}
public function index() {
$a=new TimeLogger("UserController::index()");
Log::info($a->getStartMessage());
//error_log($a->getStartMessage());
if (Auth::guest()) { return redirect("/"); }
if (!Auth::user()->admin) { return redirect("/"); }
$activeUsers = User::getActives();
$b=new TimeLogger("UsersController::index-db_subqueries");
Log::info($b->getStartMessage());
$currentSeason=Season::getCurrent();
if (!$currentSeason) { return redirect('/'); }
@ -107,28 +127,45 @@ class UsersController extends Controller
$users = DB::table('users')->where('deleted',null)->orderBy('lastname')->get();
foreach($users as $key => $user) {
if (User::hasMissingTipp($user->id)) {
$users[$key]->missingTippText="Tipps fehlen";
$users[$key]->tippStyling="red";
Log::info($b->getEndMessage());
Log::info($a->getStartMessage());
$missingTipps = User::getMissingTippsAndJokers($users);
$c=new TimeLogger("UsersController::index-missingTipp Loop");
Log::info($c->getStartMessage());
foreach($users as $user_id => $user) {
if (array_key_exists($user_id, $missingTipps["MISSING_TIPP"])) {
$users[$user_id]->missingTippText = "Tipps fehlen";
$users[$user_id]->tippStyling = "red";
} else {
$users[$key]->missingTippText="Runde getippt";
$users[$key]->tippStyling="green";
$users[$user_id]->missingTippText = "Runde getippt";
$users[$user_id]->tippStyling = "green";
}
if (User::hasMissingJoker($user->id)) {
$users[$key]->missingJokerText="Joker fehlt";
$users[$key]->jokerStyling="red";
if (array_key_exists($user_id, $missingTipps["MISSING_JOKER"])) {
$users[$user_id]->missingJokerText = "Joker fehlt";
$users[$user_id]->jokerStyling = "red";
} else {
$users[$key]->missingJokerText="Joker gesetzt";
$users[$key]->jokerStyling="green";
$users[$user_id]->missingJokerText = "Joker gesetzt";
$users[$user_id]->jokerStyling = "green";
}
}
Log::info($c->getEndMessage());
$round = Round::getFirstTippableRound();
$firstTippableRound=new Round();
$firstTippableRound->name="-";
if ($round) { $firstTippableRound = $round; }
Log::info($a->getEndMessage());
//error_log($a->getEndMessage());
return view('users.index', compact('users','active_user_count','total_user_count', 'firstTippableRound'));
}
/*
@ -160,6 +197,11 @@ class UsersController extends Controller
public function store() {
if (Auth::guest()) { return redirect("/"); }
$a=new TimeLogger("UsersController::store()");
Log::info($a->getStartMessage());
//error_log($a->getStartMessage());
$season_id = Season::getCurrent()->id;
// Validate form
$this->validate(request(), [
@ -194,6 +236,9 @@ class UsersController extends Controller
Tipp::createAllTips();
Log::info($a->getEndMessage());
//error_log($a->getEndMessage());
return redirect('/users');
}
@ -657,28 +702,28 @@ class UsersController extends Controller
public function gshirt_ranking() {
if (Auth::guest()) { return redirect("/"); }
public function gshirt_ranking() {
if (Auth::guest()) { return redirect("/"); }
// Check ob mindestens eine Runde der Saison gelockt ist und angezeigt werden kann
// Check ob mindestens eine Runde der Saison gelockt ist und angezeigt werden kann
$season=Season::getCurrent();
$seasonId=$season->id;
$season=Season::getCurrent();
$seasonId=$season->id;
$max_round_id = Round::getLastCompleteRoundId();
if ($max_round_id==-1) {
$max_round_id = Round::getLastCompleteRoundId();
if ($max_round_id==-1) {
$sql="select DATE_FORMAT(date_sub(min(games.kickoff), interval 1 hour),'%d.%m.%Y %H:%i') as start_date from rounds,games where rounds.season_id=".$seasonId." and games.round_id=rounds.id order by rounds.id;";
//dd($sql);
$entries = DB::select($sql);
$sql="select DATE_FORMAT(date_sub(min(games.kickoff), interval 1 hour),'%d.%m.%Y %H:%i') as start_date from rounds,games where rounds.season_id=".$seasonId." and games.round_id=rounds.id order by rounds.id;";
//dd($sql);
$entries = DB::select($sql);
if (count($entries)>0) {
$start_date = $entries[0]->start_date;
return view('users.no_ranking', compact('start_date'));
} else {
return redirect("/");
}
if (count($entries)>0) {
$start_date = $entries[0]->start_date;
return view('users.no_ranking', compact('start_date'));
} else {
return redirect("/");
}
}