From f3f17dcd9755020276062caae7c0677eff88cb2f Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Thu, 27 Feb 2014 17:41:59 -0500 Subject: Added the Games Attributes stuff. --- app/controllers/games_controller.rb | 2 +- app/views/games/_form.html.erb | 16 ++++++++++++++++ app/views/games/index.html.erb | 8 ++++++++ app/views/games/index.json.jbuilder | 2 +- app/views/games/show.html.erb | 20 ++++++++++++++++++++ app/views/games/show.json.jbuilder | 2 +- 6 files changed, 47 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 0a9d8e8..4ecff17 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -69,6 +69,6 @@ class GamesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def game_params - params.require(:game).permit(:name) + params.require(:game).permit(:name, :players_per_team, :teams_per_match, :set_rounds, :randomized_teams) end end diff --git a/app/views/games/_form.html.erb b/app/views/games/_form.html.erb index 0bbdd1f..8941c59 100644 --- a/app/views/games/_form.html.erb +++ b/app/views/games/_form.html.erb @@ -15,6 +15,22 @@ <%= f.label :name %>
<%= f.text_area :name %> +
+ <%= f.label :players_per_team %>
+ <%= f.number_field :players_per_team %> +
+
+ <%= f.label :teams_per_match %>
+ <%= f.number_field :teams_per_match %> +
+
+ <%= f.label :set_rounds %>
+ <%= f.number_field :set_rounds %> +
+
+ <%= f.label :randomized_teams %>
+ <%= f.number_field :randomized_teams %> +
<%= f.submit %>
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index 27d47b6..ccd0f63 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -4,6 +4,10 @@ Name + Players per team + Teams per match + Set rounds + Randomized teams @@ -14,6 +18,10 @@ <% @games.each do |game| %> <%= game.name %> + <%= game.players_per_team %> + <%= game.teams_per_match %> + <%= game.set_rounds %> + <%= game.randomized_teams %> <%= link_to 'Show', game %> <%= link_to 'Edit', edit_game_path(game) %> <%= link_to 'Destroy', game, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/games/index.json.jbuilder b/app/views/games/index.json.jbuilder index 90f4236..7e5c1a1 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 + json.extract! game, :id, :name, :players_per_team, :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 20d374f..7986016 100644 --- a/app/views/games/show.html.erb +++ b/app/views/games/show.html.erb @@ -5,5 +5,25 @@ <%= @game.name %>

+

+ Players per team: + <%= @game.players_per_team %> +

+ +

+ Teams per match: + <%= @game.teams_per_match %> +

+ +

+ Set rounds: + <%= @game.set_rounds %> +

+ +

+ Randomized teams: + <%= @game.randomized_teams %> +

+ <%= link_to 'Edit', edit_game_path(@game) %> | <%= link_to 'Back', games_path %> diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder index a4d8d1c..1a2d0c7 100644 --- a/app/views/games/show.json.jbuilder +++ b/app/views/games/show.json.jbuilder @@ -1 +1 @@ -json.extract! @game, :id, :name, :created_at, :updated_at +json.extract! @game, :id, :name, :players_per_team, :teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at -- cgit v1.2.3