From 96dd3fbe302eec54b34678e098d3b59710b09b5f Mon Sep 17 00:00:00 2001 From: tkimia Date: Sat, 26 Apr 2014 19:16:19 -0400 Subject: prelim bracket control --- app/views/brackets/new.html.erb | 4 +--- app/views/common/_show_tournament.html.erb | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'app/views') diff --git a/app/views/brackets/new.html.erb b/app/views/brackets/new.html.erb index c379c15..91d0033 100644 --- a/app/views/brackets/new.html.erb +++ b/app/views/brackets/new.html.erb @@ -1,5 +1,3 @@

New bracket

-<%= render 'form' %> - -<%= link_to 'Back', brackets_path %> +<%= link_to 'Back', tournament_brackets_path %> diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb index 0f60fad..fb31420 100644 --- a/app/views/common/_show_tournament.html.erb +++ b/app/views/common/_show_tournament.html.erb @@ -29,6 +29,13 @@ <% else %>

You've signed up for this tournament!

<% end %> + <%= form_tag(tournament_brackets_path(target), method: "post") do %> + <%= label :user_id, nil, style: "display: none;" %> + <%= text_field_tag :user_id, current_user.id, style: "display: none;" %> + <%= label :tournament_id, nil, style: "display: none;" %> + <%= text_field_tag :tournament_id, target.id, style: "display: none;" %> + <%= submit_tag("Make Bracket") %> + <% end %> <% end %> \ No newline at end of file -- cgit v1.2.3-2-g168b From 93e291c8e5002fdea906bb8c96cd528fa8b75935 Mon Sep 17 00:00:00 2001 From: tkimia Date: Sat, 26 Apr 2014 19:39:57 -0400 Subject: brackets just get created --- app/views/brackets/index.html.erb | 7 ++----- app/views/common/_show_tournament.html.erb | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'app/views') diff --git a/app/views/brackets/index.html.erb b/app/views/brackets/index.html.erb index 2195d69..9effe37 100644 --- a/app/views/brackets/index.html.erb +++ b/app/views/brackets/index.html.erb @@ -8,7 +8,6 @@ Name - @@ -18,9 +17,8 @@ <%= bracket.user %> <%= bracket.tournament %> <%= bracket.name %> - <%= link_to 'Show', bracket %> - <%= link_to 'Edit', edit_bracket_path(bracket) %> - <%= link_to 'Destroy', bracket, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to 'Show', tournament_bracket_path(@tournament, bracket) %> + <%= link_to 'Edit', edit_tournament_bracket_path(@tournament, bracket) %> <% end %> @@ -28,4 +26,3 @@
-<%= link_to 'New Bracket', new_bracket_path %> diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb index fb31420..b16a37b 100644 --- a/app/views/common/_show_tournament.html.erb +++ b/app/views/common/_show_tournament.html.erb @@ -30,10 +30,6 @@

You've signed up for this tournament!

<% end %> <%= form_tag(tournament_brackets_path(target), method: "post") do %> - <%= label :user_id, nil, style: "display: none;" %> - <%= text_field_tag :user_id, current_user.id, style: "display: none;" %> - <%= label :tournament_id, nil, style: "display: none;" %> - <%= text_field_tag :tournament_id, target.id, style: "display: none;" %> <%= submit_tag("Make Bracket") %> <% end %> <% end %> -- cgit v1.2.3-2-g168b From 9eba4940c7b6f54153b3a619769bbae378be6fd8 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sat, 26 Apr 2014 20:05:45 -0400 Subject: Refactored show.html.erb for matches --- app/views/matches/show.html.erb | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'app/views') diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 7a82527..8344a7a 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -78,24 +78,8 @@ function score_peers() { - <% case @tournament.sampling_method %> - <% when "Manual" %> - <% if @tournament.hosts.include? current_user %> - - <% @match.teams.each do |team| %> - <%= tag :input, {"type" => "radio", "name" => "winner", "value" => "#{team.id}" } %> - <%= "Team #{team.id} Won" %> - <% end %> - <%= submit_tag("Finish match") %> - <%= @tournament.settings['ScoringMethod'] %> - <% else %> -

The match is running; the host has yet to post the scores of the match.

- <% end %> - <% when "Double Blind" %> -

Double Blind isn't implemented yet.

- <% when "RiotAPI" %> -

Riot API is being called for Statistics. Results will appear shortly.

- <% end %> + <%= raw @match.tournament_stage.tournament.sampling_method.camelcase.constantize.render_user_interaction(@match, current_user) %> + <% when 2 %> -- cgit v1.2.3-2-g168b From e60adb874faffd9bac678a19043532ff33dc6b07 Mon Sep 17 00:00:00 2001 From: tkimia Date: Sat, 26 Apr 2014 20:14:00 -0400 Subject: bracket creation is good --- app/views/brackets/show.html.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'app/views') diff --git a/app/views/brackets/show.html.erb b/app/views/brackets/show.html.erb index 9c7c14b..2e92bfb 100644 --- a/app/views/brackets/show.html.erb +++ b/app/views/brackets/show.html.erb @@ -1,13 +1,11 @@ -

