<% end %>
- <% end %>
+
+ <% end %>
<%= f.submit %>
<%# render 'stages' %>
<% end %>
<% end %>
-<% end %>
--
cgit v1.2.3
From c52a612c3b713c6fbae0cbdc7a1f1cd5cd999c24 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Sun, 27 Apr 2014 22:56:44 -0400
Subject: Re-jig the match life-cycle
---
app/views/matches/show.html.erb | 79 +++++++++++------------------------------
1 file changed, 20 insertions(+), 59 deletions(-)
(limited to 'app/views')
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 1c11eb7..3f9c6b4 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -1,16 +1,3 @@
-
Status:
@@ -22,11 +9,10 @@ function score_peers() {
<%#
- Match Status 0 => Created, waiting to start
- Match Status 1 => Match ready
- Match Status 2 => Match is running, waiting to finish
- Match Status 3 => Match finished, waiting for statistics to populate
- Match Status 4 => Match Totally done. Archived.
+ Match Status 0 => Created, waiting to be scheduled
+ Match Status 1 => Scheduled, waiting to start
+ Match Status 2 => Started, waiting to finish
+ Match Status 3 => Finished
Four views:- (status is Match status)
A. Pairings, when status is 1 for either Host or Player Or when status is 2 for player
@@ -66,52 +52,27 @@ function score_peers() {
<%= form_tag(tournament_match_path(@tournament, @match), method: "put") do %>
<% case @match.status %>
<% when 0 %>
-
+
+
<% end %>
- <% when 1 %>
-
-
-
- <%= raw @match.tournament_stage.tournament.sampling_method.camelcase.constantize.render_user_interaction(@match, current_user) %>
-
<% when 2 %>
-
-
-
- <% users = []; @match.teams.each{|t| users.concat(t.users)}; %>
- <% if users.include? current_user %>
- <% @match.teams.each do |team| %>
- <% if team.users.include?(current_user) %>
-
- <% team.users.reject{ |u| (u.user_name == @current_user.user_name) }.collect {|u| u.user_name }.each do |k| %>
-
<%= k%>
-
- <% if (@tournament.game_id == 1) %>
- <%= if @blue2["#{k}"] == nil
- "Level: #{@purp2["#{k}"]["level"]} K/D/A: #{@purp2["#{k}"]["championsKilled"]}/#{@purp2["#{k}"]["numDeaths"]}/#{@purp2["#{k}"]["assists"]} Gold:#{@purp2["#{k}"]["goldEarned"]}"
- else
- "Level: #{@blue2["#{k}"]["level"]} K/D/A: #{@blue2["#{k}"]["championsKilled"]}/#{@blue2["#{k}"]["numDeaths"]}/#{@blue2["#{k}"]["assists"]} Gold:#{@blue2["#{k}"]["goldEarned"]}"
- end %>
- <% end %>
-
- <% end %>
-
- <% end %>
- <% end %>
- <%= submit_tag("Submit peer evaluation", :onsubmit => "score_peers()") %>
- <% else %>
- Waiting for peer evaluations to be submitted.
- <% end %>
+
+
+ <%= @match.render_sampling(current_user) %>
<% when 3 %>
-
- This match is done.
-
- <%= submit_tag("Reset Status") %>
- <% end # case %>
- <% end # form %>
+
+
This match is finished.
+ <% if @tournament.hosts.include? current_user %>
+
+ <%= submit_tag("Reset Status") %>
+ <% end %>
+ <% end %>
+ <% end %>
--
cgit v1.2.3
From 2d7313767442956eab00671ac555c0ce4e583b5f Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Sun, 27 Apr 2014 23:01:04 -0400
Subject: handle what I can of `fgrep -r TODO app lib`
---
app/views/matches/show.html.erb | 1 -
app/views/tournaments/show.html.erb | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
(limited to 'app/views')
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 3f9c6b4..01484d3 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -64,7 +64,6 @@
<% end %>
<% when 2 %>
-
<%= @match.render_sampling(current_user) %>
<% when 3 %>
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 53389bb..c71d3c6 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -47,8 +47,7 @@