@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::table('users', function ($table) { |
|
16 | + Schema::table('users', function($table) { |
|
17 | 17 | $table->string('firstname')->default('firstname'); |
18 | 18 | $table->string('lastname')->default('lastname'); |
19 | 19 | }); |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | { |
29 | 29 | DBHelpers::setFKCheckOff(); |
30 | 30 | if (Schema::hasColumn('users', 'firstname')) { |
31 | - Schema::table('users', function (Blueprint $table) { |
|
31 | + Schema::table('users', function(Blueprint $table) { |
|
32 | 32 | $table->dropColumn('firstname'); |
33 | 33 | }); |
34 | 34 | } |
35 | 35 | if (Schema::hasColumn('users', 'lastname')) { |
36 | - Schema::table('users', function (Blueprint $table) { |
|
36 | + Schema::table('users', function(Blueprint $table) { |
|
37 | 37 | $table->dropColumn('lastname'); |
38 | 38 | }); |
39 | 39 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | private function getMaxFightersByEntity($userGroups): int |
73 | 73 | { |
74 | 74 | return $userGroups |
75 | - ->sortByDesc(function ($group) { |
|
75 | + ->sortByDesc(function($group) { |
|
76 | 76 | return $group->count(); |
77 | 77 | }) |
78 | 78 | ->first() |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | protected function getTreeSize($fighterCount, $groupSize) |
114 | 114 | { |
115 | 115 | $squareMultiplied = collect([1, 2, 4, 8, 16, 32, 64]) |
116 | - ->map(function ($item) use ($groupSize) { |
|
116 | + ->map(function($item) use ($groupSize) { |
|
117 | 117 | return $item * $groupSize; |
118 | 118 | }); // [4, 8, 16, 32, 64,...] |
119 | 119 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | $sizeGroupBy = count($byeGroup); |
172 | 172 | |
173 | 173 | $frequency = $sizeGroupBy != 0 |
174 | - ? (int) floor($sizeFighters / $sizeGroupBy) |
|
174 | + ? (int)floor($sizeFighters / $sizeGroupBy) |
|
175 | 175 | : -1; |
176 | 176 | |
177 | 177 | // Create Copy of $competitors |
@@ -41,7 +41,7 @@ |
||
41 | 41 | */ |
42 | 42 | public function getFullName() //TODO Should remove get prefix |
43 | 43 | { |
44 | - return $this->defaultName() ?? $this->user->firstname.' '.$this->user->lastname; |
|
44 | + return $this->defaultName() ?? $this->user->firstname . ' ' . $this->user->lastname; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | { |
29 | 29 | parent::boot(); |
30 | 30 | |
31 | - static::deleting(function ($championship) { |
|
31 | + static::deleting(function($championship) { |
|
32 | 32 | $championship->competitors()->delete(); |
33 | 33 | $championship->settings()->delete(); |
34 | 34 | }); |
35 | - static::restoring(function ($championship) { |
|
35 | + static::restoring(function($championship) { |
|
36 | 36 | $championship->competitors()->restore(); |
37 | 37 | $championship->settings()->restore(); |
38 | 38 | }); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | $ageCategoryText = $this->category->getAgeString(); |
196 | 196 | $gradeText = $this->category->getGradeString(); |
197 | 197 | |
198 | - return $teamText.' '.$genders[$this->category->gender].' '.$ageCategoryText.' '.$gradeText; |
|
198 | + return $teamText . ' ' . $genders[$this->category->gender] . ' ' . $ageCategoryText . ' ' . $gradeText; |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | public function getSettings() |
@@ -81,10 +81,10 @@ |
||
81 | 81 | { |
82 | 82 | if ($isTeam) { |
83 | 83 | $championship = Championship::find(2); |
84 | - factory(Team::class, (int) $numFighters)->create(['championship_id' => $championship->id]); |
|
84 | + factory(Team::class, (int)$numFighters)->create(['championship_id' => $championship->id]); |
|
85 | 85 | } else { |
86 | 86 | $championship = Championship::find(1); |
87 | - $users = factory(User::class, (int) $numFighters)->create(); |
|
87 | + $users = factory(User::class, (int)$numFighters)->create(); |
|
88 | 88 | foreach ($users as $user) { |
89 | 89 | factory(Competitor::class)->create( |
90 | 90 | ['championship_id' => $championship->id, |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * |
38 | 38 | * @param Request $request |
39 | 39 | * |
40 | - * @return \Illuminate\Http\Response|string |
|
40 | + * @return \Illuminate\Http\RedirectResponse |
|
41 | 41 | */ |
42 | 42 | public function store(Request $request, $championshipId) |
43 | 43 | { |
@@ -137,6 +137,9 @@ discard block |
||
137 | 137 | return back(); |
138 | 138 | } |
139 | 139 | |
140 | + /** |
|
141 | + * @param integer $numFighter |
|
142 | + */ |
|
140 | 143 | public function getWinnerId($fighters, $scores, $numFighter) |
141 | 144 | { |
142 | 145 | return $scores[$numFighter] != null ? $fighters[$numFighter] : null; |
@@ -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, 'laravel-tournaments'); |
21 | 21 | |
22 | - $this->loadMigrationsFrom(__DIR__.'/../database/migrations'); |
|
23 | - $this->loadTranslationsFrom(__DIR__.'/../translations', 'laravel-tournaments'); |
|
22 | + $this->loadMigrationsFrom(__DIR__ . '/../database/migrations'); |
|
23 | + $this->loadTranslationsFrom(__DIR__ . '/../translations', 'laravel-tournaments'); |
|
24 | 24 | |
25 | - $this->publishes([__DIR__.'/../database/migrations' => $this->app->databasePath().'/migrations'], 'laravel-tournaments'); |
|
26 | - $this->publishes([__DIR__.'/../database/seeds' => $this->app->databasePath().'/seeds'], 'laravel-tournaments'); |
|
27 | - $this->publishes([__DIR__.'/../database/factories' => $this->app->databasePath().'/factories'], 'laravel-tournaments'); |
|
28 | - $this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/laravel-tournaments')], 'laravel-tournaments'); |
|
25 | + $this->publishes([__DIR__ . '/../database/migrations' => $this->app->databasePath() . '/migrations'], 'laravel-tournaments'); |
|
26 | + $this->publishes([__DIR__ . '/../database/seeds' => $this->app->databasePath() . '/seeds'], 'laravel-tournaments'); |
|
27 | + $this->publishes([__DIR__ . '/../database/factories' => $this->app->databasePath() . '/factories'], 'laravel-tournaments'); |
|
28 | + $this->publishes([__DIR__ . '/../resources/assets' => public_path('vendor/laravel-tournaments')], 'laravel-tournaments'); |
|
29 | 29 | |
30 | - $router->group(['prefix' => 'laravel-tournaments', 'middleware' => ['web']], function ($router) { |
|
30 | + $router->group(['prefix' => 'laravel-tournaments', 'middleware' => ['web']], function($router) { |
|
31 | 31 | $router->get('/', 'Xoco70\LaravelTournaments\TreeController@index')->name('tree.index'); |
32 | 32 | $router->post('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@store')->name('tree.store'); |
33 | 33 | $router->put('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@update')->name('tree.update'); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * |
31 | 31 | * @param $fightersByEntity |
32 | 32 | * |
33 | - * @return mixed |
|
33 | + * @return Collection |
|
34 | 34 | */ |
35 | 35 | protected function chunkAndShuffle(Collection $fightersByEntity) |
36 | 36 | { |
@@ -97,6 +97,9 @@ discard block |
||
97 | 97 | } |
98 | 98 | } |
99 | 99 | |
100 | + /** |
|
101 | + * @param integer $round |
|
102 | + */ |
|
100 | 103 | protected function generateGroupsForRound(Collection $fightersByArea, $round) |
101 | 104 | { |
102 | 105 | $fightersId = $fightersByArea->pluck('id'); |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | $prefix = "singleElimination"; |
3 | -if ($championship->hasPreliminary() && $roundNumber ==1){ |
|
3 | +if ($championship->hasPreliminary() && $roundNumber == 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 | ?> |
10 | 10 | <!-- r = round, m = match, f = fighter --> |
@@ -112,15 +112,15 @@ |
||
112 | 112 | { |
113 | 113 | $isTeam = $this->group->championship->category->isTeam; |
114 | 114 | if ($isTeam) { |
115 | - $teamToUpdate = 'team'.$numFighter; |
|
115 | + $teamToUpdate = 'team' . $numFighter; |
|
116 | 116 | |
117 | 117 | return optional($this->$teamToUpdate)->$attr; |
118 | 118 | } |
119 | - $competitorToUpdate = 'competitor'.$numFighter; |
|
119 | + $competitorToUpdate = 'competitor' . $numFighter; |
|
120 | 120 | if ($attr == 'name') { |
121 | 121 | return $this->$competitorToUpdate == null |
122 | 122 | ? '' |
123 | - : $this->$competitorToUpdate->user->firstname.' '.$this->$competitorToUpdate->user->lastname; |
|
123 | + : $this->$competitorToUpdate->user->firstname . ' ' . $this->$competitorToUpdate->user->lastname; |
|
124 | 124 | } elseif ($attr == 'short_id') { |
125 | 125 | return optional($this->$competitorToUpdate)->short_id; |
126 | 126 | } |