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

...

Browse source
This commit is contained in:
Torsten Schneider 2021-04-11 23:07:18 +02:00
commit d0e8cd7139
6 changed files with 53030 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

52995
dumps/d0274241_2020-03-12_1533.sql Normal file
View file

File diff suppressed because one or more lines are too long

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

@ -134,7 +134,18 @@ class TippsController extends Controller
]); ]);
$user=Auth::user(); $user=Auth::user();
if ( is_null($user) ) {
Log::info("TippsController.store: No authenticated user detected. Aborting storage command.");
$tippLink="/tipps#";
$r=\App\Round::getFirstTippableRound();
if($r) $tippLink=$tippLink.$r->id;
// Redirect to the Rounds Index
return redirect($tippLink);
}
Log::info("TippsController::store for user-id ".$user->id); Log::info("TippsController::store for user-id ".$user->id);
// Fetch, modify, save Tipp // Fetch, modify, save Tipp
$tipp = Tipp::where('id', request('id'))->first(); $tipp = Tipp::where('id', request('id'))->first();
$game = Game::where('id', $tipp->game_id)->first(); $game = Game::where('id', $tipp->game_id)->first();
@ -207,7 +218,11 @@ class TippsController extends Controller
// If one fails, previous saves are kept, but user // If one fails, previous saves are kept, but user
// is redirected to edit4 page again. // is redirected to edit4 page again.
public function store4() { public function store4() {
Log::debug("### Store4 ###");
error_log("--- Store4 ---");
// Validate form // Validate form
//dd(request());
$this->validate(request(), [ $this->validate(request(), [
'round_id' => 'required', 'round_id' => 'required',
'game_id_1' => 'required', 'game_id_1' => 'required',
@ -225,9 +240,9 @@ class TippsController extends Controller
'score2_1' => 'required', 'score2_1' => 'required',
'score2_2' => 'required', 'score2_2' => 'required',
'score2_3' => 'required', 'score2_3' => 'required',
'score2_4' => 'required', 'score2_4' => 'required'
'round_id' => 'required'
]); ]);
error_log("Validation passed.");
$round_id= request('round_id'); $round_id= request('round_id');
$game_id_1=request('game_id_1'); $game_id_1=request('game_id_1');
@ -288,7 +303,13 @@ class TippsController extends Controller
} }
return redirect('/tipps/'); $tippLink="/tipps#";
$r=\App\Round::getFirstTippableRound();
if($r) $tippLink=$tippLink.$r->id;
// Redirect to the Rounds Index
return redirect($tippLink);
} }
// Store tipp if valid. // Store tipp if valid.

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

@ -105,9 +105,12 @@ class UsersController extends Controller
public function index() { public function index() {
error_log("Starting Controller: UsersController.index");
$a=new TimeLogger("UserController::index()"); $a=new TimeLogger("UserController::index()");
Log::info($a->getStartMessage()); Log::info($a->getStartMessage());
//error_log($a->getStartMessage()); error_log($a->getStartMessage());
if (Auth::guest()) { return redirect("/"); } if (Auth::guest()) { return redirect("/"); }
if (!Auth::user()->admin) { return redirect("/"); } if (!Auth::user()->admin) { return redirect("/"); }
@ -187,7 +190,9 @@ class UsersController extends Controller
if ($round) { $firstTippableRound = $round; } if ($round) { $firstTippableRound = $round; }
Log::info($a->getEndMessage()); Log::info($a->getEndMessage());
//error_log($a->getEndMessage()); error_log($a->getEndMessage());
error_log($users);
return view('users.index', compact('users','active_user_count','total_user_count', 'firstTippableRound')); return view('users.index', compact('users','active_user_count','total_user_count', 'firstTippableRound'));
} }

2
pfosten/config/app.php
View file

@ -38,7 +38,7 @@ return [
| |
*/ */
'debug' => env('APP_DEBUG', false), 'debug' => env('APP_DEBUG', true),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

4
pfosten/resources/views/tipps/edit4.blade.php
View file

@ -86,8 +86,8 @@
<input type="checkbox" name="joker_3" id="joker_3" @if($tipp3->joker===1) checked @endif> <input type="checkbox" name="joker_3" id="joker_3" @if($tipp3->joker===1) checked @endif>
<span> <span>
<input type="hidden" name="tipp_id_2" value="{{ $tipp3->id }}"> <input type="hidden" name="tipp_id_3" value="{{ $tipp3->id }}">
<input type="hidden" name="game_id_2" value="{{ $game3->id }}"> <input type="hidden" name="game_id_3" value="{{ $game3->id }}">
</span> </span>
<!-- 4 --> <!-- 4 -->

2
pfosten/resources/views/users/index.blade.php
View file

@ -5,7 +5,7 @@
<!-- <div class="container"> --> <!-- <div class="container"> -->
<div class="lead col-md-8" >registrierte Spieler: {{ $total_user_count }} , davon bezahlt: {{$active_user_count}}</div> <div class="lead col-md-8" >registrierte Spieler: {{ $total_user_count }} , davon bezahlt: {{$active_user_count}}</div>
<p>&nbsp;<a href="/users/payout_with_iban">Kontoliste</a></p> <p>&nbsp;<a href="/users/payout_with_iban">Kontoliste</a></p>index.blade.php
<div class="col-md-12"> <div class="col-md-12">
<table class="table-bordered" > <table class="table-bordered" >