From a7a68011785381c3680d81e0eaf29964f0007fe1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 27 Apr 2014 13:10:42 -0400
Subject: touch up the tournaments form

---
 app/views/tournaments/_form.html.erb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'app/views/tournaments')

diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index b8d6fc1..95bb7c7 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -49,7 +49,7 @@
 	</fieldset>
 
 	<fieldset><legend>Settings</legend>
-	<%= fields_for "tournament[settings]", @tournament.settings do |setting_fields| %>
+	<%= f.fields_for :settings do |setting_fields| %>
 		<% (@tournament.settings.empty? ? @tournament.game.settings : @tournament.settings).each do |setting| %><p>
 			<% name = setting.name.parameterize.underscore %>
 			<%= setting_fields.label name %>
@@ -81,20 +81,19 @@
 	<% end %>
 	</fieldset>
 
-	<fieldset><legend>Stages</legend>
+	<%= f.fields_for :stages do |stages_fields| %><fieldset><legend>Stages</legend>
 		<label for="num_stages">Number of tournament stages</label>
-		<input type="number" name="num_stages" min="1" value="<%= params[:num_stages] ? params[:num_stages].to_i : 1 %>">
+		<input type="number" name="num_stages" min="1" value="<%= params[:num_stages].to_i %>">
 		<% for i in 1..(params[:num_stages].to_i) do %>
-			<%= fields_for "tournament[stages][#{i}]", @tournament.stages[i] do |stage_fields| %>
-			<fieldset><legend>Stage <%= i %></legend>
+			<%= stages_fields.fields_for i.to_s do |stage_fields| %><fieldset><legend>Stage <%= i %></legend>
 				<%= stage_fields.label :scheduling_method %>
 				<%= stage_fields.select(:scheduling_method, @tournament.scheduling_methods.map{|method| [method.humanize, method]}) %>
 				<%= stage_fields.label :seeding_method %>
 				<%= stage_fields.select(:seeding_method, @tournament.seeding_methods.map{|method| [method.humanize, method]}) %>
-			</fieldset>
-			<% end %>
+			</fieldset><% end %>
 		<% end %>
-	</fieldset>
+	</fieldset><% end %>
+
 	<%= f.submit %>
 
 	<%# render 'stages' %>
-- 
cgit v1.2.3-2-g168b


From 9a8d6814511ce257241a03b5763430294ed3e381 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 27 Apr 2014 13:25:18 -0400
Subject: ran ./generate.sh

---
 app/views/tournaments/_form.html.erb      |  8 --------
 app/views/tournaments/index.html.erb      |  4 ----
 app/views/tournaments/index.json.jbuilder |  2 +-
 app/views/tournaments/show.html.erb       | 10 ----------
 app/views/tournaments/show.json.jbuilder  |  2 +-
 5 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'app/views/tournaments')

diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 7127d38..be5cf56 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -39,14 +39,6 @@
     <%= 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>
   <div class="field">
     <%= f.label :sampling_method %><br>
     <%= f.text_field :sampling_method %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index c2b5a2b..1dddd5d 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -10,8 +10,6 @@
       <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>Scoring method</th>
       <th></th>
@@ -30,8 +28,6 @@
         <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><%= tournament.scoring_method %></td>
         <td><%= link_to 'Show', tournament %></td>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index bd86e04..c6b9e68 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, :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, :scoring_method
+  json.extract! tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_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 f91e11e..f407295 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -35,16 +35,6 @@
   <%= @tournament.max_teams_per_match %>
 </p>
 
-<p>
-  <strong>Set rounds:</strong>
-  <%= @tournament.set_rounds %>
-</p>
-
-<p>
-  <strong>Randomized teams:</strong>
-  <%= @tournament.randomized_teams %>
-</p>
-
 <p>
   <strong>Sampling method:</strong>
   <%= @tournament.sampling_method %>
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index ff82412..afc5814 100644
--- a/app/views/tournaments/show.json.jbuilder
+++ b/app/views/tournaments/show.json.jbuilder
@@ -1 +1 @@
-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, :scoring_method, :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, :sampling_method, :scoring_method, :created_at, :updated_at
-- 
cgit v1.2.3-2-g168b