@@ -6,47 +6,47 @@ |
||
| 6 | 6 | |
| 7 | 7 | class CreateTournamentTable extends Migration { |
| 8 | 8 | |
| 9 | - public function up() |
|
| 10 | - { |
|
| 11 | - Schema::create('tournament', function(Blueprint $table) { |
|
| 12 | - $table->increments('id'); |
|
| 9 | + public function up() |
|
| 10 | + { |
|
| 11 | + Schema::create('tournament', function(Blueprint $table) { |
|
| 12 | + $table->increments('id'); |
|
| 13 | 13 | $table->Integer('user_id')->unsigned()->index(); |
| 14 | - $table->foreign('user_id') |
|
| 15 | - ->references('id') |
|
| 16 | - ->on('users') |
|
| 17 | - ->onUpdate('cascade') |
|
| 18 | - ->onDelete('cascade'); |
|
| 14 | + $table->foreign('user_id') |
|
| 15 | + ->references('id') |
|
| 16 | + ->on('users') |
|
| 17 | + ->onUpdate('cascade') |
|
| 18 | + ->onDelete('cascade'); |
|
| 19 | 19 | |
| 20 | - $table->string('name'); |
|
| 21 | - $table->string('slug')->default('')->unique(); |
|
| 20 | + $table->string('name'); |
|
| 21 | + $table->string('slug')->default('')->unique(); |
|
| 22 | 22 | |
| 23 | - $table->date('dateIni'); |
|
| 24 | - $table->date('dateFin'); |
|
| 23 | + $table->date('dateIni'); |
|
| 24 | + $table->date('dateFin'); |
|
| 25 | 25 | $table->date('registerDateLimit'); |
| 26 | 26 | $table->integer('sport')->unsigned()->default(1); // Default is Kendo for now |
| 27 | - $table->string('promoter')->nullable(); |
|
| 28 | - $table->string('host_organization')->nullable(); |
|
| 29 | - $table->string('technical_assistance')->nullable(); |
|
| 30 | - $table->integer('rule_id')->default(1); |
|
| 27 | + $table->string('promoter')->nullable(); |
|
| 28 | + $table->string('host_organization')->nullable(); |
|
| 29 | + $table->string('technical_assistance')->nullable(); |
|
| 30 | + $table->integer('rule_id')->default(1); |
|
| 31 | 31 | $table->tinyInteger('type')->default(1); // 1= local, 2= state, 3= national, 4=continent, 5=world |
| 32 | 32 | $table->integer("venue_id")->nullable()->unsigned(); |
| 33 | - $table->integer("level_id")->unsigned()->default(1); |
|
| 33 | + $table->integer("level_id")->unsigned()->default(1); |
|
| 34 | 34 | |
| 35 | 35 | $table->foreign('venue_id') |
| 36 | 36 | ->references('id') |
| 37 | 37 | ->on('venue'); |
| 38 | 38 | |
| 39 | - $table->timestamps(); |
|
| 40 | - $table->softDeletes(); |
|
| 41 | - $table->engine = 'InnoDB'; |
|
| 39 | + $table->timestamps(); |
|
| 40 | + $table->softDeletes(); |
|
| 41 | + $table->engine = 'InnoDB'; |
|
| 42 | 42 | |
| 43 | - }); |
|
| 44 | - } |
|
| 43 | + }); |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - public function down() |
|
| 47 | - { |
|
| 48 | - DB::statement('SET FOREIGN_KEY_CHECKS = 0'); |
|
| 49 | - Schema::dropIfExists('tournament'); |
|
| 50 | - DB::statement('SET FOREIGN_KEY_CHECKS = 1'); |
|
| 51 | - } |
|
| 46 | + public function down() |
|
| 47 | + { |
|
| 48 | + DB::statement('SET FOREIGN_KEY_CHECKS = 0'); |
|
| 49 | + Schema::dropIfExists('tournament'); |
|
| 50 | + DB::statement('SET FOREIGN_KEY_CHECKS = 1'); |
|
| 51 | + } |
|
| 52 | 52 | } |
| 53 | 53 | \ No newline at end of file |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('sessions', function (Blueprint $table) { |
|
| 16 | + Schema::create('sessions', function(Blueprint $table) { |
|
| 17 | 17 | $table->string('id')->unique(); |
| 18 | 18 | $table->integer('user_id')->nullable(); |
| 19 | 19 | $table->string('ip_address', 45)->nullable(); |
@@ -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('alias')->default(''); |
@@ -30,13 +30,13 @@ discard block |
||
| 30 | 30 | // $table->foreign('gradeMax') |
| 31 | 31 | // ->references('id') |
| 32 | 32 | // ->on('grade'); |
| 33 | - $table->unique(['name','alias','gender','isTeam','ageCategory','ageMin','ageMax','gradeCategory','gradeMin','gradeMax'], 'category_fields_unique'); |
|
| 33 | + $table->unique(['name', 'alias', 'gender', 'isTeam', 'ageCategory', 'ageMin', 'ageMax', 'gradeCategory', 'gradeMin', 'gradeMax'], 'category_fields_unique'); |
|
| 34 | 34 | $table->timestamps(); |
| 35 | 35 | $table->engine = 'InnoDB'; |
| 36 | 36 | |
| 37 | 37 | }); |
| 38 | 38 | |
| 39 | - Schema::create('championship', function (Blueprint $table) { |
|
| 39 | + Schema::create('championship', function(Blueprint $table) { |
|
| 40 | 40 | $table->increments('id'); |
| 41 | 41 | $table->integer('tournament_id')->unsigned()->index(); |
| 42 | 42 | $table->integer('category_id')->unsigned()->index(); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | }); |
| 63 | 63 | |
| 64 | 64 | |
| 65 | - Schema::create('competitor', function (Blueprint $table) { |
|
| 65 | + Schema::create('competitor', function(Blueprint $table) { |
|
| 66 | 66 | $table->increments('id'); |
| 67 | 67 | $table->integer('championship_id')->unsigned()->index(); |
| 68 | 68 | $table->foreign('championship_id') |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | |
| 9 | 9 | public function up() |
| 10 | 10 | { |
| 11 | - Schema::create('team', function (Blueprint $table) { |
|
| 11 | + Schema::create('team', function(Blueprint $table) { |
|
| 12 | 12 | $table->increments('id'); |
| 13 | 13 | $table->string('name'); |
| 14 | 14 | $table->integer('championship_id')->unsigned()->index(); // A checar |
@@ -18,8 +18,8 @@ |
||
| 18 | 18 | Category::create(['name' => 'categories.junior', 'gender' => 'X', 'isTeam' => 0, 'ageCategory' => 5, 'ageMin' => '13', 'ageMax' => '15', 'gradeCategory' => 0]); |
| 19 | 19 | Category::create(['name' => 'categories.junior_team', 'gender' => 'X', 'isTeam' => 1, 'ageCategory' => 5, 'ageMin' => '13', 'ageMax' => '15', 'gradeCategory' => 0]); |
| 20 | 20 | |
| 21 | - Category::create(['name' => 'categories.men_single', 'gender' => 'M', 'isTeam' => 0, 'ageCategory' => 5, 'ageMin' => '18',]); |
|
| 22 | - Category::create(['name' => 'categories.men_team', 'gender' => 'M', 'isTeam' => 1, 'ageCategory' => 5, 'ageMin' => '18',]); |
|
| 21 | + Category::create(['name' => 'categories.men_single', 'gender' => 'M', 'isTeam' => 0, 'ageCategory' => 5, 'ageMin' => '18', ]); |
|
| 22 | + Category::create(['name' => 'categories.men_team', 'gender' => 'M', 'isTeam' => 1, 'ageCategory' => 5, 'ageMin' => '18', ]); |
|
| 23 | 23 | |
| 24 | 24 | Category::create(['name' => 'categories.ladies_single', 'gender' => 'F', 'isTeam' => 0, 'ageCategory' => 5, 'ageMin' => '18']); |
| 25 | 25 | Category::create(['name' => 'categories.ladies_team', 'gender' => 'F', 'isTeam' => 1, 'ageCategory' => 5, 'ageMin' => '18']); |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | use App\User; |
| 5 | 5 | |
| 6 | -$factory->define(User::class, function (Faker\Generator $faker) { |
|
| 6 | +$factory->define(User::class, function(Faker\Generator $faker) { |
|
| 7 | 7 | |
| 8 | 8 | $email = $faker->email; |
| 9 | 9 | return [ |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | use Xoco70\KendoTournaments\Models\Round; |
| 5 | 5 | |
| 6 | -$factory->define(Round::class, function (Faker\Generator $faker) { |
|
| 6 | +$factory->define(Round::class, function(Faker\Generator $faker) { |
|
| 7 | 7 | |
| 8 | 8 | return [ |
| 9 | 9 | // 'name' => $faker->name, |
@@ -28,9 +28,9 @@ |
||
| 28 | 28 | $this->publishes([__DIR__ . '/../database/migrations' => $this->app->databasePath() . '/migrations'], 'migrations'); |
| 29 | 29 | $this->publishes([__DIR__ . '/../database/seeds' => $this->app->databasePath() . '/seeds'], 'seeds'); |
| 30 | 30 | $this->publishes([__DIR__ . '/../database/factories' => $this->app->databasePath() . '/factories'], 'seeds'); |
| 31 | - $this->publishes([__DIR__ . '/../resources/assets' => public_path('vendor/kendo-tournaments'),], 'assets'); |
|
| 31 | + $this->publishes([__DIR__ . '/../resources/assets' => public_path('vendor/kendo-tournaments'), ], 'assets'); |
|
| 32 | 32 | |
| 33 | - $router->group(['prefix' => 'kendo-tournaments', 'middleware' => ['web']], function ($router) { |
|
| 33 | + $router->group(['prefix' => 'kendo-tournaments', 'middleware' => ['web']], function($router) { |
|
| 34 | 34 | $router->get('/', 'Xoco70\KendoTournaments\TreeController@index')->name('tree.index'); |
| 35 | 35 | $router->post('/championships/{championship}/trees', 'Xoco70\KendoTournaments\TreeController@store')->name('tree.index'); |
| 36 | 36 | }); |
@@ -19,6 +19,9 @@ discard block |
||
| 19 | 19 | public $championship, $settings; |
| 20 | 20 | |
| 21 | 21 | |
| 22 | + /** |
|
| 23 | + * @param \Xoco70\KendoTournaments\Models\ChampionshipSettings $settings |
|
| 24 | + */ |
|
| 22 | 25 | public function __construct(Championship $championship, $groupBy, $settings) |
| 23 | 26 | { |
| 24 | 27 | $this->championship = $championship; |
@@ -242,7 +245,7 @@ discard block |
||
| 242 | 245 | |
| 243 | 246 | /** |
| 244 | 247 | * @param $fighterGroups |
| 245 | - * @param $max |
|
| 248 | + * @param integer $max |
|
| 246 | 249 | * @return Collection |
| 247 | 250 | */ |
| 248 | 251 | private function repart($fighterGroups, $max) |
@@ -196,7 +196,7 @@ |
||
| 196 | 196 | private function getTreeSize($fighterCount, $groupSize) |
| 197 | 197 | { |
| 198 | 198 | $square = collect([1, 2, 4, 8, 16, 32, 64]); |
| 199 | - $squareMultiplied = $square->map(function ($item, $key) use ($groupSize) { |
|
| 199 | + $squareMultiplied = $square->map(function($item, $key) use ($groupSize) { |
|
| 200 | 200 | return $item * $groupSize; |
| 201 | 201 | }); |
| 202 | 202 | |