run ./generate.sh

56 files changed, 144 insertions, 63 deletions

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index e9620b4..db610bc 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -69,6 +69,6 @@ class GamesController < ApplicationController
 
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def game_params
-		params.require(:game).permit(:name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams)
+		params.require(:game).permit(:name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method)
 	end
 end
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 968bb1e..b19faf4 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -69,6 +69,6 @@ class MatchesController < ApplicationController
 
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def match_params
-		params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations)
+		params.require(:match).permit(:status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations)
 	end
 end
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index e43976c..6bf79fd 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -69,6 +69,6 @@ class TournamentsController < ApplicationController
 
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def tournament_params
-		params.require(:tournament).permit(:name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams)
+		params.require(:tournament).permit(:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method)
 	end
 end
diff --git a/app/models/match.rb b/app/models/match.rb
index fe68d31..b5f539b 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -1,4 +1,4 @@
 class Match < ActiveRecord::Base
-	belongs_to :tournament
+	belongs_to :tournament_stage
 	belongs_to :winner
 end
diff --git a/app/models/score.rb b/app/models/statistic.rb
index 11ee9a6..341fd9d 100644
--- a/app/models/score.rb
+++ b/app/models/statistic.rb
@@ -1,4 +1,4 @@
-class Score < ActiveRecord::Base
+class Statistic < ActiveRecord::Base
 	belongs_to :user
 	belongs_to :match
 end
diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb
new file mode 100644
index 0000000..205c8cc
--- /dev/null
+++ b/app/models/tournament_stage.rb
@@ -0,0 +1,3 @@
+class TournamentStage < ActiveRecord::Base
+	belongs_to :tournament
+end
diff --git a/app/views/games/_form.html.erb b/app/views/games/_form.html.erb
index f68e28f..ef250ad 100644
--- a/app/views/games/_form.html.erb
+++ b/app/views/games/_form.html.erb
@@ -13,7 +13,7 @@
 
   <div class="field">
     <%= f.label :name %><br>
-    <%= f.text_area :name %>
+    <%= f.text_field :name %>
   </div>
   <div class="field">
     <%= f.label :min_players_per_team %><br>
@@ -39,6 +39,10 @@
     <%= f.label :randomized_teams %><br>
     <%= f.check_box :randomized_teams %>
   </div>
+  <div class="field">
+    <%= f.label :sampling_method %><br>
+    <%= f.text_field :sampling_method %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb
index 27c5860..6cc7f58 100644
--- a/app/views/games/index.html.erb
+++ b/app/views/games/index.html.erb
@@ -10,6 +10,7 @@
       <th>Max teams per match</th>
       <th>Set rounds</th>
       <th>Randomized teams</th>
+      <th>Sampling method</th>
       <th></th>
       <th></th>
       <th></th>
@@ -26,6 +27,7 @@
         <td><%= game.max_teams_per_match %></td>
         <td><%= game.set_rounds %></td>
         <td><%= game.randomized_teams %></td>
+        <td><%= game.sampling_method %></td>
         <td><%= link_to 'Show', game %></td>
         <td><%= link_to 'Edit', edit_game_path(game) %></td>
         <td><%= link_to 'Destroy', game, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/games/index.json.jbuilder b/app/views/games/index.json.jbuilder
index f8b3e96..cc0afc9 100644
--- a/app/views/games/index.json.jbuilder
+++ b/app/views/games/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@games) do |game|
-  json.extract! game, :id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams
+  json.extract! game, :id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method
   json.url game_url(game, format: :json)
 end
diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb
index 1f1a154..93bfb60 100644
--- a/app/views/games/show.html.erb
+++ b/app/views/games/show.html.erb
@@ -35,5 +35,10 @@
   <%= @game.randomized_teams %>
 </p>
 
+<p>
+  <strong>Sampling method:</strong>
+  <%= @game.sampling_method %>
+</p>
+
 <%= link_to 'Edit', edit_game_path(@game) %> |
 <%= link_to 'Back', games_path %>
diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder
index e689e7b..60d0a4a 100644
--- a/app/views/games/show.json.jbuilder
+++ b/app/views/games/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @game, :id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at
+json.extract! @game, :id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :created_at, :updated_at
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb
index bb33501..65069d1 100644
--- a/app/views/matches/_form.html.erb
+++ b/app/views/matches/_form.html.erb
@@ -16,8 +16,8 @@
     <%= f.number_field :status %>
   </div>
   <div class="field">
-    <%= f.label :tournament_id %><br>
-    <%= f.text_field :tournament_id %>
+    <%= f.label :tournament_stage_id %><br>
+    <%= f.text_field :tournament_stage_id %>
   </div>
   <div class="field">
     <%= f.label :name %><br>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 7b7676a..414d57d 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -4,7 +4,7 @@
   <thead>
     <tr>
       <th>Status</th>
-      <th>Tournament</th>
+      <th>Tournament stage</th>
       <th>Name</th>
       <th>Winner</th>
       <th>Remote</th>
@@ -19,7 +19,7 @@
     <% @matches.each do |match| %>
       <tr>
         <td><%= match.status %></td>
-        <td><%= match.tournament %></td>
+        <td><%= match.tournament_stage %></td>
         <td><%= match.name %></td>
         <td><%= match.winner %></td>
         <td><%= match.remote_id %></td>
diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder
index 8efb8f9..f2499ac 100644
--- a/app/views/matches/index.json.jbuilder
+++ b/app/views/matches/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@matches) do |match|
-  json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations
+  json.extract! match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations
   json.url match_url(match, format: :json)
 end
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 1164113..3356e28 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -6,8 +6,8 @@
 </p>
 
 <p>
-  <strong>Tournament:</strong>
-  <%= @match.tournament %>
+  <strong>Tournament stage:</strong>
+  <%= @match.tournament_stage %>
 </p>
 
 <p>
diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder
index 37496c9..5b543ea 100644
--- a/app/views/matches/show.json.jbuilder
+++ b/app/views/matches/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at
+json.extract! @match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 38855a0..9b9681c 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -12,10 +12,6 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :name %><br>
-    <%= f.text_field :name %>
-  </div>
-  <div class="field">
     <%= f.label :game_id %><br>
     <%= f.text_field :game_id %>
   </div>
@@ -24,6 +20,10 @@
     <%= f.number_field :status %>
   </div>
   <div class="field">
+    <%= f.label :name %><br>
+    <%= f.text_field :name %>
+  </div>
+  <div class="field">
     <%= f.label :min_players_per_team %><br>
     <%= f.number_field :min_players_per_team %>
   </div>
@@ -47,6 +47,10 @@
     <%= f.label :randomized_teams %><br>
     <%= f.check_box :randomized_teams %>
   </div>
+  <div class="field">
+    <%= f.label :sampling_method %><br>
+    <%= f.text_field :sampling_method %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index f8f21e7..49a83ec 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -3,15 +3,16 @@
 <table>
   <thead>
     <tr>
-      <th>Name</th>
       <th>Game</th>
       <th>Status</th>
+      <th>Name</th>
       <th>Min players per team</th>
       <th>Max players per team</th>
       <th>Min teams per match</th>
       <th>Max teams per match</th>
       <th>Set rounds</th>
       <th>Randomized teams</th>
+      <th>Sampling method</th>
       <th></th>
       <th></th>
       <th></th>
@@ -21,15 +22,16 @@
   <tbody>
     <% @tournaments.each do |tournament| %>
       <tr>
-        <td><%= tournament.name %></td>
         <td><%= tournament.game %></td>
         <td><%= tournament.status %></td>
