@@ -7,7 +7,7 @@ |
||
| 7 | 7 | { |
| 8 | 8 | public function up() |
| 9 | 9 | { |
| 10 | - Schema::create('team', function (Blueprint $table) { |
|
| 10 | + Schema::create('team', function(Blueprint $table) { |
|
| 11 | 11 | $table->increments('id'); |
| 12 | 12 | $table->integer('short_id')->unsigned()->nullable(); |
| 13 | 13 | $table->string('name'); |
@@ -45,7 +45,9 @@ |
||
| 45 | 45 | |
| 46 | 46 | public function getName() |
| 47 | 47 | { |
| 48 | - if ($this == null) return "BYE"; |
|
| 48 | + if ($this == null) { |
|
| 49 | + return "BYE"; |
|
| 50 | + } |
|
| 49 | 51 | return $this->name; |
| 50 | 52 | } |
| 51 | 53 | |
@@ -65,7 +65,9 @@ discard block |
||
| 65 | 65 | $matches = array_chunk($fighters, 2); |
| 66 | 66 | |
| 67 | 67 | //If there's already a match in the match array, then that means the next round is round 2, so increase the round number |
| 68 | - if (count($this->brackets)) $roundNumber++; |
|
| 68 | + if (count($this->brackets)) { |
|
| 69 | + $roundNumber++; |
|
| 70 | + } |
|
| 69 | 71 | |
| 70 | 72 | $countMatches = count($matches); |
| 71 | 73 | //Create the first full round of fighters, some may be blank if waiting on the results of a previous round |
@@ -80,7 +82,7 @@ discard block |
||
| 80 | 82 | if ($this->championship->category->isTeam()){ |
| 81 | 83 | $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team1; |
| 82 | 84 | $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team2; |
| 83 | - }else{ |
|
| 85 | + } else{ |
|
| 84 | 86 | $fighter1 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor1; |
| 85 | 87 | $fighter2 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor2; |
| 86 | 88 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $this->championship = $championship; |
| 26 | 26 | $this->names = $names; |
| 27 | 27 | |
| 28 | - $this->firstRoundName = $names->first()->map(function ($item) use ($championship) { |
|
| 28 | + $this->firstRoundName = $names->first()->map(function($item) use ($championship) { |
|
| 29 | 29 | $fighters = $item->getFighters(); |
| 30 | 30 | $fighter1 = $fighters->get(0); |
| 31 | 31 | $fighter2 = $fighters->get(1); |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | for ($roundNumber += 1; $roundNumber <= $this->noRounds; $roundNumber++) { |
| 67 | 67 | for ($matchNumber = 1; $matchNumber <= ($this->noTeams / pow(2, $roundNumber)); $matchNumber++) { |
| 68 | - if ($this->championship->category->isTeam()){ |
|
| 69 | - $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team1; |
|
| 70 | - $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team2; |
|
| 71 | - }else{ |
|
| 72 | - $fighter1 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor1; |
|
| 73 | - $fighter2 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor2; |
|
| 68 | + if ($this->championship->category->isTeam()) { |
|
| 69 | + $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber - 1]->team1; |
|
| 70 | + $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber - 1]->team2; |
|
| 71 | + } else { |
|
| 72 | + $fighter1 = $this->names->get($roundNumber)[$matchNumber - 1]->fights[0]->competitor1; |
|
| 73 | + $fighter2 = $this->names->get($roundNumber)[$matchNumber - 1]->fights[0]->competitor2; |
|
| 74 | 74 | } |
| 75 | 75 | $this->brackets[$roundNumber][$matchNumber] = [$fighter1, $fighter2]; |
| 76 | 76 | } |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | if ($bracket['playerB'] != '') { |
| 232 | - $html .= '<option' . ($selected == $bracket['playerB'] ? ' selected' : '') . '>' . $bracket['playerB']->getName(). '</option>'; |
|
| 232 | + $html .= '<option' . ($selected == $bracket['playerB'] ? ' selected' : '') . '>' . $bracket['playerB']->getName() . '</option>'; |
|
| 233 | 233 | } |
| 234 | 234 | } |
| 235 | 235 | |
@@ -86,15 +86,23 @@ |
||
| 86 | 86 | |
| 87 | 87 | public function getName() |
| 88 | 88 | { |
| 89 | - if ($this == null) return "BYE"; |
|
| 90 | - if ($this->user == null) return "BYE"; |
|
| 89 | + if ($this == null) { |
|
| 90 | + return "BYE"; |
|
| 91 | + } |
|
| 92 | + if ($this->user == null) { |
|
| 93 | + return "BYE"; |
|
| 94 | + } |
|
| 91 | 95 | return $this->user->name; |
| 92 | 96 | } |
| 93 | 97 | |
| 94 | 98 | public function getFullName() |
| 95 | 99 | { |
| 96 | - if ($this == null) return "BYE"; |
|
| 97 | - if ($this->user == null) return "BYE"; |
|
| 100 | + if ($this == null) { |
|
| 101 | + return "BYE"; |
|
| 102 | + } |
|
| 103 | + if ($this->user == null) { |
|
| 104 | + return "BYE"; |
|
| 105 | + } |
|
| 98 | 106 | return $this->user->firstname . " " . $this->user->lastname; |
| 99 | 107 | } |
| 100 | 108 | |
@@ -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 | }); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('fight', function (Blueprint $table) { |
|
| 16 | + Schema::create('fight', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->integer('short_id')->unsigned()->nullable(); |
| 19 | 19 | $table->integer('fighters_group_id')->unsigned()->index(); |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('category', function (Blueprint $table) { |
|
| 15 | + Schema::create('category', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->string('gender')->nullable(); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $table->engine = 'InnoDB'; |
| 29 | 29 | }); |
| 30 | 30 | |
| 31 | - Schema::create('championship', function (Blueprint $table) { |
|
| 31 | + Schema::create('championship', function(Blueprint $table) { |
|
| 32 | 32 | $table->increments('id'); |
| 33 | 33 | $table->integer('tournament_id')->unsigned()->index(); |
| 34 | 34 | $table->integer('category_id')->unsigned()->index(); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $table->engine = 'InnoDB'; |
| 51 | 51 | }); |
| 52 | 52 | |
| 53 | - Schema::create('competitor', function (Blueprint $table) { |
|
| 53 | + Schema::create('competitor', function(Blueprint $table) { |
|
| 54 | 54 | $table->increments('id'); |
| 55 | 55 | $table->integer('short_id')->unsigned()->nullable(); |
| 56 | 56 | $table->integer('championship_id')->unsigned()->index(); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('fighters_groups', function (Blueprint $table) { |
|
| 16 | + Schema::create('fighters_groups', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->tinyInteger('short_id')->unsigned()->nullable(); |
| 19 | 19 | $table->integer('championship_id')->unsigned()->index(); |
@@ -74,12 +74,12 @@ |
||
| 74 | 74 | FightersGroup::generateFights($championship); |
| 75 | 75 | } catch (TreeGenerationException $e) { |
| 76 | 76 | redirect()->back() |
| 77 | - ->withErrors([$numFighters ."-".$e->getMessage()]); |
|
| 77 | + ->withErrors([$numFighters . "-" . $e->getMessage()]); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | return redirect()->back() |
| 81 | 81 | ->with('numFighters', $numFighters) |
| 82 | 82 | ->with('hasPreliminary', $championship->settings->hasPreliminary) |
| 83 | - ->with(['success' , "Success"]); |
|
| 83 | + ->with(['success', "Success"]); |
|
| 84 | 84 | } |
| 85 | 85 | } |