From 08ffdf5609895e1807ed9621e6155bf40a15df5b Mon Sep 17 00:00:00 2001 From: Torsten Date: Fri, 12 Jan 2018 08:40:42 +0100 Subject: [PATCH] GreenShirt Display in Ranking --- .../app/Http/Controllers/UsersController.php | 1 + pfosten/app/Tipp.php | 20 ++++++++++++++++ pfosten/public/img/green_shirt.png | Bin 0 -> 2110 bytes .../resources/views/users/ranking.blade.php | 22 +++++++----------- 4 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 pfosten/public/img/green_shirt.png diff --git a/pfosten/app/Http/Controllers/UsersController.php b/pfosten/app/Http/Controllers/UsersController.php index 81de80af..6775d281 100755 --- a/pfosten/app/Http/Controllers/UsersController.php +++ b/pfosten/app/Http/Controllers/UsersController.php @@ -279,6 +279,7 @@ class UsersController extends Controller $rankingDisplay[$user_id]["gshirt_score"] = $roundtipps[$key]["gshirt_score"]; $rankingDisplay[$user_id]["gshirt_totalscore"] = $roundtipps[$key]["gshirt_totalscore"]; $rankingDisplay[$user_id]["gshirt_foulcount"] = $roundtipps[$key]["gshirt_foulcount"]; + $rankingDisplay[$user_id]["gshirt_leader"] = $roundtipps[$key]["gshirt_leader"]; diff --git a/pfosten/app/Tipp.php b/pfosten/app/Tipp.php index 1f2bdcd6..03eaeb27 100755 --- a/pfosten/app/Tipp.php +++ b/pfosten/app/Tipp.php @@ -507,6 +507,7 @@ class Tipp extends Model } // B) SET GSCORE TOTAL EVERY ROUND ( and take fouls into consideration ) + $maxScorePerRound=array(); foreach($user_ids as $user_id) { $foulCount=0; $totalScore=0; @@ -514,6 +515,8 @@ class Tipp extends Model foreach ($round_ids as $round_id) { $key = $round_id . "_" . $user_id; + if (!array_key_exists($round_id, $maxScorePerRound)) { $maxScorePerRound[$round_id]=0; } + $score = $roundtipps[$key]['gshirt_score']; $isFoul = ( $roundtipps[$key]['rankscore'] == 0 && $totalScore > 0 ); if ($isFoul) { @@ -522,10 +525,14 @@ class Tipp extends Model if ($foulCount==3) { $foulCount=0; $totalScore=0; + $roundtipps[$key]['gshirt_foul_reset']=1; + } else { + $roundtipps[$key]['gshirt_foul_reset']=0; } } $lastTotalRankScore= $totalScore += $score; + if ($totalScore > $maxScorePerRound[$round_id]) { $maxScorePerRound[$round_id]=$totalScore; } $roundtipps[$key]['gshirt_totalscore']=$totalScore; $roundtipps[$key]['gshirt_foulcount']=$foulCount; @@ -534,6 +541,19 @@ class Tipp extends Model } } + // C) Set gscore_leader + foreach ($round_ids as $round_id) { + foreach($user_ids as $user_id) { + $key = $round_id . "_" . $user_id; + if ($roundtipps[$key]['gshirt_totalscore'] == $maxScorePerRound[$round_id] && $maxScorePerRound[$round_id]>0 ) { + $roundtipps[$key]['gshirt_leader'] =1; + } else { + $roundtipps[$key]['gshirt_leader'] =0; + } + } + + } + //dd("User 11 Round 1 gshirt_score =".$roundtipps['1_11']['gshirt_score'].", totalscore=".$roundtipps['1_11']['gshirt_totalscore']); diff --git a/pfosten/public/img/green_shirt.png b/pfosten/public/img/green_shirt.png new file mode 100644 index 0000000000000000000000000000000000000000..0fe1946288c9ab2f2d653ab0ccf40c1d65ba5636 GIT binary patch literal 2110 zcmeAS@N?(olHy`uVBq!ia0vp^3P3E$!2~4l=k7iRq!^2X+?^QKos)S9vL>4nJ za0`PlBg3pY5)2G1N|_-MB@w}FfdWk9dNvV1jxdlMg3=B3ERzPNMYDuC(MQ%=B zu~mhw5?F;5kPQ;nS5g2gDap1~itr6kaLzAERWQ{v(KAr8<5EyiuqjGOvkG!?gK7uz zY?U%fN(!v>^~=l4^~#O)@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#s zF3Kz@$;{7F0GXSZlwVq6tE2?72o50bEXhnm*pycc^%l^B`XCv7Lp=k1Y}!&QGI3}F z$>7wMk_`7%L1|GA*iR|R`l&goxv6<2#Xxrw z!M`XI=+i`yyX*|179fkEtB=HH0kR;H22jvj1!PvF=0vz;0s|E63uBiq%kGgs<<>MD>b0hnQAY@?5+2FV2=8Rw$Z#FG4? zko^1{JFqWuL0ko6Ju`?-WO=Ao8+}kNLdsQ;EDII|=2<%~piWr+x8oA|ROH0Kz`WJd z#WBQ#cWr2NhH$2c-GBSAmx5{X>(GlOesf0p2H{4la6bDf0!pPvuZ*iXJpgI`g`-`UvRG9uXSB5 z^6sa3Y>5i20<&2p7RQ7vWScx?kz3}RcvdEMwR>loEqVBsxi73*@%BZZacH!b*po0e zH6A+|8~dt~MITpQW}gtT;pE?g2EJSpTAzf@@brGU^SkwbOY;pGgMOyizF^t4b9-D) z+}OSG^+WH!>x>WeS<1cTo+(Mtpa*OgC->&ugqnha0&BWYUcq(r7yxt8FGH=9~s^3?KZY>X&W)=I!vd?$l!jP63 zY@G#>?oZzAT>qQZ*R;^6%eiRUyc<7Xf7}`UXKvTbeuoQJ*)vjZ$1dG8HPktEv(&vG z^CVZw^VNo5-@J8QT2@V4wQf>y*P;Vgl4Cl%DgN?Tb4~ zAAU?V`w>_7+UCl|*5+0rM*$V*i#!P*Ht28^a0ZIqS+QeT&DWKs`|s56dEft>`D%4` zz@*BIYZd9Xl7%l`W&hm$m9c$q6yFUqj^FFA{+HDFo?dFq_uRVak<9ywMLHHMuOIN! zotFN#_}@cs(aCzt56@ISEtSS07OTX(HsR&{4y9vAKs7^CDbpUWw7E?K3^ zlVO4bTYp3MN`V{>29bN+r%Qi&9#x;oB>wTn*=F6wQ`Ovgd;e%mbV#k$Rtu1kyRd2R zsqeF=J$QWFE6Mils?6Dqv%^;$yE(J=(c#P^UaLG3n4_5@12SSFrX2{na6q>r_s?US zTL+#N6weAc^G{7G@aXvy4wEc>wbYn}o~PVP6@LClPpd-Rdd{MET}B6<bog4{iL%zauo}&6;~m0-#FW)78&qol`;+00q!ArvLx| literal 0 HcmV?d00001 diff --git a/pfosten/resources/views/users/ranking.blade.php b/pfosten/resources/views/users/ranking.blade.php index aa5757c0..9650e574 100755 --- a/pfosten/resources/views/users/ranking.blade.php +++ b/pfosten/resources/views/users/ranking.blade.php @@ -60,6 +60,12 @@ Tagessieg + +
+ Grünes Trikot +
+ +
Spieler @@ -75,17 +81,6 @@ Punkte Tag
-   - -
- G-Rang -
- - -
- grünes Trikot -
-   @@ -169,13 +164,12 @@   {{ $entry["rank"] }} 
+ +      {{ $entry["user_name"] }}    {{ $entry["totalRankScore"] }}   {{ $entry["rankscore"] }}      -  {{ $entry["grank"] }}  -  (+{{ $entry["gshirt_score"]}})
{{$entry["gshirt_totalscore"]}}
{{$entry["gshirt_foulcount"]." Fouls" }}  -      {{ str_replace("-1","x",$entry["tipp_score1"]) }}   {{ str_replace("-1","x",$entry["tipp_score2"]) }}