+        <td><%= tournament.name %></td>
         <td><%= tournament.min_players_per_team %></td>
         <td><%= tournament.max_players_per_team %></td>
         <td><%= tournament.min_teams_per_match %></td>
         <td><%= tournament.max_teams_per_match %></td>
         <td><%= tournament.set_rounds %></td>
         <td><%= tournament.randomized_teams %></td>
+        <td><%= tournament.sampling_method %></td>
         <td><%= link_to 'Show', tournament %></td>
         <td><%= link_to 'Edit', edit_tournament_path(tournament) %></td>
         <td><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index 4038f04..7118ecc 100644
--- a/app/views/tournaments/index.json.jbuilder
+++ b/app/views/tournaments/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@tournaments) do |tournament|
-  json.extract! tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams
+  json.extract! tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method
   json.url tournament_url(tournament, format: :json)
 end
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 3cb6179..d97e504 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,11 +1,6 @@
 <p id="notice"><%= notice %></p>
 
 <p>
-  <strong>Name:</strong>
-  <%= @tournament.name %>
-</p>
-
-<p>
   <strong>Game:</strong>
   <%= @tournament.game %>
 </p>
@@ -16,6 +11,11 @@
 </p>
 
 <p>
+  <strong>Name:</strong>
+  <%= @tournament.name %>
+</p>
+
+<p>
   <strong>Min players per team:</strong>
   <%= @tournament.min_players_per_team %>
 </p>
@@ -45,5 +45,10 @@
   <%= @tournament.randomized_teams %>
 </p>
 
+<p>
+  <strong>Sampling method:</strong>
+  <%= @tournament.sampling_method %>
+</p>
+
 <%= link_to 'Edit', edit_tournament_path(@tournament) %> |
 <%= link_to 'Back', tournaments_path %>
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index 27fd5c0..4542e52 100644
--- a/app/views/tournaments/show.json.jbuilder
+++ b/app/views/tournaments/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at
+json.extract! @tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :created_at, :updated_at
diff --git a/db/migrate/20140421103137_create_simple_captcha_data.rb b/db/migrate/20140422021622_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140421103137_create_simple_captcha_data.rb
+++ b/db/migrate/20140422021622_create_simple_captcha_data.rb
diff --git a/db/migrate/20140421143140_create_delayed_jobs.rb b/db/migrate/20140422061625_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140421143140_create_delayed_jobs.rb
+++ b/db/migrate/20140422061625_create_delayed_jobs.rb
diff --git a/db/migrate/20140421143143_create_servers.rb b/db/migrate/20140422061628_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140421143143_create_servers.rb
+++ b/db/migrate/20140422061628_create_servers.rb
diff --git a/db/migrate/20140421143146_create_matches.rb b/db/migrate/20140422061631_create_matches.rb
index bdeb1cd..3786d52 100644
--- a/db/migrate/20140421143146_create_matches.rb
+++ b/db/migrate/20140422061631_create_matches.rb
@@ -2,7 +2,7 @@ class CreateMatches < ActiveRecord::Migration
   def change
     create_table :matches do |t|
       t.integer :status
-      t.references :tournament, index: true
+      t.references :tournament_stage, index: true
       t.string :name
       t.references :winner, index: true
       t.string :remote_id
diff --git a/db/migrate/20140421143149_create_teams.rb b/db/migrate/20140422061633_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140421143149_create_teams.rb
+++ b/db/migrate/20140422061633_create_teams.rb
diff --git a/db/migrate/20140421143152_create_alerts.rb b/db/migrate/20140422061636_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140421143152_create_alerts.rb
+++ b/db/migrate/20140422061636_create_alerts.rb
diff --git a/db/migrate/20140421143155_create_pms.rb b/db/migrate/20140422061639_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140421143155_create_pms.rb
+++ b/db/migrate/20140422061639_create_pms.rb
diff --git a/db/migrate/20140421143158_create_tournaments.rb b/db/migrate/20140422061642_create_tournaments.rb
index c0d8929..716871f 100644
--- a/db/migrate/20140421143158_create_tournaments.rb
+++ b/db/migrate/20140422061642_create_tournaments.rb
@@ -1,17 +1,19 @@
 class CreateTournaments < ActiveRecord::Migration
   def change
     create_table :tournaments do |t|
