From f5d36fc67d1994b7cc1ce02e7be2767ffcb47857 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Thu, 6 Mar 2014 17:25:40 -0500 Subject: new generate --- app/views/games/_form.html.erb | 18 +++++++++++++----- app/views/games/index.html.erb | 12 ++++++++---- app/views/games/index.json.jbuilder | 2 +- app/views/games/show.html.erb | 18 ++++++++++++++---- app/views/games/show.json.jbuilder | 2 +- 5 files changed, 37 insertions(+), 15 deletions(-) (limited to 'app/views/games') diff --git a/app/views/games/_form.html.erb b/app/views/games/_form.html.erb index 8941c59..f68e28f 100644 --- a/app/views/games/_form.html.erb +++ b/app/views/games/_form.html.erb @@ -16,12 +16,20 @@ <%= f.text_area :name %>
- <%= f.label :players_per_team %>
- <%= f.number_field :players_per_team %> + <%= f.label :min_players_per_team %>
+ <%= f.number_field :min_players_per_team %>
- <%= f.label :teams_per_match %>
- <%= f.number_field :teams_per_match %> + <%= f.label :max_players_per_team %>
+ <%= f.number_field :max_players_per_team %> +
+
+ <%= f.label :min_teams_per_match %>
+ <%= f.number_field :min_teams_per_match %> +
+
+ <%= f.label :max_teams_per_match %>
+ <%= f.number_field :max_teams_per_match %>
<%= f.label :set_rounds %>
@@ -29,7 +37,7 @@
<%= f.label :randomized_teams %>
- <%= f.number_field :randomized_teams %> + <%= f.check_box :randomized_teams %>
<%= f.submit %> diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index ccd0f63..27c5860 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -4,8 +4,10 @@ Name - Players per team - Teams per match + Min players per team + Max players per team + Min teams per match + Max teams per match Set rounds Randomized teams @@ -18,8 +20,10 @@ <% @games.each do |game| %> <%= game.name %> - <%= game.players_per_team %> - <%= game.teams_per_match %> + <%= game.min_players_per_team %> + <%= game.max_players_per_team %> + <%= game.min_teams_per_match %> + <%= game.max_teams_per_match %> <%= game.set_rounds %> <%= game.randomized_teams %> <%= link_to 'Show', game %> diff --git a/app/views/games/index.json.jbuilder b/app/views/games/index.json.jbuilder index 7e5c1a1..f8b3e96 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, :players_per_team, :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 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 7986016..1f1a154 100644 --- a/app/views/games/show.html.erb +++ b/app/views/games/show.html.erb @@ -6,13 +6,23 @@

- Players per team: - <%= @game.players_per_team %> + Min players per team: + <%= @game.min_players_per_team %>

- Teams per match: - <%= @game.teams_per_match %> + Max players per team: + <%= @game.max_players_per_team %> +

+ +

+ Min teams per match: + <%= @game.min_teams_per_match %> +

+ +

+ Max teams per match: + <%= @game.max_teams_per_match %>

diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder index 1a2d0c7..e689e7b 100644 --- a/app/views/games/show.json.jbuilder +++ b/app/views/games/show.json.jbuilder @@ -1 +1 @@ -json.extract! @game, :id, :name, :players_per_team, :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, :created_at, :updated_at -- cgit v1.2.3-54-g00ecf