Merge branch 'clean2'

Conflicts:
	app/controllers/alerts_controller.rb
	app/controllers/application_controller.rb
	app/controllers/matches_controller.rb
	app/controllers/servers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/models/match.rb
	app/models/team.rb
	app/models/tournament.rb
	app/views/sessions/_form.html.erb
	app/views/sessions/index.html.erb
	app/views/sessions/index.json.jbuilder
	app/views/sessions/show.html.erb
	app/views/sessions/show.json.jbuilder
	app/views/tournaments/index.html.erb
	config/routes.rb
	generate.sh

4 files changed, 47 insertions, 2 deletions

diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 3dadbf7..38855a0 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -24,6 +24,26 @@
     <%= f.number_field :status %>
   </div>
   <div class="field">
+    <%= f.label :min_players_per_team %><br>
+    <%= f.number_field :min_players_per_team %>
+  </div>
+  <div class="field">
+    <%= f.label :max_players_per_team %><br>
+    <%= f.number_field :max_players_per_team %>
+  </div>
+  <div class="field">
+    <%= f.label :min_teams_per_match %><br>
+    <%= f.number_field :min_teams_per_match %>
+  </div>
+  <div class="field">
+    <%= f.label :max_teams_per_match %><br>
+    <%= f.number_field :max_teams_per_match %>
+  </div>
+  <div class="field">
+    <%= f.label :set_rounds %><br>
+    <%= f.number_field :set_rounds %>
+  </div>
+  <div class="field">
     <%= f.label :randomized_teams %><br>
     <%= f.check_box :randomized_teams %>
   </div>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index 32587df..4038f04 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, :randomized_teams
+  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.url tournament_url(tournament, format: :json)
 end
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 1ebf4c5..b771701 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -46,6 +46,31 @@
 </p>
 
 <p>
+  <strong>Min players per team:</strong>
+  <%= @tournament.min_players_per_team %>
+</p>
+
+<p>
+  <strong>Max players per team:</strong>
+  <%= @tournament.max_players_per_team %>
+</p>
+
+<p>
+  <strong>Min teams per match:</strong>
+  <%= @tournament.min_teams_per_match %>
+</p>
+
+<p>
+  <strong>Max teams per match:</strong>
+  <%= @tournament.max_teams_per_match %>
+</p>
+
+<p>
+  <strong>Set rounds:</strong>
+  <%= @tournament.set_rounds %>
+</p>
+
+<p>
   <strong>Randomized teams:</strong>
   <%= @tournament.randomized_teams %>
 </p>
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index d543c76..27fd5c0 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, :randomized_teams, :created_at, :updated_at
+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