diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
commit | d72452a5965c0df32a13053ae86bcd529fc0fc9e (patch) | |
tree | fb03041e6cf5d8b56d308481492821af8e663028 /app/views/tournaments | |
parent | 50371ba04b52f74bfc2ceb05a429e072ad4848bb (diff) | |
parent | f5d36fc67d1994b7cc1ce02e7be2767ffcb47857 (diff) |
Merge branch 'master' of github.com:LukeShu/leaguer
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
db/migrate/20140306024707_create_servers.rb
db/migrate/20140306024711_create_matches.rb
db/migrate/20140306024713_create_teams.rb
db/migrate/20140306024715_create_alerts.rb
db/migrate/20140306024718_create_pms.rb
db/migrate/20140306024722_create_users.rb
db/migrate/20140306024724_create_sessions.rb
db/migrate/20140306024729_create_server_settings.rb
db/migrate/20140306024731_create_user_team_pairs.rb
db/migrate/20140306024733_create_team_match_pairs.rb
db/migrate/20140306024735_create_tournament_options.rb
db/migrate/20140306024744_add_hidden_attrs_to_user.rb
db/migrate/20140306202154_create_servers.rb
db/migrate/20140306202156_create_tournaments.rb
db/migrate/20140306202158_create_matches.rb
db/migrate/20140306202200_create_teams.rb
db/migrate/20140306202202_create_alerts.rb
db/migrate/20140306202204_create_pms.rb
db/migrate/20140306202207_create_games.rb
db/migrate/20140306202209_create_users.rb
db/migrate/20140306202211_create_sessions.rb
db/migrate/20140306202213_create_game_attributes.rb
db/migrate/20140306202215_create_server_settings.rb
db/migrate/20140306202217_create_tournament_options.rb
db/migrate/20140306202219_create_user_team_pairs.rb
db/migrate/20140306202224_create_team_match_pairs.rb
db/migrate/20140306202232_add_hidden_attrs_to_user.rb
db/migrate/20140306222309_create_servers.rb
db/migrate/20140306222320_create_matches.rb
db/migrate/20140306222325_create_teams.rb
db/migrate/20140306222330_create_alerts.rb
db/migrate/20140306222336_create_pms.rb
db/migrate/20140306222347_create_users.rb
db/migrate/20140306222352_create_sessions.rb
db/migrate/20140306222357_create_server_settings.rb
db/migrate/20140306222402_create_tournament_options.rb
db/migrate/20140306222422_create_user_team_pairs.rb
db/migrate/20140306222427_create_team_match_pairs.rb
db/migrate/20140306222447_add_hidden_attrs_to_user.rb
db/schema.rb
generate.sh
Diffstat (limited to 'app/views/tournaments')
-rw-r--r-- | app/views/tournaments/_form.html.erb | 28 | ||||
-rw-r--r-- | app/views/tournaments/index.html.erb | 14 | ||||
-rw-r--r-- | app/views/tournaments/index.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/tournaments/show.html.erb | 35 | ||||
-rw-r--r-- | app/views/tournaments/show.json.jbuilder | 2 |
5 files changed, 79 insertions, 2 deletions
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index 1fd63e9..c2c0ba7 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -15,6 +15,34 @@ <%= f.label :game_id %><br> <%= f.text_field :game_id %> </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> + <div class="field"> + <%= f.label :status %><br> + <%= f.number_field :status %> + </div> <div class="actions"> <%= f.submit %> </div> diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index ad2b7cf..dec16d1 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -4,6 +4,13 @@ <thead> <tr> <th>Game</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>Status</th> <th></th> <th></th> <th></th> @@ -14,6 +21,13 @@ <% @tournaments.each do |tournament| %> <tr> <td><%= tournament.game %></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.status %></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 e6f3b49..df8eee4 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 + json.extract! tournament, :id, :game_id, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :status 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 30df788..355bc90 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -5,5 +5,40 @@ <%= @tournament.game %> </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> + +<p> + <strong>Status:</strong> + <%= @tournament.status %> +</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 0fe65a6..7bedd4b 100644 --- a/app/views/tournaments/show.json.jbuilder +++ b/app/views/tournaments/show.json.jbuilder @@ -1 +1 @@ -json.extract! @tournament, :id, :game_id, :created_at, :updated_at +json.extract! @tournament, :id, :game_id, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :status, :created_at, :updated_at |