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

update2

Browse source
This commit is contained in:
Torsten 2018-08-07 10:42:11 +02:00
parent 98419bd18d
commit 8a69e45efa
4919 changed files with 28311 additions and 224136 deletions
Download patch file Download diff file Expand all files Collapse all files

117
pfosten/app/leagues/League.php
View file

@ -66,6 +66,7 @@ class League extends Model
public static function cmpScore($score1, $score2) {
// [0] = user-id
// [1] = league_score
// [4] = rank
$_score1 = $score1[1];
$goals1 = $score1[2];
@ -191,6 +192,9 @@ class League extends Model
// getUnifiedRanking bezieht sich (nur) auf Gruppen-Übergreifende Listung (also alle Untergruppen)
// Rank = -1 bedeutet über alle Ranks (benötigt für Auf- und Abstieg über alle Ligen)
public static function getUnifiedRanking($rank, $seasonId=-1) {
//Log::info("getUnified Ranking [last season], rank=".$rank." seasonId=".$seasonId);
$leagueScores = League::getRanking($rank, $seasonId);
$unifiedScores = array();
foreach($leagueScores as $leagueId => $singleLeagueScores) {
@ -202,12 +206,17 @@ class League extends Model
}
}
usort($unifiedScores,array('App\Leagues\League','cmpScore'));
//Log::info("getUnifiedRanking result, $rank=".$rank.", SeasonId=".$seasonId);
//Log::info($unifiedScores);
return $unifiedScores;
}
// Nur für Auf und Abstiegsberechnung.
// Schreibt den zukünftigen Rank auf Index4
public static function getTotalRankingOverall($seasonId=-1) {
$userNames = User::getNames();
$totalRanking=array();
$hasRank4 = false;
foreach([1,2,3,4] as $rank) {
@ -243,39 +252,141 @@ class League extends Model
}
// kein Rank4 ==> Ligaspiel ==> Auf & Abstieg wird angewendet.
if (!$hasRank4) {
if ($hasRank4) {
Log::info("Rank4 gesetzt, Quali, keine Vorsaison, Auf/Abstieg wird übersprungen");
}else {
Log::info("Rank4 nicht gesetzt, keine Quali, Auf/Abstieg wird berechnet");
// Liga 1/2: Swap rank 17-22 <> 23-28 ==> index 16-21 to rank=2, index 22-27 to rank=1
// Liga 2/3: Swap rank 39-44 <> 45-50 ==> index 38-43 to rank=3, index 44-49 to rank=2
$totalRanking[16][4]=2;
$totalRanking[16][4]=2;
$uid=$totalRanking[16][0];
Log::info("Abstieg in Liga 2: [".$uid."] ".$userNames[$uid]);
$totalRanking[17][4]=2;
$uid=$totalRanking[17][0];
Log::info("Abstieg in Liga 2: [".$uid."] ".$userNames[$uid]);
$totalRanking[18][4]=2;
$uid=$totalRanking[18][0];
Log::info("Abstieg in Liga 2: [".$uid."] ".$userNames[$uid]);
$totalRanking[19][4]=2;
$uid=$totalRanking[19][0];
Log::info("Abstieg in Liga 2: ["+$uid+"] ".$userNames[$uid]);
$totalRanking[20][4]=2;
$uid=$totalRanking[20][0];
Log::info("Abstieg in Liga 2: [".$uid."] ".$userNames[$uid]);
$totalRanking[21][4]=2;
$uid=$totalRanking[21][0];
Log::info("Abstieg in Liga 2: [".$uid."] ".$userNames[$uid]);
$totalRanking[22][4]=1;
$uid=$totalRanking[22][0];
Log::info("Aufstieg in Liga 1: [".$uid."] ".$userNames[$uid]);
$totalRanking[23][4]=1;
$uid=$totalRanking[23][0];
Log::info("Aufstieg in Liga 1: [".$uid."] ".$userNames[$uid]);
$totalRanking[24][4]=1;
$uid=$totalRanking[24][0];
Log::info("Aufstieg in Liga 1: [".$uid."] ".$userNames[$uid]);
$totalRanking[25][4]=1;
$uid=$totalRanking[25][0];
Log::info("Aufstieg in Liga 1: [".$uid."] ".$userNames[$uid]);
$totalRanking[26][4]=1;
$uid=$totalRanking[26][0];
Log::info("Aufstieg in Liga 1: [".$uid."] ".$userNames[$uid]);
$totalRanking[27][4]=1;
$uid=$totalRanking[27][0];
Log::info("Aufstieg in Liga 1: [".$uid."] ".$userNames[$uid]);
$totalRanking[38][4]=3;
$uid=$totalRanking[38][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[39][4]=3;
$uid=$totalRanking[39][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[40][4]=3;
$uid=$totalRanking[40][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[41][4]=3;
$uid=$totalRanking[41][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[42][4]=3;
$uid=$totalRanking[42][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[43][4]=3;
$uid=$totalRanking[43][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[44][4]=2;
$uid=$totalRanking[44][0];
Log::info("Aufstieg in Liga 2: [".$uid."] ".$userNames[$uid]);
$totalRanking[45][4]=2;
$uid=$totalRanking[45][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[46][4]=2;
$uid=$totalRanking[46][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[47][4]=2;
$uid=$totalRanking[47][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[48][4]=2;
$uid=$totalRanking[48][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
$totalRanking[49][4]=2;
$uid=$totalRanking[49][0];
Log::info("Abstieg in Liga 3: [".$uid."] ".$userNames[$uid]);
usort($totalRanking, array('App\Leagues\League','cmpScore'));
}
// HACK TO BE REMOVED: SET POSITIONS MANUALLY 2018-08
/*
foreach ($totalRanking as $index => $entry) {
$uid=$totalRanking[$index][0];
if ($uid==65 or $uid==80 or $uid==84 or $uid==3) {
$totalRanking[$index][4]=3;
}
if ($uid==68 or $uid==32 or $uid==9 or $uid==74) {
$totalRanking[$index][4]=2;
}
}
usort($totalRanking, array('App\Leagues\League','cmpScore'));
*/
// END OF HACK
return $totalRanking;
}
@ -449,7 +560,7 @@ class League extends Model
}
}
Log::info("League::createLeagues Creating unified List from previous season");
Log::info("League::createLeagues Creating unified List from previous season (i call League::getTotalRankingOverall)");
$unifiedList = League::getTotalRankingOverall($previousSeason->id); // WICHTIG !! getTotalRankingOverall implentiert Auf- und Abstieg !!
Log:info("League::createLeagues Unified List:");