@@ -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(); |
@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -use Faker\Factory as Faker; |
|
| 4 | 3 | use Illuminate\Database\Seeder; |
| 5 | 4 | use Illuminate\Foundation\Auth\User; |
| 6 | 5 | use Xoco70\KendoTournaments\Models\Championship; |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | private function getMaxFightersByEntity($userGroups): int |
| 56 | 56 | { |
| 57 | 57 | return $userGroups |
| 58 | - ->sortByDesc(function ($group) { |
|
| 58 | + ->sortByDesc(function($group) { |
|
| 59 | 59 | return $group->count(); |
| 60 | 60 | }) |
| 61 | 61 | ->first() |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | protected function getTreeSize($fighterCount, $groupSize) |
| 94 | 94 | { |
| 95 | 95 | $square = collect([1, 2, 4, 8, 16, 32, 64]); |
| 96 | - $squareMultiplied = $square->map(function ($item) use ($groupSize) { |
|
| 96 | + $squareMultiplied = $square->map(function($item) use ($groupSize) { |
|
| 97 | 97 | return $item * $groupSize; |
| 98 | 98 | }); |
| 99 | 99 | |
@@ -392,7 +392,9 @@ |
||
| 392 | 392 | { |
| 393 | 393 | foreach ($groupsByRound as $keyGroup => $group) { |
| 394 | 394 | $parentGroup = $group->parent; |
| 395 | - if ($parentGroup == null) break; |
|
| 395 | + if ($parentGroup == null) { |
|
| 396 | + break; |
|
| 397 | + } |
|
| 396 | 398 | $parentFight = $parentGroup->fights->get(0); |
| 397 | 399 | |
| 398 | 400 | // determine whether c1 or c2 must be updated |
@@ -10,8 +10,6 @@ |
||
| 10 | 10 | use Xoco70\KendoTournaments\Models\Championship; |
| 11 | 11 | use Xoco70\KendoTournaments\Models\ChampionshipSettings; |
| 12 | 12 | use Xoco70\KendoTournaments\Models\Competitor; |
| 13 | -use Xoco70\KendoTournaments\Models\Fight; |
|
| 14 | -use Xoco70\KendoTournaments\Models\FightersGroup; |
|
| 15 | 13 | use Xoco70\KendoTournaments\Models\Team; |
| 16 | 14 | use Xoco70\KendoTournaments\Models\Tournament; |
| 17 | 15 | |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | public static function createOrUpdate(Request $request, Championship $championship): ChampionshipSettings |
| 64 | 64 | { |
| 65 | 65 | $request->request->add(['championship_id' => $championship->id]); |
| 66 | - $arrSettings = $request->except('_token', 'numFighters','isTeam'); |
|
| 66 | + $arrSettings = $request->except('_token', 'numFighters', 'isTeam'); |
|
| 67 | 67 | $settings = static::where(['championship_id' => $championship->id])->first(); |
| 68 | 68 | if ($settings == null) { |
| 69 | 69 | $settings = new self(); |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | $fightingAreas = $setting->fightingAreas; |
| 22 | 22 | $fights = $championship->fights; |
| 23 | 23 | $numFighters = $numFighters ?? 5; |
| 24 | -$isTeam = $isTeam ?? 5;; |
|
| 24 | +$isTeam = $isTeam ?? 5; ; |
|
| 25 | 25 | ?> |
| 26 | 26 | @include('kendo-tournaments::partials.errors') |
| 27 | 27 | |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php |
| 2 | -$default_top1 =81; |
|
| 3 | -$default_top2 =132; |
|
| 2 | +$default_top1 = 81; |
|
| 3 | +$default_top2 = 132; |
|
| 4 | 4 | |
| 5 | -$top1 = $default_top1 + ($numGroup-1) * 204; |
|
| 6 | -$top2 = $default_top2 + ($numGroup-1) * 204; |
|
| 5 | +$top1 = $default_top1 + ($numGroup - 1) * 204; |
|
| 6 | +$top2 = $default_top2 + ($numGroup - 1) * 204; |
|
| 7 | 7 | |
| 8 | -$top = $default_top1 + ($numGroup-1) * 204; |
|
| 8 | +$top = $default_top1 + ($numGroup - 1) * 204; |
|
| 9 | 9 | |
| 10 | 10 | |
| 11 | 11 | ?> |
@@ -1,9 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | -$topOffset = ($numRound == 1 ? 0 : (pow(2, $numRound-1)-1) * 51); |
|
| 2 | +$topOffset = ($numRound == 1 ? 0 : (pow(2, $numRound - 1) - 1) * 51); |
|
| 3 | 3 | $top = \App\Bracket::getTopFight($numRound, $numFight) + $topOffset; |
| 4 | 4 | |
| 5 | 5 | $left = \App\Bracket::getLeftFight($numRound); |
| 6 | -if ($numRound== 3) dump(\App\Bracket::getTopFight($numRound, $numFight),$topOffset); |
|
| 6 | +if ($numRound == 3) dump(\App\Bracket::getTopFight($numRound, $numFight), $topOffset); |
|
| 7 | 7 | ?> |
| 8 | 8 | |
| 9 | 9 | <div class="match-wrapper" style="top: {{ $top }}px; left: {{$left}}px; width: 150px;"> |
@@ -3,7 +3,9 @@ |
||
| 3 | 3 | $top = \App\Bracket::getTopFight($numRound, $numFight) + $topOffset; |
| 4 | 4 | |
| 5 | 5 | $left = \App\Bracket::getLeftFight($numRound); |
| 6 | -if ($numRound== 3) dump(\App\Bracket::getTopFight($numRound, $numFight),$topOffset); |
|
| 6 | +if ($numRound== 3) { |
|
| 7 | + dump(\App\Bracket::getTopFight($numRound, $numFight),$topOffset); |
|
| 8 | +} |
|
| 7 | 9 | ?> |
| 8 | 10 | |
| 9 | 11 | <div class="match-wrapper" style="top: {{ $top }}px; left: {{$left}}px; width: 150px;"> |