@@ -157,8 +157,9 @@ |
||
157 | 157 | |
158 | 158 | public function buildName() |
159 | 159 | { |
160 | - if ($this->settings != null && $this->settings->alias != null && $this->settings->alias != '') |
|
161 | - return $this->settings->alias; |
|
160 | + if ($this->settings != null && $this->settings->alias != null && $this->settings->alias != '') { |
|
161 | + return $this->settings->alias; |
|
162 | + } |
|
162 | 163 | |
163 | 164 | if ($this->hasNoCustomSettings()) { |
164 | 165 | return $this->category->name; |
@@ -69,8 +69,12 @@ |
||
69 | 69 | */ |
70 | 70 | private function defaultName() |
71 | 71 | { |
72 | - if ($this == null) return "BYE"; |
|
73 | - if ($this->user == null) return "BYE"; |
|
72 | + if ($this == null) { |
|
73 | + return "BYE"; |
|
74 | + } |
|
75 | + if ($this->user == null) { |
|
76 | + return "BYE"; |
|
77 | + } |
|
74 | 78 | return null; |
75 | 79 | } |
76 | 80 |
@@ -6,18 +6,12 @@ |
||
6 | 6 | use Illuminate\Http\Request; |
7 | 7 | use Illuminate\Routing\Controller; |
8 | 8 | use Illuminate\Support\Facades\DB; |
9 | -use Xoco70\KendoTournaments\Contracts\TreeGenerable; |
|
10 | 9 | use Xoco70\KendoTournaments\Exceptions\TreeGenerationException; |
11 | 10 | use Xoco70\KendoTournaments\Models\Championship; |
12 | 11 | use Xoco70\KendoTournaments\Models\ChampionshipSettings; |
13 | 12 | use Xoco70\KendoTournaments\Models\Competitor; |
14 | 13 | use Xoco70\KendoTournaments\Models\FightersGroup; |
15 | 14 | use Xoco70\KendoTournaments\Models\Tournament; |
16 | -use Xoco70\KendoTournaments\TreeGen\DirectEliminationCompetitorTreeGen; |
|
17 | -use Xoco70\KendoTournaments\TreeGen\DirectEliminationTeamTreeGen; |
|
18 | -use Xoco70\KendoTournaments\TreeGen\PlayOffCompetitorTreeGen; |
|
19 | -use Xoco70\KendoTournaments\TreeGen\PlayOffTeamTreeGen; |
|
20 | -use Xoco70\KendoTournaments\TreeGen\TreeGen; |
|
21 | 15 | |
22 | 16 | class TreeController extends Controller |
23 | 17 | { |
@@ -203,7 +203,9 @@ |
||
203 | 203 | $fightsByRound = $championship->fightsByRound($numRound)->with('group.parent')->get(); |
204 | 204 | foreach ($fightsByRound as $fight) { |
205 | 205 | $parentGroup = $fight->group->parent; |
206 | - if ($parentGroup == null) break; |
|
206 | + if ($parentGroup == null) { |
|
207 | + break; |
|
208 | + } |
|
207 | 209 | $parentFight = $parentGroup->fights->get(0); //TODO This Might change when extending to Preliminary |
208 | 210 | |
209 | 211 | // IN this $fight, is c1 or c2 has the info? |