@@ -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'); |
@@ -41,7 +41,7 @@ |
||
41 | 41 | * |
42 | 42 | * @param Request $request |
43 | 43 | * |
44 | - * @return \Illuminate\Http\Response|string |
|
44 | + * @return \Illuminate\Http\RedirectResponse |
|
45 | 45 | */ |
46 | 46 | public function store(Request $request, $championshipId) |
47 | 47 | { |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | $prefix = "directElimination"; |
3 | -if ($championship->hasPreliminary() && $numRound ==1){ |
|
3 | +if ($championship->hasPreliminary() && $numRound == 1) { |
|
4 | 4 | $prefix = "preliminary"; |
5 | 5 | } |
6 | -$className = $prefix."_select"; |
|
7 | -$selectName = $prefix."_fighters[]"; |
|
6 | +$className = $prefix . "_select"; |
|
7 | +$selectName = $prefix . "_fighters[]"; |
|
8 | 8 | ?> |
9 | 9 | <select name="{{ $selectName }}" class={{$className}}> |
10 | 10 | <option {{ $selected == '' ? ' selected' : '' }} ></option> |
@@ -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,9 +129,15 @@ discard block |
||
127 | 129 | */ |
128 | 130 | public function shouldBeInFightList() |
129 | 131 | { |
130 | - if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) return false; |
|
131 | - if (!$this->belongsToFirstRound() && $this->dontHave0Fighters()) return true; |
|
132 | - if ($this->has2Fighters()) return true; |
|
132 | + if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) { |
|
133 | + return false; |
|
134 | + } |
|
135 | + if (!$this->belongsToFirstRound() && $this->dontHave0Fighters()) { |
|
136 | + return true; |
|
137 | + } |
|
138 | + if ($this->has2Fighters()) { |
|
139 | + return true; |
|
140 | + } |
|
133 | 141 | // We aint in the first round, and there is 1 or 0 competitor |
134 | 142 | // We check children, and see : |
135 | 143 | // if there is 2 - 2 fighters -> undetermine, we cannot add it to fight list |
@@ -158,7 +166,9 @@ discard block |
||
158 | 166 | private function belongsToFirstRound() |
159 | 167 | { |
160 | 168 | $firstRoundFights = $this->group->championship->firstRoundFights->pluck('id')->toArray(); |
161 | - if (in_array($this->id, $firstRoundFights)) return true; |
|
169 | + if (in_array($this->id, $firstRoundFights)) { |
|
170 | + return true; |
|
171 | + } |
|
162 | 172 | return false; |
163 | 173 | } |
164 | 174 |
@@ -20,8 +20,8 @@ |
||
20 | 20 | $hasPreliminary = $setting->hasPreliminary; |
21 | 21 | $fightingAreas = $setting->fightingAreas; |
22 | 22 | $fights = $championship->fights; |
23 | -$numFighters = session()->has('numFighters') ? session('numFighters'): 5; |
|
24 | -$isTeam = session()->has('isTeam') ? session('isTeam'): 0; |
|
23 | +$numFighters = session()->has('numFighters') ? session('numFighters') : 5; |
|
24 | +$isTeam = session()->has('isTeam') ? session('isTeam') : 0; |
|
25 | 25 | ?> |
26 | 26 | @include('kendo-tournaments::partials.errors') |
27 | 27 |
@@ -7,12 +7,12 @@ |
||
7 | 7 | public function __construct(Fight $fight = null) |
8 | 8 | { |
9 | 9 | parent::__construct(); |
10 | - if ($fight!=null){ |
|
11 | - $this->id= $fight->id; |
|
12 | - $this->short_id= $fight->short_id; |
|
13 | - $this->fighters_group_id= $fight->fighters_group_id; |
|
14 | - $this->c1= $fight->c1; |
|
15 | - $this->c2= $fight->c2; |
|
10 | + if ($fight != null) { |
|
11 | + $this->id = $fight->id; |
|
12 | + $this->short_id = $fight->short_id; |
|
13 | + $this->fighters_group_id = $fight->fighters_group_id; |
|
14 | + $this->c1 = $fight->c1; |
|
15 | + $this->c2 = $fight->c2; |
|
16 | 16 | } |
17 | 17 | } |
18 | 18 | /** |
@@ -10,12 +10,12 @@ |
||
10 | 10 | public function __construct(Fight $fight = null) |
11 | 11 | { |
12 | 12 | parent::__construct(); |
13 | - if ($fight!=null){ |
|
14 | - $this->id= $fight->id; |
|
15 | - $this->short_id= $fight->short_id; |
|
16 | - $this->fighters_group_id= $fight->fighters_group_id; |
|
17 | - $this->c1= $fight->c1; |
|
18 | - $this->c2= $fight->c2; |
|
13 | + if ($fight != null) { |
|
14 | + $this->id = $fight->id; |
|
15 | + $this->short_id = $fight->short_id; |
|
16 | + $this->fighters_group_id = $fight->fighters_group_id; |
|
17 | + $this->c1 = $fight->c1; |
|
18 | + $this->c2 = $fight->c2; |
|
19 | 19 | } |
20 | 20 | } |
21 | 21 |
@@ -39,7 +39,7 @@ |
||
39 | 39 | /** |
40 | 40 | * Chunk Fighters into groups for fighting, and optionnaly shuffle |
41 | 41 | * @param $fightersByEntity |
42 | - * @return mixed |
|
42 | + * @return Collection |
|
43 | 43 | */ |
44 | 44 | protected function chunkAndShuffle(Collection $fightersByEntity) |
45 | 45 | { |