@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | -$default_top1 =30; |
|
3 | -$default_top2 =81; |
|
2 | +$default_top1 = 30; |
|
3 | +$default_top2 = 81; |
|
4 | 4 | |
5 | -$top1 = $default_top1 + ($numGroup-1) * 204; |
|
6 | -$top2 = $default_top2 + ($numGroup-1) * 204; |
|
5 | +$top1 = $default_top1 + ($numGroup - 1) * 204; |
|
6 | +$top2 = $default_top2 + ($numGroup - 1) * 204; |
|
7 | 7 | |
8 | 8 | $default_left = 189; |
9 | -$left = $default_left * ($numRound-1); |
|
9 | +$left = $default_left * ($numRound - 1); |
|
10 | 10 | |
11 | 11 | |
12 | 12 | ?> |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | use Xoco70\KendoTournaments\TreeGen\CreateDirectEliminationTree; |
3 | 3 | // Used to regenerate _lft and _rgt |
4 | -foreach ($championship->fightersGroups as $group){ |
|
4 | +foreach ($championship->fightersGroups as $group) { |
|
5 | 5 | $group->fixTree(); |
6 | 6 | } |
7 | 7 | $directEliminationTree = $championship->fightersGroups->groupBy('round'); |
@@ -26,7 +26,7 @@ |
||
26 | 26 | |
27 | 27 | public function getFullNameAttribute() |
28 | 28 | { |
29 | - if ($this instanceof Competitor){ |
|
29 | + if ($this instanceof Competitor) { |
|
30 | 30 | return $this->getFullName(); |
31 | 31 | } |
32 | 32 | return $this->name; |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | use Xoco70\KendoTournaments\Models\Team; |
4 | -$factory->define(Team::class, function (Faker\Generator $faker) { |
|
4 | +$factory->define(Team::class, function(Faker\Generator $faker) { |
|
5 | 5 | |
6 | 6 | return [ |
7 | 7 | 'name' => $faker->name, |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('users', function (Blueprint $table) { |
|
15 | + Schema::create('users', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('name'); |
18 | 18 | $table->string('firstname'); |
@@ -2,9 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Xoco70\KendoTournaments\Models; |
4 | 4 | |
5 | -use Illuminate\Database\Eloquent\Model; |
|
6 | -use Illuminate\Support\Collection; |
|
7 | - |
|
8 | 5 | class DirectEliminationFight extends Fight |
9 | 6 | { |
10 | 7 | public function __construct(Fight $fight = null) |
@@ -9,12 +9,12 @@ |
||
9 | 9 | { |
10 | 10 | public function __construct(Fight $fight = null) |
11 | 11 | { |
12 | - if ($fight!=null){ |
|
13 | - $this->id= $fight->id; |
|
14 | - $this->short_id= $fight->short_id; |
|
15 | - $this->fighters_group_id= $fight->fighters_group_id; |
|
16 | - $this->c1= $fight->c1; |
|
17 | - $this->c2= $fight->c2; |
|
12 | + if ($fight != null) { |
|
13 | + $this->id = $fight->id; |
|
14 | + $this->short_id = $fight->short_id; |
|
15 | + $this->fighters_group_id = $fight->fighters_group_id; |
|
16 | + $this->c1 = $fight->c1; |
|
17 | + $this->c2 = $fight->c2; |
|
18 | 18 | } |
19 | 19 | } |
20 | 20 | /** |
@@ -9,12 +9,12 @@ |
||
9 | 9 | |
10 | 10 | public function __construct(Fight $fight = null) |
11 | 11 | { |
12 | - if ($fight!=null){ |
|
13 | - $this->id= $fight->id; |
|
14 | - $this->short_id= $fight->short_id; |
|
15 | - $this->fighters_group_id= $fight->fighters_group_id; |
|
16 | - $this->c1= $fight->c1; |
|
17 | - $this->c2= $fight->c2; |
|
12 | + if ($fight != null) { |
|
13 | + $this->id = $fight->id; |
|
14 | + $this->short_id = $fight->short_id; |
|
15 | + $this->fighters_group_id = $fight->fighters_group_id; |
|
16 | + $this->c1 = $fight->c1; |
|
17 | + $this->c2 = $fight->c2; |
|
18 | 18 | } |
19 | 19 | } |
20 | 20 |
@@ -180,7 +180,7 @@ |
||
180 | 180 | public function hasDeterminedParent() |
181 | 181 | { |
182 | 182 | // There is more than 1 fight, should be Preliminary |
183 | - if (sizeof($this->fighters()) > 1){ |
|
183 | + if (sizeof($this->fighters()) > 1) { |
|
184 | 184 | return false; |
185 | 185 | } |
186 | 186 | foreach ($this->children as $child) { |
@@ -184,7 +184,9 @@ |
||
184 | 184 | return false; |
185 | 185 | } |
186 | 186 | foreach ($this->children as $child) { |
187 | - if (sizeof($child->fighters()) > 1) return false; |
|
187 | + if (sizeof($child->fighters()) > 1) { |
|
188 | + return false; |
|
189 | + } |
|
188 | 190 | } |
189 | 191 | return true; |
190 | 192 |
@@ -46,7 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | protected static function getFightersWithByes(FightersGroup $group) |
48 | 48 | { |
49 | - if ($group == null) return null; |
|
49 | + if ($group == null) { |
|
50 | + return null; |
|
51 | + } |
|
50 | 52 | $fighters = $group->getFighters(); |
51 | 53 | $fighterType = $group->getFighterType(); |
52 | 54 | if (sizeof($fighters) == 0) { |
@@ -121,8 +123,12 @@ discard block |
||
121 | 123 | |
122 | 124 | public function shouldBeInFightList() |
123 | 125 | { |
124 | - if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) return false; |
|
125 | - if ($this->has2Fighters()) return true; |
|
126 | + if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) { |
|
127 | + return false; |
|
128 | + } |
|
129 | + if ($this->has2Fighters()) { |
|
130 | + return true; |
|
131 | + } |
|
126 | 132 | // We aint in the first round, and there is 1 or 0 competitor |
127 | 133 | // We check children, and see : |
128 | 134 | // if there is 2 - 2 fighters -> undetermine, we cannot add it to fight list |
@@ -148,7 +154,9 @@ discard block |
||
148 | 154 | private function belongsToFirstRound() |
149 | 155 | { |
150 | 156 | $firstRoundFights = $this->group->championship->firstRoundFights->pluck('id')->toArray(); |
151 | - if (in_array($this->id, $firstRoundFights)) return true; |
|
157 | + if (in_array($this->id, $firstRoundFights)) { |
|
158 | + return true; |
|
159 | + } |
|
152 | 160 | return false; |
153 | 161 | } |
154 | 162 |