@@ -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 |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Illuminate\Support\Facades\App; |
7 | 7 | use Xoco70\KendoTournaments\Models\Championship; |
8 | 8 | use Xoco70\KendoTournaments\Models\DirectEliminationFight; |
9 | -use Xoco70\KendoTournaments\Models\Fight; |
|
10 | 9 | |
11 | 10 | abstract class DirectEliminationTreeGen extends TreeGen |
12 | 11 | { |
@@ -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); |
@@ -44,7 +44,9 @@ discard block |
||
44 | 44 | */ |
45 | 45 | protected static function getFightersWithByes(FightersGroup $group) |
46 | 46 | { |
47 | - if ($group == null) return null; |
|
47 | + if ($group == null) { |
|
48 | + return null; |
|
49 | + } |
|
48 | 50 | $fighters = $group->getFightersWithBye(); |
49 | 51 | $fighterType = $group->getFighterType(); |
50 | 52 | if (sizeof($fighters) == 0) { |
@@ -127,8 +129,12 @@ discard block |
||
127 | 129 | */ |
128 | 130 | public function shouldBeInFightList() |
129 | 131 | { |
130 | - if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) return false; |
|
131 | - if ($this->has2Fighters()) return true; |
|
132 | + if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) { |
|
133 | + return false; |
|
134 | + } |
|
135 | + if ($this->has2Fighters()) { |
|
136 | + return true; |
|
137 | + } |
|
132 | 138 | // We aint in the first round, and there is 1 or 0 competitor |
133 | 139 | // We check children, and see : |
134 | 140 | // if there is 2 - 2 fighters -> undetermine, we cannot add it to fight list |
@@ -157,7 +163,9 @@ discard block |
||
157 | 163 | private function belongsToFirstRound() |
158 | 164 | { |
159 | 165 | $firstRoundFights = $this->group->championship->firstRoundFights->pluck('id')->toArray(); |
160 | - if (in_array($this->id, $firstRoundFights)) return true; |
|
166 | + if (in_array($this->id, $firstRoundFights)) { |
|
167 | + return true; |
|
168 | + } |
|
161 | 169 | return false; |
162 | 170 | } |
163 | 171 |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use Xoco70\KendoTournaments\Models\Championship; |
6 | 6 | use Xoco70\KendoTournaments\Models\Tournament; |
7 | 7 | |
8 | -$factory->define(Championship::class, function (Faker\Generator $faker) { |
|
8 | +$factory->define(Championship::class, function(Faker\Generator $faker) { |
|
9 | 9 | $tournaments = Tournament::all()->pluck('id')->toArray(); |
10 | 10 | $categories = Cat::all()->pluck('id')->toArray(); |
11 | 11 |
@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | use Xoco70\KendoTournaments\Models\Category as Cat; |
5 | 5 | |
6 | -$factory->define(Cat::class, function (Faker\Generator $faker) { |
|
6 | +$factory->define(Cat::class, function(Faker\Generator $faker) { |
|
7 | 7 | $name = ['categories.junior', |
8 | 8 | 'categories.junior_team', |
9 | 9 | 'categories.men_single', |
@@ -16,18 +16,18 @@ |
||
16 | 16 | */ |
17 | 17 | public function boot(Router $router) |
18 | 18 | { |
19 | - $viewPath = __DIR__.'/../resources/views'; |
|
19 | + $viewPath = __DIR__ . '/../resources/views'; |
|
20 | 20 | $this->loadViewsFrom($viewPath, 'kendo-tournaments'); |
21 | 21 | |
22 | - $this->loadMigrationsFrom(__DIR__.'/../database/migrations'); |
|
23 | - $this->loadTranslationsFrom(__DIR__.'/../translations', 'kendo-tournaments'); |
|
22 | + $this->loadMigrationsFrom(__DIR__ . '/../database/migrations'); |
|
23 | + $this->loadTranslationsFrom(__DIR__ . '/../translations', 'kendo-tournaments'); |
|
24 | 24 | |
25 | - $this->publishes([__DIR__.'/../database/migrations' => $this->app->databasePath().'/migrations'], 'migrations'); |
|
26 | - $this->publishes([__DIR__.'/../database/seeds' => $this->app->databasePath().'/seeds'], 'seeds'); |
|
27 | - $this->publishes([__DIR__.'/../database/factories' => $this->app->databasePath().'/factories'], 'seeds'); |
|
28 | - $this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/kendo-tournaments')], 'assets'); |
|
25 | + $this->publishes([__DIR__ . '/../database/migrations' => $this->app->databasePath() . '/migrations'], 'migrations'); |
|
26 | + $this->publishes([__DIR__ . '/../database/seeds' => $this->app->databasePath() . '/seeds'], 'seeds'); |
|
27 | + $this->publishes([__DIR__ . '/../database/factories' => $this->app->databasePath() . '/factories'], 'seeds'); |
|
28 | + $this->publishes([__DIR__ . '/../resources/assets' => public_path('vendor/kendo-tournaments')], 'assets'); |
|
29 | 29 | |
30 | - $router->group(['prefix' => 'kendo-tournaments', 'middleware' => ['web']], function ($router) { |
|
30 | + $router->group(['prefix' => 'kendo-tournaments', 'middleware' => ['web']], function($router) { |
|
31 | 31 | $router->get('/', 'Xoco70\KendoTournaments\TreeController@index')->name('tree.index'); |
32 | 32 | $router->post('/championships/{championship}/trees', 'Xoco70\KendoTournaments\TreeController@store')->name('tree.store'); |
33 | 33 | $router->put('/championships/{championship}/trees', 'Xoco70\KendoTournaments\TreeController@update')->name('tree.update'); |