-      t.string :name
       t.references :game, index: true
       t.integer :status
+      t.string :name
       t.integer :min_players_per_team
       t.integer :max_players_per_team
       t.integer :min_teams_per_match
       t.integer :max_teams_per_match
       t.integer :set_rounds
       t.boolean :randomized_teams
+      t.string :sampling_method
 
       t.timestamps
     end
+    add_index :tournaments, :name, unique: true
   end
 end
diff --git a/db/migrate/20140421143201_create_games.rb b/db/migrate/20140422061645_create_games.rb
index 5e4f56f..46ed30d 100644
--- a/db/migrate/20140421143201_create_games.rb
+++ b/db/migrate/20140422061645_create_games.rb
@@ -1,15 +1,17 @@
 class CreateGames < ActiveRecord::Migration
   def change
     create_table :games do |t|
-      t.text :name
+      t.string :name
       t.integer :min_players_per_team
       t.integer :max_players_per_team
       t.integer :min_teams_per_match
       t.integer :max_teams_per_match
       t.integer :set_rounds
       t.boolean :randomized_teams
+      t.string :sampling_method
 
       t.timestamps
     end
+    add_index :games, :name, unique: true
   end
 end
diff --git a/db/migrate/20140421143204_create_users.rb b/db/migrate/20140422061648_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140421143204_create_users.rb
+++ b/db/migrate/20140422061648_create_users.rb
diff --git a/db/migrate/20140421143207_create_sessions.rb b/db/migrate/20140422061651_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140421143207_create_sessions.rb
+++ b/db/migrate/20140422061651_create_sessions.rb
diff --git a/db/migrate/20140421143210_create_brackets.rb b/db/migrate/20140422061654_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140421143210_create_brackets.rb
+++ b/db/migrate/20140422061654_create_brackets.rb
diff --git a/db/migrate/20140421143213_create_game_settings.rb b/db/migrate/20140422061657_create_game_settings.rb
index 06fb72e..06fb72e 100644
--- a/db/migrate/20140421143213_create_game_settings.rb
+++ b/db/migrate/20140422061657_create_game_settings.rb
diff --git a/db/migrate/20140421143216_create_tournament_settings.rb b/db/migrate/20140422061700_create_tournament_settings.rb
index e56697f..e56697f 100644
--- a/db/migrate/20140421143216_create_tournament_settings.rb
+++ b/db/migrate/20140422061700_create_tournament_settings.rb
diff --git a/db/migrate/20140422061703_create_tournament_stages.rb b/db/migrate/20140422061703_create_tournament_stages.rb
new file mode 100644
index 0000000..e3668cb
--- /dev/null
+++ b/db/migrate/20140422061703_create_tournament_stages.rb
@@ -0,0 +1,11 @@
+class CreateTournamentStages < ActiveRecord::Migration
+  def change
+    create_table :tournament_stages do |t|
+      t.references :tournament, index: true
+      t.string :scheduling
+      t.text :structure
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20140421143219_create_scores.rb b/db/migrate/20140422061706_create_statistics.rb
index 4ca0b0b..cc2e97d 100644
--- a/db/migrate/20140421143219_create_scores.rb
+++ b/db/migrate/20140422061706_create_statistics.rb
@@ -1,8 +1,9 @@
-class CreateScores < ActiveRecord::Migration
+class CreateStatistics < ActiveRecord::Migration
   def change
-    create_table :scores do |t|
+    create_table :statistics do |t|
       t.references :user, index: true
       t.references :match, index: true
+      t.string :name
       t.integer :value
 
       t.timestamps
diff --git a/db/migrate/20140421143222_create_remote_usernames.rb b/db/migrate/20140422061709_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140421143222_create_remote_usernames.rb
+++ b/db/migrate/20140422061709_create_remote_usernames.rb
diff --git a/db/migrate/20140421143225_create_bracket_matches.rb b/db/migrate/20140422061712_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140421143225_create_bracket_matches.rb
+++ b/db/migrate/20140422061712_create_bracket_matches.rb
diff --git a/db/migrate/20140421143228_create_api_requests.rb b/db/migrate/20140422061715_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140421143228_create_api_requests.rb
+++ b/db/migrate/20140422061715_create_api_requests.rb
diff --git a/db/migrate/20140421143231_create_tournament_players_join_table.rb b/db/migrate/20140422061718_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140421143231_create_tournament_players_join_table.rb
+++ b/db/migrate/20140422061718_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140421143234_create_tournament_hosts_join_table.rb b/db/migrate/20140422061721_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140421143234_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140422061721_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140421143237_create_team_user_join_table.rb b/db/migrate/20140422061724_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140421143237_create_team_user_join_table.rb
+++ b/db/migrate/20140422061724_create_team_user_join_table.rb
diff --git a/db/migrate/20140421143239_create_match_team_join_table.rb b/db/migrate/20140422061727_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140421143239_create_match_team_join_table.rb
+++ b/db/migrate/20140422061727_create_match_team_join_table.rb
diff --git a/db/migrate/20140421143251_add_hidden_attrs_to_user.rb b/db/migrate/20140422061739_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140421143251_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140422061739_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index 8e13073..e8764b6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140421143251) do
+ActiveRecord::Schema.define(version: 20140422061739) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -82,17 +82,20 @@ ActiveRecord::Schema.define(version: 20140421143251) do
   add_index "game_settings", ["game_id"], name: "index_game_settings_on_game_id"
 
   create_table "games", force: true do |t|
-    t.text     "name"
+    t.string   "name"
     t.integer  "min_players_per_team"
     t.integer  "max_players_per_team"
     t.integer  "min_teams_per_match"
     t.integer  "max_teams_per_match"
     t.integer  "set_rounds"
     t.boolean  "randomized_teams"
+    t.string   "sampling_method"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "games", ["name"], name: "index_games_on_name", unique: true
+
   create_table "hosts_tournaments", id: false, force: true do |t|
     t.integer "host_id",       null: false
     t.integer "tournament_id", null: false
@@ -100,7 +103,7 @@ ActiveRecord::Schema.define(version: 20140421143251) do
 
   create_table "matches", force: true do |t|
     t.integer  "status"
-    t.integer  "tournament_id"
+    t.integer  "tournament_stage_id"
     t.string   "name"
     t.integer  "winner_id"
     t.string   "remote_id"
@@ -109,7 +112,7 @@ ActiveRecord::Schema.define(version: 20140421143251) do
     t.datetime "updated_at"
   end
 
-  add_index "matches", ["tournament_id"], name: "index_matches_on_tournament_id"
+  add_index "matches", ["tournament_stage_id"], name: "index_matches_on_tournament_stage_id"
   add_index "matches", ["winner_id"], name: "index_matches_on_winner_id"
 
   create_table "matches_teams", id: false, force: true do |t|
@@ -144,17 +147,6 @@ ActiveRecord::Schema.define(version: 20140421143251) do
   add_index "remote_usernames", ["game_id"], name: "index_remote_usernames_on_game_id"
   add_index "remote_usernames", ["user_id"], name: "index_remote_usernames_on_user_id"
 
-  create_table "scores", force: true do |t|
-    t.integer  "user_id"
-    t.integer  "match_id"
-    t.integer  "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "scores", ["match_id"], name: "index_scores_on_match_id"
-  add_index "scores", ["user_id"], name: "index_scores_on_user_id"
-
   create_table "servers", force: true do |t|
     t.integer  "default_user_permissions"
     t.datetime "created_at"
@@ -180,6 +172,18 @@ ActiveRecord::Schema.define(version: 20140421143251) do
 
   add_index "simple_captcha_data", ["key"], name: "idx_key"
 
+  create_table "statistics", force: true do |t|
+    t.integer  "user_id"
+    t.integer  "match_id"
+    t.string   "name"
+    t.integer  "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "statistics", ["match_id"], name: "index_statistics_on_match_id"
+  add_index "statistics", ["user_id"], name: "index_statistics_on_user_id"
+
   create_table "teams", force: true do |t|
     t.integer  "match_id"
     t.datetime "created_at"
@@ -207,21 +211,33 @@ ActiveRecord::Schema.define(version: 20140421143251) do
 
   add_index "tournament_settings", ["tournament_id"], name: "index_tournament_settings_on_tournament_id"
 
+  create_table "tournament_stages", force: true do |t|
+    t.integer  "tournament_id"
+    t.string   "scheduling"
+    t.text     "structure"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "tournament_stages", ["tournament_id"], name: "index_tournament_stages_on_tournament_id"
+
   create_table "tournaments", force: true do |t|
-    t.string   "name"
     t.integer  "game_id"
     t.integer  "status"
+    t.string   "name"
     t.integer  "min_players_per_team"
     t.integer  "max_players_per_team"
     t.integer  "min_teams_per_match"
     t.integer  "max_teams_per_match"
     t.integer  "set_rounds"
     t.boolean  "randomized_teams"
+    t.string   "sampling_method"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "tournaments", ["game_id"], name: "index_tournaments_on_game_id"
+  add_index "tournaments", ["name"], name: "index_tournaments_on_name", unique: true
 
   create_table "users", force: true do |t|
     t.string   "name"
diff --git a/test/controllers/games_controller_test.rb b/test/controllers/games_controller_test.rb
index b93feac..f55a226 100644
--- a/test/controllers/games_controller_test.rb
+++ b/test/controllers/games_controller_test.rb
@@ -18,7 +18,7 @@ class GamesControllerTest < ActionController::TestCase
 
   test "should create game" do
     assert_difference('Game.count') do
-      post :create, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds }
+      post :create, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, randomized_teams: @game.randomized_teams, sampling_method: @game.sampling_method, set_rounds: @game.set_rounds }
     end
 
     assert_redirected_to game_path(assigns(:game))
@@ -35,7 +35,7 @@ class GamesControllerTest < ActionController::TestCase
   end
 
   test "should update game" do
-    patch :update, id: @game, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds }
+    patch :update, id: @game, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, randomized_teams: @game.randomized_teams, sampling_method: @game.sampling_method, set_rounds: @game.set_rounds }
     assert_redirected_to game_path(assigns(:game))
   end
 
diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb
index aca7008..033704e 100644
--- a/test/controllers/matches_controller_test.rb
+++ b/test/controllers/matches_controller_test.rb
@@ -18,7 +18,7 @@ class MatchesControllerTest < ActionController::TestCase
 
   test "should create match" do
     assert_difference('Match.count') do
-      post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_id: @match.tournament_id, winner_id: @match.winner_id }
+      post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id }
     end
 
     assert_redirected_to match_path(assigns(:match))
@@ -35,7 +35,7 @@ class MatchesControllerTest < ActionController::TestCase
   end
 
   test "should update match" do
-    patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_id: @match.tournament_id, winner_id: @match.winner_id }
+    patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id }
     assert_redirected_to match_path(assigns(:match))
   end
 
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index d5ab2af..0e5673c 100644
--- a/test/controllers/tournaments_controller_test.rb
+++ b/test/controllers/tournaments_controller_test.rb
@@ -18,7 +18,7 @@ class TournamentsControllerTest < ActionController::TestCase
 
   test "should create tournament" do
     assert_difference('Tournament.count') do