<%= notice %>

-

User: - <%= @bracket.user %> + <%= @bracket.user.user_name %>

Tournament: - <%= @bracket.tournament %> + <%= @bracket.tournament.name %>

@@ -15,5 +13,9 @@ <%= @bracket.name %>

-<%= link_to 'Edit', edit_bracket_path(@bracket) %> | -<%= link_to 'Back', brackets_path %> +<% @bracket.bracket_matches.each do |m| %> +

<%= m.match.id %>

+<% end %> + + +<%= link_to 'Back', tournaments_path %> -- cgit v1.2.3-2-g168b From 62219ac4e3af36cc15c9ad61701550bee9a8424c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 26 Apr 2014 20:16:33 -0400 Subject: run ./generate.sh --- app/views/games/_form.html.erb | 4 ++++ app/views/games/index.html.erb | 2 ++ app/views/games/index.json.jbuilder | 2 +- app/views/games/show.html.erb | 5 +++++ app/views/games/show.json.jbuilder | 2 +- app/views/tournaments/_form.html.erb | 4 ++++ app/views/tournaments/index.html.erb | 2 ++ app/views/tournaments/index.json.jbuilder | 2 +- app/views/tournaments/show.html.erb | 5 +++++ app/views/tournaments/show.json.jbuilder | 2 +- 10 files changed, 26 insertions(+), 4 deletions(-) (limited to 'app/views') diff --git a/app/views/games/_form.html.erb b/app/views/games/_form.html.erb index 20cb214..b1db0b3 100644 --- a/app/views/games/_form.html.erb +++ b/app/views/games/_form.html.erb @@ -47,6 +47,10 @@ <%= f.label :sampling_method %>
<%= f.text_field :sampling_method %> +
+ <%= f.label :scoring_method %>
+ <%= f.text_field :scoring_method %> +
<%= f.submit %>
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index b4c3950..207a0ba 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -12,6 +12,7 @@ Set rounds Randomized teams Sampling method + Scoring method @@ -30,6 +31,7 @@ <%= game.set_rounds %> <%= game.randomized_teams %> <%= game.sampling_method %> + <%= game.scoring_method %> <%= 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 6b20f60..7964f2c 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, :parent_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.extract! game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_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 38c8ccb..6bca111 100644 --- a/app/views/games/show.html.erb +++ b/app/views/games/show.html.erb @@ -45,5 +45,10 @@ <%= @game.sampling_method %>

+

+ Scoring method: + <%= @game.scoring_method %> +

+ <%= 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 087a156..c5fb4ed 100644 --- a/app/views/games/show.json.jbuilder +++ b/app/views/games/show.json.jbuilder @@ -1 +1 @@ -json.extract! @game, :id, :parent_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 +json.extract! @game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method, :created_at, :updated_at diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index 9b9681c..7127d38 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -51,6 +51,10 @@ <%= f.label :sampling_method %>
<%= f.text_field :sampling_method %> +
+ <%= f.label :scoring_method %>
+ <%= f.text_field :scoring_method %> +
<%= f.submit %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 49a83ec..c2b5a2b 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -13,6 +13,7 @@ Set rounds Randomized teams Sampling method + Scoring method @@ -32,6 +33,7 @@ <%= tournament.set_rounds %> <%= tournament.randomized_teams %> <%= tournament.sampling_method %> + <%= tournament.scoring_method %> <%= link_to 'Show', tournament %> <%= link_to 'Edit', edit_tournament_path(tournament) %> <%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder index 7118ecc..bd86e04 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, :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.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, :scoring_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 d97e504..f91e11e 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -50,5 +50,10 @@ <%= @tournament.sampling_method %>

+

+ Scoring method: + <%= @tournament.scoring_method %> +

+ <%= 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 4542e52..ff82412 100644 --- a/app/views/tournaments/show.json.jbuilder +++ b/app/views/tournaments/show.json.jbuilder @@ -1 +1 @@ -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 +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, :scoring_method, :created_at, :updated_at -- cgit v1.2.3-2-g168b