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

Merge branch 'master' of https://bitbucket.org/Terminon/tippspiel

Browse source
This commit is contained in:
tschneider 2020-12-31 15:23:25 +01:00
commit 76d3e9aed1
18 changed files with 177517 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

132292
dumps/2020-09-08_1717_d0274241.sql Normal file
View file

File diff suppressed because one or more lines are too long

90
dumps/swap_season7.sql Normal file
View file

@ -0,0 +1,90 @@
update leagues_matches set user1_id=999 where user1_id=19 and league_id in (85,86,87,88);
update leagues_matches set user1_id=19 where user1_id=20 and league_id in (85,86,87,88);
update leagues_matches set user1_id=20 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=19 and league_id in (85,86,87,88);
update leagues_matches set user2_id=19 where user2_id=20 and league_id in (85,86,87,88);
update leagues_matches set user2_id=20 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=19 and league_id in (85,86,87,88);
update leagues_members set user_id=19 where user_id=20 and league_id in (85,86,87,88);
update leagues_members set user_id=20 where user_id=999 and league_id in (85,86,87,88);
update leagues_matches set user1_id=999 where user1_id=78 and league_id in (85,86,87,88);
update leagues_matches set user1_id=78 where user1_id=58 and league_id in (85,86,87,88);
update leagues_matches set user1_id=58 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=78 and league_id in (85,86,87,88);
update leagues_matches set user2_id=78 where user2_id=58 and league_id in (85,86,87,88);
update leagues_matches set user2_id=58 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=78 and league_id in (85,86,87,88);
update leagues_members set user_id=78 where user_id=58 and league_id in (85,86,87,88);
update leagues_members set user_id=58 where user_id=999 and league_id in (85,86,87,88);
update leagues_matches set user1_id=999 where user1_id=24 and league_id in (85,86,87,88);
update leagues_matches set user1_id=24 where user1_id=75 and league_id in (85,86,87,88);
update leagues_matches set user1_id=75 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=24 and league_id in (85,86,87,88);
update leagues_matches set user2_id=24 where user2_id=75 and league_id in (85,86,87,88);
update leagues_matches set user2_id=75 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=24 and league_id in (85,86,87,88);
update leagues_members set user_id=24 where user_id=75 and league_id in (85,86,87,88);
update leagues_members set user_id=75 where user_id=999 and league_id in (85,86,87,88);
update leagues_matches set user1_id=999 where user1_id=21 and league_id in (85,86,87,88);
update leagues_matches set user1_id=21 where user1_id=40 and league_id in (85,86,87,88);
update leagues_matches set user1_id=40 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=21 and league_id in (85,86,87,88);
update leagues_matches set user2_id=21 where user2_id=40 and league_id in (85,86,87,88);
update leagues_matches set user2_id=40 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=21 and league_id in (85,86,87,88);
update leagues_members set user_id=21 where user_id=40 and league_id in (85,86,87,88);
update leagues_members set user_id=40 where user_id=999 and league_id in (85,86,87,88);
update leagues_matches set user1_id=999 where user1_id=111 and league_id in (85,86,87,88);
update leagues_matches set user1_id=111 where user1_id=35 and league_id in (85,86,87,88);
update leagues_matches set user1_id=35 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=111 and league_id in (85,86,87,88);
update leagues_matches set user2_id=111 where user2_id=35 and league_id in (85,86,87,88);
update leagues_matches set user2_id=35 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=111 and league_id in (85,86,87,88);
update leagues_members set user_id=111 where user_id=35 and league_id in (85,86,87,88);
update leagues_members set user_id=35 where user_id=999 and league_id in (85,86,87,88);
update leagues_matches set user1_id=999 where user1_id=117 and league_id in (85,86,87,88);
update leagues_matches set user1_id=117 where user1_id=68 and league_id in (85,86,87,88);
update leagues_matches set user1_id=68 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=117 and league_id in (85,86,87,88);
update leagues_matches set user2_id=117 where user2_id=68 and league_id in (85,86,87,88);
update leagues_matches set user2_id=68 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=117 and league_id in (85,86,87,88);
update leagues_members set user_id=117 where user_id=68 and league_id in (85,86,87,88);
update leagues_members set user_id=68 where user_id=999 and league_id in (85,86,87,88);
update leagues_matches set user1_id=999 where user1_id=48 and league_id in (85,86,87,88);
update leagues_matches set user1_id=48 where user1_id=91 and league_id in (85,86,87,88);
update leagues_matches set user1_id=91 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=48 and league_id in (85,86,87,88);
update leagues_matches set user2_id=48 where user2_id=91 and league_id in (85,86,87,88);
update leagues_matches set user2_id=91 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=48 and league_id in (85,86,87,88);
update leagues_members set user_id=48 where user_id=91 and league_id in (85,86,87,88);
update leagues_members set user_id=91 where user_id=999 and league_id in (85,86,87,88);
update leagues_matches set user1_id=999 where user1_id=2 and league_id in (85,86,87,88);
update leagues_matches set user1_id=2 where user1_id=62 and league_id in (85,86,87,88);
update leagues_matches set user1_id=62 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=2 and league_id in (85,86,87,88);
update leagues_matches set user2_id=2 where user2_id=62 and league_id in (85,86,87,88);
update leagues_matches set user2_id=62 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=2 and league_id in (85,86,87,88);
update leagues_members set user_id=2 where user_id=62 and league_id in (85,86,87,88);
update leagues_members set user_id=62 where user_id=999 and league_id in (85,86,87,88);
update leagues_matches set user1_id=999 where user1_id=7 and league_id in (85,86,87,88);
update leagues_matches set user1_id=7 where user1_id=8 and league_id in (85,86,87,88);
update leagues_matches set user1_id=8 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=7 and league_id in (85,86,87,88);
update leagues_matches set user2_id=7 where user2_id=8 and league_id in (85,86,87,88);
update leagues_matches set user2_id=8 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=7 and league_id in (85,86,87,88);
update leagues_members set user_id=7 where user_id=8 and league_id in (85,86,87,88);
update leagues_members set user_id=8 where user_id=999 and league_id in (85,86,87,88);
update leagues_matches set user1_id=999 where user1_id=100 and league_id in (85,86,87,88);
update leagues_matches set user1_id=100 where user1_id=119 and league_id in (85,86,87,88);
update leagues_matches set user1_id=119 where user1_id=999 and league_id in (85,86,87,88);
update leagues_matches set user2_id=999 where user2_id=100 and league_id in (85,86,87,88);
update leagues_matches set user2_id=100 where user2_id=119 and league_id in (85,86,87,88);
update leagues_matches set user2_id=119 where user2_id=999 and league_id in (85,86,87,88);
update leagues_members set user_id=999 where user_id=100 and league_id in (85,86,87,88);
update leagues_members set user_id=100 where user_id=119 and league_id in (85,86,87,88);
update leagues_members set user_id=119 where user_id=999 and league_id in (85,86,87,88);

