Quotes Display & Daywin Calculation, Bugfix: 2 extra rankscore for all 4 tendencies in a round
This commit is contained in:
parent
954eca957b
commit
3fa31921f0
9 changed files with 522 additions and 31 deletions
|
|
@ -125,7 +125,7 @@ class RoundsController extends Controller
|
|||
|
||||
$round->report="";
|
||||
if (request("report")){
|
||||
$round->report = request("report");
|
||||
$round->report = str_replace("\n","<br/>", request("report"));
|
||||
}
|
||||
$round->save();
|
||||
|
||||
|
|
|
|||
|
|
@ -15,15 +15,82 @@ class SeasonsController extends Controller
|
|||
if (Auth::guest()) { return redirect("/"); }
|
||||
if (!Auth::user()->admin) { return redirect("/"); }
|
||||
|
||||
|
||||
|
||||
$seasons = DB::table('seasons')->get();
|
||||
$activeSeason=Season::getCurrent();
|
||||
$currentSeason=Season::getCurrent();
|
||||
|
||||
Log::info("Creating default quota");
|
||||
Quota::createDefaultQuota($activeSeason->id);
|
||||
$active_user_count = sizeof( DB::table('payments')->where('season_id',$currentSeason->id)->whereNotNull('paid_date')->get() );
|
||||
|
||||
return view('seasons.index', compact('seasons','activeSeason'));
|
||||
$quotas = Quota::getQuotas($currentSeason->id);
|
||||
|
||||
|
||||
|
||||
|
||||
$active_user_count = sizeof( DB::table('payments')->where('season_id',$currentSeason->id)->whereNotNull('paid_date')->get() );
|
||||
$euro_pott = $active_user_count * $quotas["Einsatz"];
|
||||
|
||||
$euro_tagessieg_sum = intval ($euro_pott * ( $quotas["Tagessieg"] / 100 ) );
|
||||
$euro_tagessieg = Quota::get6Divisor( intval($euro_tagessieg_sum / 36));
|
||||
|
||||
$euro_gruenes_trikot = intval($euro_pott * (($quotas["Gruenes Trikot"] / 100)));
|
||||
$euro_gruenes_trikot = Quota::get6Divisor($euro_gruenes_trikot);
|
||||
$euro_pokal= intval ($euro_pott * (($quotas["Pokal"] / 100)));
|
||||
$euro_pokal= Quota::get6Divisor($euro_pokal);
|
||||
|
||||
$euro_platzierung = intval ( $euro_pott * (($quotas["Platzierung"] / 100)));
|
||||
$tagessieg_rest = $euro_tagessieg_sum - ($euro_tagessieg * 36);
|
||||
|
||||
Log::info("Tagessieg Rest=".$tagessieg_rest." €");
|
||||
$euro_platzierung += $tagessieg_rest;
|
||||
|
||||
$euro_platz1 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 1"] / 100))));
|
||||
$euro_platz2 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 2"] / 100))));
|
||||
$euro_platz3 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 3"] / 100))));
|
||||
$euro_platz4 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 4"] / 100))));
|
||||
$euro_platz5 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 5"] / 100))));
|
||||
$euro_platz6 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 6"] / 100))));
|
||||
$euro_platz7 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 7"] / 100))));
|
||||
$euro_platz8 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 8"] / 100))));
|
||||
$euro_platz9 = Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 9"] / 100))));
|
||||
$euro_platz10= Quota::get6Divisor(intval( $euro_platzierung * (( $quotas["Platz 10"] / 100))));
|
||||
|
||||
$euro_liga=intval($euro_pott *(($quotas["Liga-Wertung"] / 100)));
|
||||
$euro_liga_platz1 = Quota::get6Divisor(intval($euro_liga*(($quotas["Liga Platz 1"] / 100))));
|
||||
$euro_liga_platz2 = Quota::get6Divisor(intval($euro_liga*(($quotas["Liga Platz 2"] / 100))));
|
||||
$euro_liga_platz3 = Quota::get6Divisor(intval($euro_liga*(($quotas["Liga Platz 3"] / 100))));
|
||||
|
||||
$finaler_rest = $euro_pott - ( 36*$euro_tagessieg + $euro_gruenes_trikot + $euro_pokal + $euro_platz1
|
||||
+ $euro_platz2 + $euro_platz3+ $euro_platz4 + $euro_platz5 + $euro_platz6 + $euro_platz7 + $euro_platz8 + $euro_platz9 + $euro_platz10);
|
||||
|
||||
$euro_platz1 = $euro_platz1 + $finaler_rest;
|
||||
|
||||
Log::info("Users: ". $active_user_count);
|
||||
Log::info("Einsatz: ". $quotas["Einsatz"]);
|
||||
|
||||
Log::info("Pott: ".$euro_pott." €");
|
||||
Log::info("Tagessieg: ".$euro_tagessieg." €");
|
||||
|
||||
Log::info("Grünes Trikot: ".$euro_gruenes_trikot." €");
|
||||
|
||||
Log::info("Pokal: ".$euro_pokal." €");
|
||||
|
||||
|
||||
Log::info("Liga: ".$euro_liga." €");
|
||||
Log::info("Platzierung: ".$euro_platzierung." €");
|
||||
|
||||
Log::info("Platz 1: ".$euro_platz1." €");
|
||||
Log::info("Platz 2: ".$euro_platz2." €");
|
||||
Log::info("Platz 3: ".$euro_platz3." €");
|
||||
Log::info("Platz 4: ".$euro_platz4." €");
|
||||
Log::info("Platz 5: ".$euro_platz5." €");
|
||||
Log::info("Platz 6: ".$euro_platz6." €");
|
||||
Log::info("Platz 7: ".$euro_platz7." €");
|
||||
Log::info("Platz 8: ".$euro_platz8." €");
|
||||
Log::info("Platz 9: ".$euro_platz9." €");
|
||||
Log::info("Platz 10: ".$euro_platz10." €");
|
||||
|
||||
Log::info("Finaler Rest: ".$finaler_rest." €");
|
||||
|
||||
return view('seasons.index', compact('seasons','currentSeason','quotas','active_user_count','euro_tagessieg','euro_platz1','euro_platz2','euro_platz3','euro_platz4','euro_platz5','euro_platz6','euro_platz7','euro_platz8','euro_platz9','euro_platz10'));
|
||||
}
|
||||
|
||||
public function create() {
|
||||
|
|
@ -53,11 +120,67 @@ class SeasonsController extends Controller
|
|||
Log::info('Setting season id=' .$season->id);
|
||||
}
|
||||
|
||||
Quota::createDefaultQuota($season->id);
|
||||
|
||||
// Redirect to the home page
|
||||
return redirect('/seasons');
|
||||
}
|
||||
public function store_quota() {
|
||||
if (Auth::guest()) { return redirect("/"); }
|
||||
if (!Auth::user()->admin) { return redirect("/"); }
|
||||
|
||||
$currentSeason=Season::getCurrent();
|
||||
|
||||
// Validate form
|
||||
$this->validate(request(), [
|
||||
'season_id' => 'required',
|
||||
'einsatz' => 'required',
|
||||
'tagessieg' => 'required',
|
||||
'pokal' => 'required',
|
||||
'gruenes_trikot' => 'required',
|
||||
'platzierung' => 'required',
|
||||
'liga' => 'required',
|
||||
'liga_platz1' => 'required',
|
||||
'liga_platz2' => 'required',
|
||||
'liga_platz3' => 'required',
|
||||
'platz1' => 'required',
|
||||
'platz2' => 'required',
|
||||
'platz3' => 'required',
|
||||
'platz4' => 'required',
|
||||
'platz5' => 'required',
|
||||
'platz6' => 'required',
|
||||
'platz7' => 'required',
|
||||
'platz8' => 'required',
|
||||
'platz9' => 'required',
|
||||
'platz10' => 'required'
|
||||
]);
|
||||
|
||||
|
||||
// Create and save the season
|
||||
|
||||
Quota::setQuota('Einsatz',request('einsatz'), $currentSeason->id);
|
||||
Quota::setQuota('Tagessieg',request('tagessieg'), $currentSeason->id);
|
||||
Quota::setQuota('Gruenes Trikot',request('gruenes_trikot'), $currentSeason->id);
|
||||
Quota::setQuota('Pokal',request('pokal'), $currentSeason->id);
|
||||
Quota::setQuota('Platzierung',request('platzierung'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 1',request('platz1'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 2',request('platz2'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 3',request('platz3'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 4',request('platz4'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 5',request('platz5'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 6',request('platz6'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 7',request('platz7'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 8',request('platz8'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 9',request('platz9'), $currentSeason->id);
|
||||
Quota::setQuota('Platz 10',request('platz10'), $currentSeason->id);
|
||||
Quota::setQuota('Liga-Wertung',request('liga'), $currentSeason->id);
|
||||
Quota::setQuota('Liga Platz 1',request('liga_platz1'), $currentSeason->id);
|
||||
Quota::setQuota('Liga Platz 2',request('liga_platz2'), $currentSeason->id);
|
||||
Quota::setQuota('Liga Platz 3',request('liga_platz3'), $currentSeason->id);
|
||||
|
||||
// Redirect to the home page
|
||||
return redirect('/seasons');
|
||||
}
|
||||
public function setcurrent($new_season_id) {
|
||||
if (Auth::guest()) { return redirect("/"); }
|
||||
if (!Auth::user()->admin) { return redirect("/"); }
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ use App\Payment;
|
|||
use App\Round;
|
||||
use App\Game;
|
||||
use App\Tipp;
|
||||
use App\Quota;
|
||||
use DB;
|
||||
use Auth;
|
||||
use Log;
|
||||
|
|
@ -23,13 +24,13 @@ class UsersController extends Controller
|
|||
$currentSeason=Season::getCurrent();
|
||||
|
||||
if ($currentSeason) {
|
||||
$round_id = Round::getLastLockedRoundId();
|
||||
$round_id = Round::getLastCompleteRoundId();
|
||||
if ($round_id > -1) {
|
||||
$round = Round::where("id", "=", $round_id)->first();
|
||||
$report = $round->report;
|
||||
Log::info("Loaded report:".$report." round-id=".$round_id);
|
||||
$roundname = $round->name;
|
||||
} else { Log::info("No round identified. Last Locked=".$round_id); }
|
||||
} else { Log::info("No round identified. Last Locked=".$round_id); $report="";}
|
||||
} else {Log::info("No current season");}
|
||||
|
||||
return view('main',compact('roundname','report'));
|
||||
|
|
@ -186,9 +187,17 @@ class UsersController extends Controller
|
|||
$roundtipps[$key]['dayscore']=0;
|
||||
|
||||
$roundtipps[$key]['earliest_kickoff']=$entry->game_kickoff;
|
||||
$roundtipps[$key]['hits']=0; // Wenigstens Tendenz getroffen. Wenn 4, dann 2 Punkte Bonus auf rankscore
|
||||
}
|
||||
$roundtipps[$key]['rankscore']+=Tipp::getScoreLocal($entry->game_score1,$entry->game_score2,$entry->tipp_score1,$entry->tipp_score2,$entry->joker); // Für alle 4 Spiele
|
||||
if ($user_id==1) {Log::info("Calculating rankscore for round_id ".$round_id." to ".$roundtipps[$key]['rankscore']);}
|
||||
$game_value=Tipp::getScoreLocal($entry->game_score1,$entry->game_score2,$entry->tipp_score1,$entry->tipp_score2,$entry->joker); // Für alle 4 Spiele
|
||||
$roundtipps[$key]['rankscore']+=$game_value;
|
||||
if($game_value>0) { $roundtipps[$key]['hits']+=1;}
|
||||
|
||||
|
||||
|
||||
if ($roundtipps[$key]['hits']==4) {$roundtipps[$key]['rankscore']+=2;} // Wenn alle 4 Spiele mind. Tendenz, dann 2 Punkte Bonus
|
||||
|
||||
|
||||
|
||||
|
||||
// START: Add Up Dayscore Win Values for each round
|
||||
|
|
@ -308,30 +317,56 @@ class UsersController extends Controller
|
|||
// Ranknr identifizieren, inkl, geteilter Rankplatzierungen
|
||||
$lastScore=-1;
|
||||
$lastrank=0;
|
||||
$current_list_position=0;
|
||||
$highest_dayscore=0;
|
||||
foreach($rankingDisplay as $key => $user) {
|
||||
$current_list_position+=1;
|
||||
if ($user["rankscore_total"]==$lastScore) {
|
||||
$rankingDisplay[$key]["rank"] = $lastrank;
|
||||
} else {
|
||||
$lastrank +=1;
|
||||
$rankingDisplay[$key]["rank"] = $lastrank;
|
||||
$lastrank = $current_list_position;
|
||||
$rankingDisplay[$key]["rank"] = $current_list_position;
|
||||
$lastScore = $user["rankscore_total"];
|
||||
}
|
||||
|
||||
if ($user["dayscore"]>$highest_dayscore) { $highest_dayscore = $user["dayscore"]; }
|
||||
}
|
||||
|
||||
Log::info("Searching for dayscore winners. Highest dayscore=".$highest_dayscore);
|
||||
|
||||
// is_dayscorewinner setzen (Tagessieg)
|
||||
// Nur wenn alle Spiele eingetragen=gespielt sind !
|
||||
Log::info("Searching for dayscore winners. Highest dayscore=".$highest_dayscore);
|
||||
$daywinner_count=0;
|
||||
$round_completed = Round::isCompleted($max_round_id);
|
||||
foreach($rankingDisplay as $key => $user) {
|
||||
if ($user["dayscore"]>0 && $user["dayscore"]==$highest_dayscore && $round_completed) {
|
||||
$rankingDisplay[$key]["is_dayscorewinner"]=1;
|
||||
$daywinner_count+=1;
|
||||
Log::info("Setting dayscorewin for player:".$user["user_name"]);
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: if ($daywinner_count > 6) { ... }
|
||||
|
||||
// Compute Dayscorewin payout (Tagessieg)
|
||||
$payouts = Quota::getPayouts($currentSeason->id);
|
||||
$single_payout=0;
|
||||
|
||||
if ($daywinner_count>0) {
|
||||
$single_payout = $payouts["Tagessieg"] / $daywinner_count ;
|
||||
$single_payout = number_format((float)$single_payout, 2, '.', '');
|
||||
$single_payout = str_replace(".",",",$single_payout);
|
||||
}
|
||||
|
||||
foreach($rankingDisplay as $key => $user) {
|
||||
if ($user["is_dayscorewinner"]==1) {
|
||||
$rankingDisplay[$key]['payout']=$single_payout;
|
||||
} else {
|
||||
$rankingDisplay[$key]['payout']='';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Store game results as separate array. Wir nutzen aus, dass die Ergebnisse in jeder Zeile
|
||||
// von Rankingdisplay abgespeichert sind.
|
||||
$game_results=array(); // 4 Spielergebnisse der angezeigten Runde
|
||||
|
|
@ -345,6 +380,16 @@ class UsersController extends Controller
|
|||
return ($user1['rankscore_total'] < $user2['rankscore_total']);
|
||||
}
|
||||
|
||||
public function show_payouts() {
|
||||
$currentSeason = Season::getCurrent();
|
||||
|
||||
$active_user_count = sizeof( DB::table('payments')->where('season_id',$currentSeason->id)->whereNotNull('paid_date')->get() );
|
||||
$einsatz = Quota::getQuota($currentSeason->id,"Einsatz");
|
||||
$payouts = Quota::getPayouts($currentSeason->id);
|
||||
|
||||
Log::info("EINSATZ=".$einsatz);
|
||||
|
||||
return view('users.show_payouts', compact('payouts','active_user_count','einsatz','currentSeason'));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue