diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/games_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/matches_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/tournaments_controller.rb | 2 | ||||
-rw-r--r-- | app/models/match.rb | 2 | ||||
-rw-r--r-- | app/models/statistic.rb (renamed from app/models/score.rb) | 2 | ||||
-rw-r--r-- | app/models/tournament_stage.rb | 3 | ||||
-rw-r--r-- | app/views/games/_form.html.erb | 6 | ||||
-rw-r--r-- | app/views/games/index.html.erb | 2 | ||||
-rw-r--r-- | app/views/games/index.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/games/show.html.erb | 5 | ||||
-rw-r--r-- | app/views/games/show.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/matches/_form.html.erb | 4 | ||||
-rw-r--r-- | app/views/matches/index.html.erb | 4 | ||||
-rw-r--r-- | app/views/matches/index.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/matches/show.html.erb | 4 | ||||
-rw-r--r-- | app/views/matches/show.json.jbuilder | 2 | ||||
-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 |
21 files changed, 54 insertions, 29 deletions
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index e9620b4..db610bc 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, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) + params.require(:game).permit(:name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) end end diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 968bb1e..b19faf4 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -69,6 +69,6 @@ class MatchesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def match_params - params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations) + params.require(:match).permit(:status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations) end end diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index e43976c..6bf79fd 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -69,6 +69,6 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) + params.require(:tournament).permit(: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) end end diff --git a/app/models/match.rb b/app/models/match.rb index fe68d31..b5f539b 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -1,4 +1,4 @@ class Match < ActiveRecord::Base - belongs_to :tournament + belongs_to :tournament_stage belongs_to :winner end diff --git a/app/models/score.rb b/app/models/statistic.rb index 11ee9a6..341fd9d 100644 --- a/app/models/score.rb +++ b/app/models/statistic.rb @@ -1,4 +1,4 @@ -class Score < ActiveRecord::Base +class Statistic < ActiveRecord::Base belongs_to :user belongs_to :match end diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb new file mode 100644 index 0000000..205c8cc --- /dev/null +++ b/app/models/tournament_stage.rb @@ -0,0 +1,3 @@ +class TournamentStage < ActiveRecord::Base + belongs_to :tournament +end diff --git a/app/views/games/_form.html.erb b/app/views/games/_form.html.erb index f68e28f..ef250ad 100644 --- a/app/views/games/_form.html.erb +++ b/app/views/games/_form.html.erb @@ -13,7 +13,7 @@ <div class="field"> <%= f.label :name %><br> - <%= f.text_area :name %> + <%= f.text_field :name %> </div> <div class="field"> <%= f.label :min_players_per_team %><br> @@ -39,6 +39,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/games/index.html.erb b/app/views/games/index.html.erb index 27c5860..6cc7f58 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -10,6 +10,7 @@ <th>Max teams per match</th> <th>Set rounds</th> <th>Randomized teams</th> + <th>Sampling method</th> <th></th> <th></th> <th></th> @@ -26,6 +27,7 @@ <td><%= game.max_teams_per_match %></td> <td><%= game.set_rounds %></td> <td><%= game.randomized_teams %></td> + <td><%= game.sampling_method %></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 f8b3e96..cc0afc9 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, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_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, :sampling_method 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 1f1a154..93bfb60 100644 --- a/app/views/games/show.html.erb +++ b/app/views/games/show.html.erb @@ -35,5 +35,10 @@ <%= @game.randomized_teams %> </p> +<p> + <strong>Sampling method:</strong> + <%= @game.sampling_method %> +</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 e689e7b..60d0a4a 100644 --- a/app/views/games/show.json.jbuilder +++ b/app/views/games/show.json.jbuilder @@ -1 +1 @@ -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 +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, :sampling_method, :created_at, :updated_at diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index bb33501..65069d1 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -16,8 +16,8 @@ <%= f.number_field :status %> </div> <div class="field"> - <%= f.label :tournament_id %><br> - <%= f.text_field :tournament_id %> + <%= f.label :tournament_stage_id %><br> + <%= f.text_field :tournament_stage_id %> </div> <div class="field"> <%= f.label :name %><br> diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 7b7676a..414d57d 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -4,7 +4,7 @@ <thead> <tr> <th>Status</th> - <th>Tournament</th> + <th>Tournament stage</th> <th>Name</th> <th>Winner</th> <th>Remote</th> @@ -19,7 +19,7 @@ <% @matches.each do |match| %> <tr> <td><%= match.status %></td> - <td><%= match.tournament %></td> + <td><%= match.tournament_stage %></td> <td><%= match.name %></td> <td><%= match.winner %></td> <td><%= match.remote_id %></td> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index 8efb8f9..f2499ac 100644 --- a/app/views/matches/index.json.jbuilder +++ b/app/views/matches/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@matches) do |match| - json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations + json.extract! match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations json.url match_url(match, format: :json) end diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 1164113..3356e28 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -6,8 +6,8 @@ </p> <p> - <strong>Tournament:</strong> - <%= @match.tournament %> + <strong>Tournament stage:</strong> + <%= @match.tournament_stage %> </p> <p> diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder index 37496c9..5b543ea 100644 --- a/app/views/matches/show.json.jbuilder +++ b/app/views/matches/show.json.jbuilder @@ -1 +1 @@ -json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at +json.extract! @match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at 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 |