diff options
-rw-r--r-- | app/controllers/games_controller.rb | 2 | ||||
-rw-r--r-- | app/views/games/_form.html.erb | 16 | ||||
-rw-r--r-- | app/views/games/index.html.erb | 8 | ||||
-rw-r--r-- | app/views/games/index.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/games/show.html.erb | 20 | ||||
-rw-r--r-- | app/views/games/show.json.jbuilder | 2 | ||||
-rw-r--r-- | db/migrate/20140304015129_create_servers.rb (renamed from db/migrate/20140304015051_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015131_create_tournaments.rb (renamed from db/migrate/20140304015053_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015133_create_matches.rb (renamed from db/migrate/20140304015055_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015135_create_teams.rb (renamed from db/migrate/20140304015057_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015137_create_users.rb (renamed from db/migrate/20140304015059_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015139_create_user_team_pairs.rb (renamed from db/migrate/20140304015102_create_user_team_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015141_create_team_match_pairs.rb (renamed from db/migrate/20140304015104_create_team_match_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015144_create_alerts.rb (renamed from db/migrate/20140304015106_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015146_create_pms.rb (renamed from db/migrate/20140304015108_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015148_create_games.rb (renamed from db/migrate/20140304015110_create_games.rb) | 4 | ||||
-rw-r--r-- | db/migrate/20140304015150_create_game_attributes.rb (renamed from db/migrate/20140304015112_create_game_attributes.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015152_create_server_settings.rb (renamed from db/migrate/20140304015114_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015158_create_tournament_options.rb (renamed from db/migrate/20140304015120_create_tournament_options.rb) | 0 | ||||
-rw-r--r-- | db/schema.rb | 6 | ||||
-rwxr-xr-x | generate.sh | 2 | ||||
-rw-r--r-- | test/controllers/games_controller_test.rb | 4 | ||||
-rw-r--r-- | test/fixtures/games.yml | 8 |
23 files changed, 67 insertions, 7 deletions
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 %><br> <%= f.text_area :name %> </div> + <div class="field"> + <%= f.label :players_per_team %><br> + <%= f.number_field :players_per_team %> + </div> + <div class="field"> + <%= f.label :teams_per_match %><br> + <%= f.number_field :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.number_field :randomized_teams %> + </div> <div class="actions"> <%= f.submit %> </div> 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 @@ <thead> <tr> <th>Name</th> + <th>Players per team</th> + <th>Teams per match</th> + <th>Set rounds</th> + <th>Randomized teams</th> <th></th> <th></th> <th></th> @@ -14,6 +18,10 @@ <% @games.each do |game| %> <tr> <td><%= game.name %></td> + <td><%= game.players_per_team %></td> + <td><%= game.teams_per_match %></td> + <td><%= game.set_rounds %></td> + <td><%= game.randomized_teams %></td> <td><%= link_to 'Show', game %></td> <td><%= link_to 'Edit', edit_game_path(game) %></td> <td><%= link_to 'Destroy', game, method: :delete, data: { confirm: 'Are you sure?' } %></td> 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 %> </p> +<p> + <strong>Players per team:</strong> + <%= @game.players_per_team %> +</p> + +<p> + <strong>Teams per match:</strong> + <%= @game.teams_per_match %> +</p> + +<p> + <strong>Set rounds:</strong> + <%= @game.set_rounds %> +</p> + +<p> + <strong>Randomized teams:</strong> + <%= @game.randomized_teams %> +</p> + <%= 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 diff --git a/db/migrate/20140304015051_create_servers.rb b/db/migrate/20140304015129_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140304015051_create_servers.rb +++ b/db/migrate/20140304015129_create_servers.rb diff --git a/db/migrate/20140304015053_create_tournaments.rb b/db/migrate/20140304015131_create_tournaments.rb index 36fcf7e..36fcf7e 100644 --- a/db/migrate/20140304015053_create_tournaments.rb +++ b/db/migrate/20140304015131_create_tournaments.rb diff --git a/db/migrate/20140304015055_create_matches.rb b/db/migrate/20140304015133_create_matches.rb index 6c0c157..6c0c157 100644 --- a/db/migrate/20140304015055_create_matches.rb +++ b/db/migrate/20140304015133_create_matches.rb diff --git a/db/migrate/20140304015057_create_teams.rb b/db/migrate/20140304015135_create_teams.rb index dd8397d..dd8397d 100644 --- a/db/migrate/20140304015057_create_teams.rb +++ b/db/migrate/20140304015135_create_teams.rb diff --git a/db/migrate/20140304015059_create_users.rb b/db/migrate/20140304015137_create_users.rb index 6a500e5..6a500e5 100644 --- a/db/migrate/20140304015059_create_users.rb +++ b/db/migrate/20140304015137_create_users.rb diff --git a/db/migrate/20140304015102_create_user_team_pairs.rb b/db/migrate/20140304015139_create_user_team_pairs.rb index 2c492ac..2c492ac 100644 --- a/db/migrate/20140304015102_create_user_team_pairs.rb +++ b/db/migrate/20140304015139_create_user_team_pairs.rb diff --git a/db/migrate/20140304015104_create_team_match_pairs.rb b/db/migrate/20140304015141_create_team_match_pairs.rb index 8fac07e..8fac07e 100644 --- a/db/migrate/20140304015104_create_team_match_pairs.rb +++ b/db/migrate/20140304015141_create_team_match_pairs.rb diff --git a/db/migrate/20140304015106_create_alerts.rb b/db/migrate/20140304015144_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140304015106_create_alerts.rb +++ b/db/migrate/20140304015144_create_alerts.rb diff --git a/db/migrate/20140304015108_create_pms.rb b/db/migrate/20140304015146_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140304015108_create_pms.rb +++ b/db/migrate/20140304015146_create_pms.rb diff --git a/db/migrate/20140304015110_create_games.rb b/db/migrate/20140304015148_create_games.rb index fc54709..59d4ef0 100644 --- a/db/migrate/20140304015110_create_games.rb +++ b/db/migrate/20140304015148_create_games.rb @@ -2,6 +2,10 @@ class CreateGames < ActiveRecord::Migration def change create_table :games do |t| t.text :name + t.integer :players_per_team + t.integer :teams_per_match + t.integer :set_rounds + t.integer :randomized_teams t.timestamps end diff --git a/db/migrate/20140304015112_create_game_attributes.rb b/db/migrate/20140304015150_create_game_attributes.rb index b63f134..b63f134 100644 --- a/db/migrate/20140304015112_create_game_attributes.rb +++ b/db/migrate/20140304015150_create_game_attributes.rb diff --git a/db/migrate/20140304015114_create_server_settings.rb b/db/migrate/20140304015152_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140304015114_create_server_settings.rb +++ b/db/migrate/20140304015152_create_server_settings.rb diff --git a/db/migrate/20140304015120_create_tournament_options.rb b/db/migrate/20140304015158_create_tournament_options.rb index d2df22e..d2df22e 100644 --- a/db/migrate/20140304015120_create_tournament_options.rb +++ b/db/migrate/20140304015158_create_tournament_options.rb diff --git a/db/schema.rb b/db/schema.rb index 7681cfc..42417f4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140304015120) do +ActiveRecord::Schema.define(version: 20140304015158) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -34,6 +34,10 @@ ActiveRecord::Schema.define(version: 20140304015120) do create_table "games", force: true do |t| t.text "name" + t.integer "players_per_team" + t.integer "teams_per_match" + t.integer "set_rounds" + t.integer "randomized_teams" t.datetime "created_at" t.datetime "updated_at" end diff --git a/generate.sh b/generate.sh index b384813..77d6cb9 100755 --- a/generate.sh +++ b/generate.sh @@ -18,7 +18,7 @@ bundle exec rails generate model user_team_pair user:references team:references bundle exec rails generate model team_match_pair team:references match:references bundle exec rails generate scaffold alert author:references message:text bundle exec rails generate scaffold pm author:references recipient:references message:text -bundle exec rails generate scaffold game name:text +bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer bundle exec rails generate model game_attribute game:references key:text type:integer bundle exec rails generate model server_settings bundle exec rails generate controller search diff --git a/test/controllers/games_controller_test.rb b/test/controllers/games_controller_test.rb index 420758e..95c3145 100644 --- a/test/controllers/games_controller_test.rb +++ b/test/controllers/games_controller_test.rb @@ -18,7 +18,7 @@ class GamesControllerTest < ActionController::TestCase test "should create game" do assert_difference('Game.count') do - post :create, game: { name: @game.name } + post :create, game: { name: @game.name, players_per_team: @game.players_per_team, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds, teams_per_match: @game.teams_per_match } end assert_redirected_to game_path(assigns(:game)) @@ -35,7 +35,7 @@ class GamesControllerTest < ActionController::TestCase end test "should update game" do - patch :update, id: @game, game: { name: @game.name } + patch :update, id: @game, game: { name: @game.name, players_per_team: @game.players_per_team, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds, teams_per_match: @game.teams_per_match } assert_redirected_to game_path(assigns(:game)) end diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml index ce6f466..3068527 100644 --- a/test/fixtures/games.yml +++ b/test/fixtures/games.yml @@ -2,6 +2,14 @@ one: name: MyText + players_per_team: 1 + teams_per_match: 1 + set_rounds: 1 + randomized_teams: 1 two: name: MyText + players_per_team: 1 + teams_per_match: 1 + set_rounds: 1 + randomized_teams: 1 |