@@ -111,15 +111,15 @@ |
||
111 | 111 | { |
112 | 112 | $isTeam = $this->group->championship->category->isTeam; |
113 | 113 | if ($isTeam) { |
114 | - $teamToUpdate = 'team'.$numFighter; |
|
114 | + $teamToUpdate = 'team' . $numFighter; |
|
115 | 115 | |
116 | 116 | return optional($this->$teamToUpdate)->$attr; |
117 | 117 | } |
118 | - $competitorToUpdate = 'competitor'.$numFighter; |
|
118 | + $competitorToUpdate = 'competitor' . $numFighter; |
|
119 | 119 | if ($attr == 'name') { |
120 | 120 | return $this->$competitorToUpdate == null |
121 | 121 | ? 'BYE' |
122 | - : $this->$competitorToUpdate->user->firstname.' '.$this->$competitorToUpdate->user->lastname; |
|
122 | + : $this->$competitorToUpdate->user->firstname . ' ' . $this->$competitorToUpdate->user->lastname; |
|
123 | 123 | } elseif ($attr == 'short_id') { |
124 | 124 | return optional($this->$competitorToUpdate)->short_id; |
125 | 125 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * Create empty groups for direct Elimination Tree. |
52 | 52 | * |
53 | - * @param $numFighters |
|
53 | + * @param integer $numFighters |
|
54 | 54 | */ |
55 | 55 | protected function pushEmptyGroupsToTree($numFighters) |
56 | 56 | { |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | |
148 | 148 | /** |
149 | 149 | * @param Collection $usersByArea |
150 | - * @param $round |
|
150 | + * @param integer $round |
|
151 | 151 | */ |
152 | 152 | public function generateGroupsForRound(Collection $usersByArea, $round) |
153 | 153 | { |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | $prefix = "singleElimination"; |
3 | -if ($championship->hasPreliminary() && $numRound ==1){ |
|
3 | +if ($championship->hasPreliminary() && $numRound == 1) { |
|
4 | 4 | $prefix = "preliminary"; |
5 | 5 | } |
6 | -$className = $prefix."_select"; |
|
7 | -$selectName = $prefix."_fighters[]"; |
|
6 | +$className = $prefix . "_select"; |
|
7 | +$selectName = $prefix . "_fighters[]"; |
|
8 | 8 | ?> |
9 | 9 | <select name="{{ $selectName }}" class={{$className}}> |
10 | 10 | <option {{ $selected == '' ? ' selected' : '' }} ></option> |
@@ -25,8 +25,8 @@ |
||
25 | 25 | @foreach ($treeGen->brackets as $roundNumber => $round) |
26 | 26 | @foreach ($round as $matchNumber => $match) |
27 | 27 | <?php |
28 | - $isAWinner = (optional($match['playerA'])->id == $match['winner_id'] && $match['winner_id']!=null) ? 'X' : null; |
|
29 | - $isBWinner = (optional($match['playerB'])->id == $match['winner_id'] && $match['winner_id']!=null) ? 'X' : null; |
|
28 | + $isAWinner = (optional($match['playerA'])->id == $match['winner_id'] && $match['winner_id'] != null) ? 'X' : null; |
|
29 | + $isBWinner = (optional($match['playerB'])->id == $match['winner_id'] && $match['winner_id'] != null) ? 'X' : null; |
|
30 | 30 | ?> |
31 | 31 | <div class="match-wrapper" |
32 | 32 | style="top: {{ $match['matchWrapperTop'] }}px; left: {{ $match['matchWrapperLeft'] }}px; width: {{ $treeGen->matchWrapperWidth }}px;"> |
@@ -26,7 +26,7 @@ |
||
26 | 26 | $this->groupsByRound = $groupsByRound; |
27 | 27 | $this->hasPreliminary = $hasPreliminary; |
28 | 28 | |
29 | - $this->firstRoundName = $groupsByRound->first()->map(function ($item) use ($championship) { |
|
29 | + $this->firstRoundName = $groupsByRound->first()->map(function($item) use ($championship) { |
|
30 | 30 | $fighters = $item->getFightersWithBye(); |
31 | 31 | $fighter1 = $fighters->get(0); |
32 | 32 | $fighter2 = $fighters->get(1); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * |
31 | 31 | * @param $fightersByEntity |
32 | 32 | * |
33 | - * @return mixed |
|
33 | + * @return Collection |
|
34 | 34 | */ |
35 | 35 | protected function chunkAndShuffle(Collection $fightersByEntity) |
36 | 36 | { |
@@ -97,6 +97,9 @@ discard block |
||
97 | 97 | } |
98 | 98 | } |
99 | 99 | |
100 | + /** |
|
101 | + * @param integer $round |
|
102 | + */ |
|
100 | 103 | protected function generateGroupsForRound(Collection $fightersByArea, $round) |
101 | 104 | { |
102 | 105 | $fightersId = $fightersByArea->pluck('id'); |