@@ -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); |
@@ -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'); |
@@ -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> |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | private function getMaxFightersByEntity($userGroups): int |
84 | 84 | { |
85 | 85 | return $userGroups |
86 | - ->sortByDesc(function ($group) { |
|
86 | + ->sortByDesc(function($group) { |
|
87 | 87 | return $group->count(); |
88 | 88 | }) |
89 | 89 | ->first() |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | protected function getTreeSize($fighterCount, $groupSize) |
122 | 122 | { |
123 | 123 | $square = collect([1, 2, 4, 8, 16, 32, 64]); |
124 | - $squareMultiplied = $square->map(function ($item) use ($groupSize) { |
|
124 | + $squareMultiplied = $square->map(function($item) use ($groupSize) { |
|
125 | 125 | return $item * $groupSize; |
126 | 126 | }); |
127 | 127 | |
@@ -439,9 +439,9 @@ discard block |
||
439 | 439 | $totalAreas = $this->settings->fightingAreas; |
440 | 440 | $numFighters = $this->championship->fighters->count(); |
441 | 441 | $numGroups = $this->getTreeSize($numFighters, $this->championship->getGroupSize()) / $this->championship->getGroupSize(); // 5 -> 8 |
442 | - $areaSize = $numGroups / ($totalAreas * pow(2,$round -1)); |
|
442 | + $areaSize = $numGroups / ($totalAreas * pow(2, $round - 1)); |
|
443 | 443 | |
444 | - $numArea = intval(ceil($order / $areaSize )); // if round == 4, and second match 2/2 = 1 BAD |
|
444 | + $numArea = intval(ceil($order / $areaSize)); // if round == 4, and second match 2/2 = 1 BAD |
|
445 | 445 | return $numArea; |
446 | 446 | } |
447 | 447 | } |