|
@@ -25,7 +25,7 @@ discard block |
|
|
block discarded – undo |
|
25
|
25
|
$this->championship = $championship; |
|
26
|
26
|
$this->names = $names; |
|
27
|
27
|
|
|
28
|
|
- $this->firstRoundName = $names->first()->map(function ($item) use ($championship) { |
|
|
28
|
+ $this->firstRoundName = $names->first()->map(function($item) use ($championship) { |
|
29
|
29
|
$fighters = $item->getFighters(); |
|
30
|
30
|
$fighter1 = $fighters->get(0); |
|
31
|
31
|
$fighter2 = $fighters->get(1); |
|
@@ -65,12 +65,12 @@ discard block |
|
|
block discarded – undo |
|
65
|
65
|
|
|
66
|
66
|
for ($roundNumber += 1; $roundNumber <= $this->noRounds; $roundNumber++) { |
|
67
|
67
|
for ($matchNumber = 1; $matchNumber <= ($this->noTeams / pow(2, $roundNumber)); $matchNumber++) { |
|
68
|
|
- if ($this->championship->category->isTeam()){ |
|
69
|
|
- $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team1; |
|
70
|
|
- $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team2; |
|
71
|
|
- }else{ |
|
72
|
|
- $fighter1 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor1; |
|
73
|
|
- $fighter2 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor2; |
|
|
68
|
+ if ($this->championship->category->isTeam()) { |
|
|
69
|
+ $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber - 1]->team1; |
|
|
70
|
+ $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber - 1]->team2; |
|
|
71
|
+ } else { |
|
|
72
|
+ $fighter1 = $this->names->get($roundNumber)[$matchNumber - 1]->fights[0]->competitor1; |
|
|
73
|
+ $fighter2 = $this->names->get($roundNumber)[$matchNumber - 1]->fights[0]->competitor2; |
|
74
|
74
|
} |
|
75
|
75
|
$this->brackets[$roundNumber][$matchNumber] = [$fighter1, $fighter2]; |
|
76
|
76
|
} |
|
@@ -229,7 +229,7 @@ discard block |
|
|
block discarded – undo |
|
229
|
229
|
} |
|
230
|
230
|
|
|
231
|
231
|
if ($bracket['playerB'] != '') { |
|
232
|
|
- $html .= '<option' . ($selected == $bracket['playerB'] ? ' selected' : '') . '>' . $bracket['playerB']->getName(). '</option>'; |
|
|
232
|
+ $html .= '<option' . ($selected == $bracket['playerB'] ? ' selected' : '') . '>' . $bracket['playerB']->getName() . '</option>'; |
|
233
|
233
|
} |
|
234
|
234
|
} |
|
235
|
235
|
|