@@ -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;"> |
@@ -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 | ?> |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | |
| 27 | 27 | public function getFullNameAttribute() |
| 28 | 28 | { |
| 29 | - if ($this instanceof Competitor){ |
|
| 29 | + if ($this instanceof Competitor) { |
|
| 30 | 30 | return $this->getFullName(); |
| 31 | 31 | } |
| 32 | 32 | return $this->name; |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use Xoco70\KendoTournaments\Models\Team; |
| 4 | -$factory->define(Team::class, function (Faker\Generator $faker) { |
|
| 4 | +$factory->define(Team::class, function(Faker\Generator $faker) { |
|
| 5 | 5 | |
| 6 | 6 | return [ |
| 7 | 7 | 'name' => $faker->name, |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('users', function (Blueprint $table) { |
|
| 15 | + Schema::create('users', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->string('firstname'); |
@@ -2,9 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Xoco70\KendoTournaments\Models; |
| 4 | 4 | |
| 5 | -use Illuminate\Database\Eloquent\Model; |
|
| 6 | -use Illuminate\Support\Collection; |
|
| 7 | - |
|
| 8 | 5 | class DirectEliminationFight extends Fight |
| 9 | 6 | { |
| 10 | 7 | public function __construct(Fight $fight = null) |
@@ -9,12 +9,12 @@ |
||
| 9 | 9 | { |
| 10 | 10 | public function __construct(Fight $fight = null) |
| 11 | 11 | { |
| 12 | - if ($fight!=null){ |
|
| 13 | - $this->id= $fight->id; |
|
| 14 | - $this->short_id= $fight->short_id; |
|
| 15 | - $this->fighters_group_id= $fight->fighters_group_id; |
|
| 16 | - $this->c1= $fight->c1; |
|
| 17 | - $this->c2= $fight->c2; |
|
| 12 | + if ($fight != null) { |
|
| 13 | + $this->id = $fight->id; |
|
| 14 | + $this->short_id = $fight->short_id; |
|
| 15 | + $this->fighters_group_id = $fight->fighters_group_id; |
|
| 16 | + $this->c1 = $fight->c1; |
|
| 17 | + $this->c2 = $fight->c2; |
|
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | /** |