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

Updating repo for cross-computer work

Browse source
This commit is contained in:
Torsten 2020-01-17 09:32:06 +01:00
parent 807cf49bc0
commit 1fea0f4fe7
18 changed files with 87847 additions and 5202 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,7 @@ class TippsController extends Controller
}
//Duplicate from Tipps model
//TODO: Refactor usage to use only the Tipps version
public static function createAllTips(){
@ -67,6 +68,7 @@ class TippsController extends Controller
Log::info($a->getEndMessage());
}
public function index()
{
if (Auth::guest()) { return redirect("/"); }
@ -83,13 +85,15 @@ class TippsController extends Controller
$rounds = null;
TippsController::createTipps($user->id); // ggfs. fehlender Tipp Eintraege einfügen
TippsController::createTipps($user->id); // ggfs. fehlende Tipp Eintraege einfügen
$lastLockedRoundId=Round::getLastLockedRoundId();
$rounds = Round::where('season_id', '=', $activeSeason->id)->get();
$max_identical_jokertipps=$activeSeason->maxIdenticalJokertipps();
return view('tipps.index', compact('rounds', 'activeSeason', 'user'));
return view('tipps.index', compact('rounds', 'activeSeason', 'user', 'max_identical_jokertipps'));
}
@ -115,17 +119,39 @@ class TippsController extends Controller
$tipp = Tipp::where('id', request('id'))->first();
$game = Game::where('id', $tipp->game_id)->first();
$round= Round::where('id',$game->round_id)->first();
if (Round::hasLockedGame($round->id)) { return redirect('/tipps'); } // Für Schlauberger, die die Tippmaske auflassen.
//if (Round::hasLockedGame($round->id)) { return redirect('/tipps'); } // Für Schlauberger, die die Tippmaske auflassen.
$tipp->score1= request('score1');
$tipp->score2= request('score2');
if (request()->has('joker')) {
$tipp->joker=true;
Log::info("Request has joker");
} else {
$tipp->joker = false;
Log::info("Request has NO joker");
}
// Neuerung 2020-01-09: Joker nur speichern, wenn Ergebnis nicht schon zu oft "gejokert" wurde.
Log::info("Checking for joker");
if ($tipp->joker) {
Log::info("Joker found.");
$jokertipps=Tipp::getJokerUsageArray($user->id,$game->round_id);
$key=$tipp->score1.":".$tipp->score2;
Log::info("Key(Gamescore):".$key);
if (array_key_exists($key,$jokertipps)) {
Log::info("Key found in jokertipps array");
$value=$jokertipps[$key];
Log::info("Stored value:".$value);
$limit=Season::getCurrent()->maxIdenticalJokertipps();
if (intval($value)>=intval($limit)) {
Log::info("**JOKERLIMIT REACHED FOR GAMESCORE:".$key);
return redirect('/tipps/joker_impossible');
}
}
}
$tipp->save();
@ -158,6 +184,10 @@ class TippsController extends Controller
return redirect($tippLink);
}
public static function joker_impossible() {
return view('tipps.joker_impossible');
}
}

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

@ -27,8 +27,8 @@ use App\MyClasses\TimeLogger;
class UsersController extends Controller
{
public function main() {
$a=new TimeLogger("UsersController::main()");
Log::info($a->getStartMessage());
//$a=new TimeLogger("UsersController::main()");
//Log::info($a->getStartMessage());
$currentSeason=Season::getCurrent();
$roundname="";
@ -94,8 +94,7 @@ class UsersController extends Controller
}
}
Log::info($a->getEndMessage());
//error_log($a->getEndMessage());
//Log::info($a->getEndMessage());
return view('main',compact('roundname','display_rounds','message_text_joker','message_text_tipps','nextRoundName','nextRoundLockTime', 'hourDiffToLock'));
}
@ -247,6 +246,7 @@ class UsersController extends Controller
if (request()->has('bankname')) { $user->bankname = request('bankname'); }
if (request()->has('blz')) { $user->blz = request('blz'); }
if (request()->has('kontonr')) { $user->kontonr = request('kontonr'); }
if (request()->has('mobile')) { $user->mobile = request('mobile'); }
if (request()->has('admin')) {
$user->admin = true;
@ -582,6 +582,10 @@ class UsersController extends Controller
if (request()->has('kontonr')) {
$user->kontonr=request('kontonr');
}
if (request()->has('mobile')) {
$user->mobile=request('mobile');
}
Log::info("Setting gets_reminders to: " . request('gets_reminders'));
$user->save();
return redirect('/');
@ -637,14 +641,16 @@ class UsersController extends Controller
if (Auth::guest()) { return redirect("/"); }
$currentSeason = Season::getCurrent();
// Payment made ?
if (! User::payment_date(Auth::user()->id, $currentSeason->id) && Auth::user()->name!="Torsten Schneider") {
return view('users.no_payment');
}
$response = Tipp::getRoundTipps();
if (sizeof($response)==0) {
return redirect("/");
}
$roundtipps = $response['roundtipps'];
$roundData = $response['roundData'];
$user_ids = $response['user_ids'];