-      post :create, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, set_rounds: @tournament.set_rounds, status: @tournament.status }
+      post :create, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, sampling_method: @tournament.sampling_method, set_rounds: @tournament.set_rounds, status: @tournament.status }
     end
 
     assert_redirected_to tournament_path(assigns(:tournament))
@@ -35,7 +35,7 @@ class TournamentsControllerTest < ActionController::TestCase
   end
 
   test "should update tournament" do
-    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, set_rounds: @tournament.set_rounds, status: @tournament.status }
+    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, sampling_method: @tournament.sampling_method, set_rounds: @tournament.set_rounds, status: @tournament.status }
     assert_redirected_to tournament_path(assigns(:tournament))
   end
 
diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml
index 16f792e..af46a13 100644
--- a/test/fixtures/games.yml
+++ b/test/fixtures/games.yml
@@ -1,19 +1,21 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  name: MyText
+  name: MyString
   min_players_per_team: 1
   max_players_per_team: 1
   min_teams_per_match: 1
   max_teams_per_match: 1
   set_rounds: 1
   randomized_teams: false
+  sampling_method: MyString
 
 two:
-  name: MyText
+  name: MyString
   min_players_per_team: 1
   max_players_per_team: 1
   min_teams_per_match: 1
   max_teams_per_match: 1
   set_rounds: 1
   randomized_teams: false
+  sampling_method: MyString
diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml
index f64a72e..ff81182 100644
--- a/test/fixtures/matches.yml
+++ b/test/fixtures/matches.yml
@@ -2,7 +2,7 @@
 
 one:
   status: 1
-  tournament_id: 
+  tournament_stage_id: 
   name: MyString
   winner_id: 
   remote_id: MyString
@@ -10,7 +10,7 @@ one:
 
 two:
   status: 1
-  tournament_id: 
+  tournament_stage_id: 
   name: MyString
   winner_id: 
   remote_id: MyString
diff --git a/test/fixtures/scores.yml b/test/fixtures/statistics.yml
index 26065df..0b5b113 100644
--- a/test/fixtures/scores.yml
+++ b/test/fixtures/statistics.yml
@@ -3,9 +3,11 @@
 one:
   user_id: 
   match_id: 
+  name: MyString
   value: 1
 
 two:
   user_id: 
   match_id: 
+  name: MyString
   value: 1
diff --git a/test/fixtures/tournament_stages.yml b/test/fixtures/tournament_stages.yml
new file mode 100644
index 0000000..fdb263c
--- /dev/null
+++ b/test/fixtures/tournament_stages.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  tournament_id: 
+  scheduling: MyString
+  structure: MyText
+
+two:
+  tournament_id: 
+  scheduling: MyString
+  structure: MyText
diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml
index 89edc9f..714a963 100644
--- a/test/fixtures/tournaments.yml
+++ b/test/fixtures/tournaments.yml
@@ -1,23 +1,25 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  name: MyString
   game_id: 
   status: 1
+  name: MyString
   min_players_per_team: 1
   max_players_per_team: 1
   min_teams_per_match: 1
   max_teams_per_match: 1
   set_rounds: 1
   randomized_teams: false
+  sampling_method: MyString
 
 two:
-  name: MyString
   game_id: 
   status: 1
+  name: MyString
   min_players_per_team: 1
   max_players_per_team: 1
   min_teams_per_match: 1
   max_teams_per_match: 1
   set_rounds: 1
   randomized_teams: false
+  sampling_method: MyString
diff --git a/test/models/score_test.rb b/test/models/statistic_test.rb
index d38cb0a..e9e63bf 100644
--- a/test/models/score_test.rb
+++ b/test/models/statistic_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ScoreTest < ActiveSupport::TestCase
+class StatisticTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end
diff --git a/test/models/tournament_stage_test.rb b/test/models/tournament_stage_test.rb
new file mode 100644
index 0000000..10a3a92
--- /dev/null
+++ b/test/models/tournament_stage_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TournamentStageTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end