diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:18:48 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:18:48 -0400 |
commit | 07476fd9a2b942e8d6056804bb1cdbd5e9a1c528 (patch) | |
tree | a3e0642ae64bef2bdda4b359f6712d5b09c5a70a /app/views/tournaments | |
parent | 96274bb53465d90632908ebc2f8fd9811d7a5bcb (diff) |
run ./generate.sh
Diffstat (limited to 'app/views/tournaments')
-rw-r--r-- | app/views/tournaments/_form.html.erb | 12 | ||||
-rw-r--r-- | app/views/tournaments/index.html.erb | 6 | ||||
-rw-r--r-- | app/views/tournaments/index.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/tournaments/show.html.erb | 15 | ||||
-rw-r--r-- | app/views/tournaments/show.json.jbuilder | 2 |
5 files changed, 24 insertions, 13 deletions
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 |