3
pfosten/app/Game.php
View file

@ -67,7 +67,8 @@ class Game extends Model
public function getLocktime() {
return Carbon\Carbon::parse($this->kickoff)->addHour(-1);
//return Carbon\Carbon::parse($this->kickoff)->addHour(-1);
return Carbon\Carbon::parse($this->kickoff)->addMinute(-1); // 2020-09-11 changed Lock from Hour to Minute
}
}

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

@ -73,6 +73,7 @@ class LeaguesController extends Controller
}
public function createLeagues($start_round_id, $round_count) {
Log::info("CREATE_LEAGUES");
$a=new TimeLogger("LeaguesController::createLeagues()");
Log::info($a->getStartMessage());

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

@ -83,8 +83,10 @@ class RoundmailController extends Controller
array_push($activeMailList,$user->email);
} else {
Log::info("Season is NOT paid.");
array_push($inactive_users, $user);
array_push($inactiveMailList,$user->email);
if (!$user->deleted) {
array_push($inactive_users, $user);
array_push($inactiveMailList, $user->email);
}
}
//Log::info("user-id=".$user->id.", ".$user->name);
@ -229,9 +231,12 @@ class RoundmailController extends Controller
Log::info("Usercount: ".sizeof($users));
$emailsOfUsersWithIncompleteTipps=array();
foreach($users as $user) {
if (User::hasMissingTipp($user->id) || User::hasMissingJoker($user->id)) {
if ($user->gets_reminders) {
array_push($emailsOfUsersWithIncompleteTipps, $user->email);
// 2.Versuch nur aktiven Spielern reminder mails zu schicken
if (User::is_season_paid($user->id)=="Ja") {
if (User::hasMissingTipp($user->id) || User::hasMissingJoker($user->id)) {
if ($user->gets_reminders) {
array_push($emailsOfUsersWithIncompleteTipps, $user->email);
}
}
}
}

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

@ -30,7 +30,6 @@ class TippsController extends Controller
foreach($rounds as $round) {
$games=Game::all()->where('round_id','=',$round->id);
foreach($games as $game) {
// Tipp erzeugen wenn noch nicht vorhanden
$tipp = DB::table('tipps')->where([
['game_id','=',$game->id],

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

@ -798,4 +798,7 @@ class UsersController extends Controller
return view ('users.gshirt_ranking', compact('rankingDisplay','usernames', 'roundnames'));
}
public function no_payment() {
return view ('users.no_payment');
}
}

35
pfosten/app/Leagues/League.php
View file

@ -30,8 +30,7 @@ class League extends Model
//
public static function neededLeagues($member_count, $round_count) {
$max_members_per_league=22;
if ( $round_count < $max_members_per_league-1 ) { $max_members_per_league = $round_count+1; }
if ($member_count <= $max_members_per_league) return $member_count;
if ($member_count<=$max_members_per_league) return 1;
$neededLeagues = intdiv($member_count, $max_members_per_league);
@ -163,17 +162,17 @@ class League extends Model
$lastLockedRoundId=Round::getLastLockedRoundId();
Log::info("LASTLOCKKEDROUNDID=".$lastLockedRoundId);
//Log::info("LASTLOCKKEDROUNDID=".$lastLockedRoundId);
$matches=Match::getMatchResults($league->id,-1);
foreach ($matches as $match) {
if (Round::isCompleted($match->round_id) || $match->round_id==$lastLockedRoundId ) {
$memberScores[$match->user1_id][1] += $match->user1_league_score;
error_log("+++ ".$match->user1_id." +".$match->user1_league_score);
//error_log("+++ ".$match->user1_id." +".$match->user1_league_score);
$memberScores[$match->user1_id][2] += $match->user1_rankscore; // goals
$memberScores[$match->user1_id][3] += $match->user2_rankscore; // countergoals
$memberScores[$match->user2_id][1] += $match->user2_league_score;
error_log("+++ ".$match->user2_id." +".$match->user2_league_score);
//error_log("+++ ".$match->user2_id." +".$match->user2_league_score);
$memberScores[$match->user2_id][2] += $match->user2_rankscore; // goals
$memberScores[$match->user2_id][3] += $match->user1_rankscore; // countergoals
}
@ -182,12 +181,12 @@ class League extends Model
$leagueScores[$league->id]=$memberScores;
error_log("League::getRanking leagueid / userid / score");
//error_log("League::getRanking leagueid / userid / score");
foreach ($memberScores as $entry) {
error_log($league->id." / ".$entry[0]." / ".$entry[1]);
//error_log($league->id." / ".$entry[0]." / ".$entry[1]);
}
error_log("---");
//error_log("---");
}
return $leagueScores;
@ -281,7 +280,7 @@ class League extends Model
$totalRanking[19][4]=2;
$uid=$totalRanking[19][0];
Log::info("Abstieg in Liga 2: ["+$uid+"] ".$userNames[$uid]);
//Log::info("Abstieg in Liga 2: ["+$uid+"] ".$userNames[$uid]);
$totalRanking[20][4]=2;
$uid=$totalRanking[20][0];
@ -493,7 +492,7 @@ class League extends Model
'league_id' => $league_ids[$league_index]
]);
$leagueMember->save();
error_log("Saving user_id ".$user->id);
Log::info("Saving user_id ".$user->id);
$league_index+=1;
if (sizeof($league_ids)==$league_index) { $league_index=0; }
}
@ -511,6 +510,7 @@ class League extends Model
$neededLeagues3=0;
$league_size1= min(22,$active_member_count);
Log::info("Creating League 'Spielerliga 1'");
$league1 = League::create([
'is_qualification' => false,
'name' => 'Spielerliga 1',
@ -524,6 +524,7 @@ class League extends Model
$league_size2=min(22,$active_member_count - $league_size1);
if ($league_size2>0) {
Log::info("Creating League 'Spielerliga 2'");
$league2 = League::create([
'is_qualification' => false,
'name' => 'Spielerliga 2',
@ -536,16 +537,15 @@ class League extends Model
array_push($createdLeagues, $league2);
$league_size3 = $active_member_count - $league_size1 - $league_size2;
Log::info("Size of league 3 = ". $league_size3);
// Make neededLeagues3 visible outside of scope
$neededLeagues3=-1;
if ($league_size3>0) {
$neededLeagues3 = League::neededLeagues($league_size3, $round_count);
// Wenn es mehr als eine Gruppe ist, mpssen
if ($neededLeagues3>1) {
}
Log::info("Needed 3-Leagues for league_size=".$league_size3." and round_count=".$round_count." is: ".$neededLeagues3);
for ($league_nr=1; $league_nr<=$neededLeagues3; $league_nr+=1) {
$league = League::create([
@ -677,7 +677,7 @@ class League extends Model
'user_id' => $entry[0],
'league_id' => $league->id
]);
Log::Info("(".$entry[0].") ".$userNames[$entry[0]]." => leagueIndex=".$leagueIndex);
Log::info("(".$entry[0].") ".$userNames[$entry[0]]." => leagueIndex=".$leagueIndex);
$leagueMember->save();
@ -730,7 +730,7 @@ class League extends Model
// WAS MACHT DIESER CODE ?!
/*
@ -835,7 +835,8 @@ class League extends Model
}
}
*/
*/
// WAS MACHT DIESER CODE? --ENDE
}
}

5
pfosten/app/Leagues/Match.php
View file

@ -114,7 +114,7 @@ class Match extends Model
public static function getLeagueMatches($leagueId) {
//error_log("App\Match::getLeagueMatches(leagueId=".$leagueId.")");
error_log("App\Match::getLeagueMatches(leagueId=".$leagueId.")");
$matches = DB::table('leagues_matches')->where('league_id','=',$leagueId)->orderBy('round_id')->get();
$league=League::where('id','=',$leagueId)->first();
$season = Season::where('id','=',$league->season_id)->first();
@ -123,6 +123,9 @@ class Match extends Model
foreach($matches as $match) {
//error_log("Needed round_id: ".$match->round_id);
//error_log(" User1: ".$match->user1_id);
//error_log(" User2: ".$match->user2_id);
$match->round_name = $roundnames[$match->round_id];
$match->user1_name = $usernames[$match->user1_id];
$match->user2_name = $usernames[$match->user2_id];

3
pfosten/app/Round.php
View file

@ -198,7 +198,8 @@ class Round extends Model
$kickoff = Carbon\Carbon::parse($game->kickoff);
if ($kickoff < $earliestKickoff) { $earliestKickoff = $kickoff; }
}
$earliestKickoff->subHour();
//$earliestKickoff->subHour();
$earliestKickoff->subMinute(); // 2020-09-11 changed from SubHour()
return $earliestKickoff;
}

2
pfosten/app/Tipp.php
View file

@ -706,7 +706,7 @@ class Tipp extends Model
$quotas=Quota::getQuotas();
error_log("Round-Count=".$round_count);
Log::debug("Round-Count=".$round_count);
if ($round_count==Round::getCount()) {
// Ranking Payout ausschütten

6
pfosten/package.json
View file

@ -16,6 +16,10 @@
"jquery": "^3.1.1",
"laravel-mix": "^5.0.1",
"lodash": "^4.17.4",
"vue": "^2.4.4"
"resolve-url-loader": "^3.1.0",
"sass": "^1.25.1-test.1",
"sass-loader": "^8.0.2",
"vue": "^2.4.4",
"vue-template-compiler": "^2.6.11"
}
}

45096
pfosten/public/js/app.js vendored
View file

File diff suppressed because one or more lines are too long

3
pfosten/public/mix-manifest.json Normal file
View file

@ -0,0 +1,3 @@
{
"/js/app.js": "/js/app.js"
}

2
pfosten/resources/views/roundmails/show.blade.php
View file

@ -46,7 +46,7 @@
<div>
<button onClick="setAdminRecipient(); return false;">Alle Administatoren</button>&nbsp;
<button onClick="setActiveRecipient(); return false;">Alle aktiven Spieler</button>&nbsp;
<button onClick="setInactiveRecipient(); return false;">Alle inaktiven Spieler (unbezahlt oder gelöscht)</button>&nbsp;
<button onClick="setInactiveRecipient(); return false;">Alle inaktiven Spieler</button>&nbsp;
<button onClick="setMissingTippRecipient(); return false;">Alle Spieler mit fehlenden Tipps</button>&nbsp;
<button onClick="setMissingJokerRecipient(); return false;">Alle Spieler mit fehlenden Jokern</button>&nbsp;
<div>

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

@ -22,7 +22,7 @@
<td class="table-bordered col-md-4" >&nbsp;<a class="text list-unstyled" href="/users/edit/{{$user->id}}">{{ $user->name }}&nbsp;</a></td>
<td class="table-bordered">{{ App\User::is_season_paid($user->id) }}</td>
<td>{{ $user->email }}</td>
<td class="table-bordered">&nbsp; {{ ($user->admin ? "Administrator":"Spieler") }}&nbsp;</td>
<td class="table-bordered">&nbsp; {{ ($user->a<dmin ? "Administrator":"Spieler") }}&nbsp;</td>
<td class="table-bordered" style="color:#bfd7d8;background-color:{{$user->tippStyling}};">&nbsp;{{ $user->missingTippText }}&nbsp;</td>
<td class="table-bordered" style="color:#bfd7d8;background-color:{{$user->jokerStyling}};">&nbsp;{{ $user->missingJokerText }}&nbsp;</td>
</tr>

2
pfosten/routes/api.php
View file

@ -13,6 +13,8 @@ use Illuminate\Http\Request;
|
*/
/*
Route::middleware('auth:api')->get('/user', function (Request $request) {
return $request->user();
});
*/

2
pfosten/routes/web.php
View file

@ -49,7 +49,7 @@ Route::get('/users/gshirt_ranking','UsersController@gshirt_ranking');
Route::get('/users/show_payouts','UsersController@show_payouts');
Route::get('/users/useredit/{user_id}','UsersController@useredit');
Route::post('/users/store_useredit','UsersController@storeUserEdit');
Route::get('/users/no_payment');
Route::get('/users/no_payment','UsersController@no_payment');
Route::get('/users/delete/{user_id}','UsersController@delete');
Route::get('/users/payout','UsersController@money_ranking');
Route::get('/users/payout_with_iban','UsersController@money_ranking_with_iban');