@@ -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, |
@@ -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'); |
@@ -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 --> |
@@ -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 | /** |
@@ -56,13 +56,13 @@ |
||
| 56 | 56 | protected static function boot() |
| 57 | 57 | { |
| 58 | 58 | parent::boot(); |
| 59 | - static::deleting(function ($tournament) { |
|
| 59 | + static::deleting(function($tournament) { |
|
| 60 | 60 | foreach ($tournament->championships as $ct) { |
| 61 | 61 | $ct->delete(); |
| 62 | 62 | } |
| 63 | 63 | $tournament->invites()->delete(); |
| 64 | 64 | }); |
| 65 | - static::restoring(function ($tournament) { |
|
| 65 | + static::restoring(function($tournament) { |
|
| 66 | 66 | foreach ($tournament->championships()->withTrashed()->get() as $ct) { |
| 67 | 67 | $ct->restore(); |
| 68 | 68 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 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); |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | //The minus 3 is to ignore the final, semi final and quarter final rounds |
| 141 | 141 | |
| 142 | 142 | for ($i = 0; $i < $noRounds - 3; $i++) { |
| 143 | - $tempRounds[] = 'Last '.$noTeamsInFirstRound; |
|
| 143 | + $tempRounds[] = 'Last ' . $noTeamsInFirstRound; |
|
| 144 | 144 | $noTeamsInFirstRound /= 2; |
| 145 | 145 | } |
| 146 | 146 | |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | foreach ($roundTitles as $key => $roundTitle) { |
| 163 | 163 | $left = $key * ($this->matchWrapperWidth + $this->roundSpacing - 1); |
| 164 | 164 | |
| 165 | - echo '<div class="round-title" style="left: '.$left.'px;">'.$roundTitle.'</div>'; |
|
| 165 | + echo '<div class="round-title" style="left: ' . $left . 'px;">' . $roundTitle . '</div>'; |
|
| 166 | 166 | } |
| 167 | 167 | echo '</div>'; |
| 168 | 168 | } |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | public function getPlayerList($selected) |
| 176 | 176 | { |
| 177 | 177 | $html = '<select> |
| 178 | - <option'.($selected == '' ? ' selected' : '').'></option>'; |
|
| 178 | + <option'.($selected == '' ? ' selected' : '') . '></option>'; |
|
| 179 | 179 | |
| 180 | 180 | foreach ($this->championship->fighters as $fighter) { |
| 181 | 181 | $html = $this->addOptionToSelect($selected, $fighter, $html); |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | { |
| 236 | 236 | if ($fighter != null) { |
| 237 | 237 | $select = $selected != null && $selected->id == $fighter->id ? ' selected' : ''; |
| 238 | - $html .= '<option'.$select |
|
| 238 | + $html .= '<option' . $select |
|
| 239 | 239 | .' value=' |
| 240 | 240 | .($fighter->id ?? '') |
| 241 | 241 | .'>' |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | use Xoco70\LaravelTournaments\Models\Championship; |
| 5 | 5 | use Xoco70\LaravelTournaments\Models\ChampionshipSettings; |
| 6 | 6 | |
| 7 | -$factory->define(ChampionshipSettings::class, function (Faker\Generator $faker) use ($factory) { |
|
| 7 | +$factory->define(ChampionshipSettings::class, function(Faker\Generator $faker) use ($factory) { |
|
| 8 | 8 | $tcs = Championship::all()->pluck('id')->toArray(); |
| 9 | 9 | |
| 10 | 10 | $fightingAreas = [1, 2, 4, 8]; |
@@ -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 | } |
@@ -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() |