@@ -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 |
@@ -152,6 +152,9 @@ |
||
| 152 | 152 | // } |
| 153 | 153 | // } |
| 154 | 154 | |
| 155 | + /** |
|
| 156 | + * @param Collection $rounds |
|
| 157 | + */ |
|
| 155 | 158 | public static function saveRoundRobinFights(Championship $championship, $rounds) |
| 156 | 159 | { |
| 157 | 160 | |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | |
| 63 | 63 | /** |
| 64 | 64 | * @param Collection $rounds |
| 65 | - * @param $settings |
|
| 65 | + * @param ChampionshipSettings $settings |
|
| 66 | 66 | * @param Championship $championship |
| 67 | 67 | */ |
| 68 | 68 | public static function generateFights(Collection $rounds, $settings, Championship $championship = null) |
@@ -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) |