@@ -77,11 +77,11 @@ |
||
77 | 77 | FightersGroup::generateFights($groups, $settings, $championship); |
78 | 78 | } catch (TreeGenerationException $e) { |
79 | 79 | redirect()->back() |
80 | - ->withErrors([$numFighters ."-".$e->getMessage()]); |
|
80 | + ->withErrors([$numFighters . "-" . $e->getMessage()]); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | return redirect()->back() |
84 | 84 | ->with('numFighters', $numFighters) |
85 | - ->with(['success' , "Success"]); |
|
85 | + ->with(['success', "Success"]); |
|
86 | 86 | } |
87 | 87 | } |
@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('competitor_team', function (Blueprint $table) { |
|
16 | + Schema::create('competitor_team', function(Blueprint $table) { |
|
17 | 17 | $table->increments('id'); |
18 | 18 | $table->integer('team_id')->unsigned()->nullable()->index(); |
19 | 19 | $table->integer('competitor_id')->unsigned()->index(); |
@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('fighters_groups', function (Blueprint $table) { |
|
16 | + Schema::create('fighters_groups', function(Blueprint $table) { |
|
17 | 17 | $table->increments('id'); |
18 | 18 | $table->tinyInteger('short_id'); |
19 | 19 | $table->integer('championship_id')->unsigned()->index(); |
@@ -11,11 +11,11 @@ |
||
11 | 11 | public $timestamps = true; |
12 | 12 | |
13 | 13 | |
14 | - public function group(){ |
|
14 | + public function group() { |
|
15 | 15 | return $this->belongsTo(FightersGroup::class); |
16 | 16 | } |
17 | 17 | |
18 | - public function team(){ |
|
18 | + public function team() { |
|
19 | 19 | return $this->belongsTo(Team::class); |
20 | 20 | } |
21 | 21 | } |
22 | 22 | \ No newline at end of file |
@@ -12,11 +12,11 @@ |
||
12 | 12 | |
13 | 13 | |
14 | 14 | |
15 | - public function group(){ |
|
15 | + public function group() { |
|
16 | 16 | return $this->belongsTo(FightersGroup::class); |
17 | 17 | } |
18 | 18 | |
19 | - public function competitor(){ |
|
19 | + public function competitor() { |
|
20 | 20 | return $this->belongsTo(Competitor::class); |
21 | 21 | } |
22 | 22 | } |
23 | 23 | \ No newline at end of file |
@@ -7,9 +7,9 @@ |
||
7 | 7 | { |
8 | 8 | public function up() |
9 | 9 | { |
10 | - Schema::create('team', function (Blueprint $table) { |
|
10 | + Schema::create('team', function(Blueprint $table) { |
|
11 | 11 | $table->increments('id'); |
12 | - $table->integer('short_id')->unsigned()->nullable() ; |
|
12 | + $table->integer('short_id')->unsigned()->nullable(); |
|
13 | 13 | $table->string('name'); |
14 | 14 | $table->integer('championship_id')->unsigned()->index(); // A checar |
15 | 15 | $table->string('picture')->nullable(); |
@@ -45,7 +45,9 @@ |
||
45 | 45 | |
46 | 46 | public function getName() |
47 | 47 | { |
48 | - if ($this == null) return "BYE"; |
|
48 | + if ($this == null) { |
|
49 | + return "BYE"; |
|
50 | + } |
|
49 | 51 | return $this->name; |
50 | 52 | } |
51 | 53 |
@@ -65,7 +65,9 @@ discard block |
||
65 | 65 | $matches = array_chunk($fighters, 2); |
66 | 66 | |
67 | 67 | //If there's already a match in the match array, then that means the next round is round 2, so increase the round number |
68 | - if (count($this->brackets)) $roundNumber++; |
|
68 | + if (count($this->brackets)) { |
|
69 | + $roundNumber++; |
|
70 | + } |
|
69 | 71 | |
70 | 72 | $countMatches = count($matches); |
71 | 73 | //Create the first full round of fighters, some may be blank if waiting on the results of a previous round |
@@ -80,7 +82,7 @@ discard block |
||
80 | 82 | if ($this->championship->category->isTeam()){ |
81 | 83 | $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team1; |
82 | 84 | $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team2; |
83 | - }else{ |
|
85 | + } else{ |
|
84 | 86 | $fighter1 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor1; |
85 | 87 | $fighter2 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor2; |
86 | 88 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $this->championship = $championship; |
26 | 26 | $this->names = $names; |
27 | 27 | |
28 | - $this->firstRoundName = $names->first()->map(function ($item, $key) use ($championship) { |
|
28 | + $this->firstRoundName = $names->first()->map(function($item, $key) use ($championship) { |
|
29 | 29 | $fighters = $item->getFighters(); |
30 | 30 | $fighter1 = $fighters->get(0); |
31 | 31 | $fighter2 = $fighters->get(1); |
@@ -77,12 +77,12 @@ discard block |
||
77 | 77 | |
78 | 78 | for ($roundNumber += 1; $roundNumber <= $this->noRounds; $roundNumber++) { |
79 | 79 | for ($matchNumber = 1; $matchNumber <= ($this->noTeams / pow(2, $roundNumber)); $matchNumber++) { |
80 | - if ($this->championship->category->isTeam()){ |
|
81 | - $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team1; |
|
82 | - $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team2; |
|
83 | - }else{ |
|
84 | - $fighter1 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor1; |
|
85 | - $fighter2 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor2; |
|
80 | + if ($this->championship->category->isTeam()) { |
|
81 | + $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber - 1]->team1; |
|
82 | + $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber - 1]->team2; |
|
83 | + } else { |
|
84 | + $fighter1 = $this->names->get($roundNumber)[$matchNumber - 1]->fights[0]->competitor1; |
|
85 | + $fighter2 = $this->names->get($roundNumber)[$matchNumber - 1]->fights[0]->competitor2; |
|
86 | 86 | } |
87 | 87 | $this->brackets[$roundNumber][$matchNumber] = [$fighter1, $fighter2]; |
88 | 88 | } |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | } |
242 | 242 | |
243 | 243 | if ($bracket['playerB'] != '') { |
244 | - $html .= '<option' . ($selected == $bracket['playerB'] ? ' selected' : '') . '>' . $bracket['playerB']->getName(). '</option>'; |
|
244 | + $html .= '<option' . ($selected == $bracket['playerB'] ? ' selected' : '') . '>' . $bracket['playerB']->getName() . '</option>'; |
|
245 | 245 | } |
246 | 246 | } |
247 | 247 |
@@ -86,15 +86,23 @@ |
||
86 | 86 | |
87 | 87 | public function getName() |
88 | 88 | { |
89 | - if ($this == null) return "BYE"; |
|
90 | - if ($this->user == null) return "BYE"; |
|
89 | + if ($this == null) { |
|
90 | + return "BYE"; |
|
91 | + } |
|
92 | + if ($this->user == null) { |
|
93 | + return "BYE"; |
|
94 | + } |
|
91 | 95 | return $this->user->name; |
92 | 96 | } |
93 | 97 | |
94 | 98 | public function getFullName() |
95 | 99 | { |
96 | - if ($this == null) return "BYE"; |
|
97 | - if ($this->user == null) return "BYE"; |
|
100 | + if ($this == null) { |
|
101 | + return "BYE"; |
|
102 | + } |
|
103 | + if ($this->user == null) { |
|
104 | + return "BYE"; |
|
105 | + } |
|
98 | 106 | return $this->user->firstname . " " . $this->user->lastname; |
99 | 107 | } |
100 | 108 |