@@ -12,11 +12,11 @@ |
||
12 | 12 | |
13 | 13 | |
14 | 14 | |
15 | - public function group(){ |
|
15 | + public function group() { |
|
16 | 16 | return $this->belongsTo(FightersGroup::class); |
17 | 17 | } |
18 | 18 | |
19 | - public function competitor(){ |
|
19 | + public function competitor() { |
|
20 | 20 | return $this->belongsTo(Competitor::class); |
21 | 21 | } |
22 | 22 | } |
23 | 23 | \ No newline at end of file |
@@ -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'); |
@@ -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(); |
@@ -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(); |
@@ -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;"> |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | -$default_top1 =30; |
|
3 | -$default_top2 =81; |
|
2 | +$default_top1 = 30; |
|
3 | +$default_top2 = 81; |
|
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 | 8 | $default_left = 189; |
9 | -$left = $default_left * ($numRound-1); |
|
9 | +$left = $default_left * ($numRound - 1); |
|
10 | 10 | |
11 | 11 | |
12 | 12 | ?> |