diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/matches/index.html.erb | 35 | ||||
| -rw-r--r-- | app/views/matches/show.html.erb | 189 |
2 files changed, 100 insertions, 124 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 80d12ab..6c93321 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -11,24 +11,23 @@ </tr> </thead> - <tbody class="table-hover"> - <% @tournament.matches.order(:id).reverse.each do |match| %> - <tr> - <td><%= match.name %></td> - <td><%= match.status %></td> - <td><%= (match.winner.nil? ? "-" : "Team #{match.winner.id}") %></td> - <td><%= link_to "Show", tournament_match_path(@tournament, match) %> - <td> <%# If user is the host, let them start the tournment %> - <% if @tournament.hosts.include?(current_user) %> - <%= form_tag(tournament_match_path(@tournament, match), method: "put") do %> - <input type="hidden" name="update_action" value="start"> - <%= submit_tag("Start Match", :dissabled => match.teams.count < @tournament.min_teams_per_match) %> - <% end %> - <% end %> -</div></td> - </tr> - <% end %> - </tbody> + <tbody class="table-hover"> + <% @tournament.matches.order(:id).reverse.each do |match| %><tr> + <td><%= match.name %></td> + <td><%= match.status %></td> + <td><%= (match.winner.nil? ? "-" : "Team #{match.winner.id}") %></td> + <td><%= link_to "Show", tournament_match_path(@tournament, match) %> + <td> <%# If user is the host, let them start the tournment %> + <% if @tournament.hosts.include?(current_user) %> + <%= form_tag(tournament_match_path(@tournament, match), method: "put") do %> + <input type="hidden" name="update_action" value="start"> + <% @startable = (match.status == 0) and (match.teams.count >= @tournament.min_teams_per_match) %> + <%= submit_tag("Start Match", :disabled => ! @startable) %> + <% end %> + <% end %> + </td> + </tr><% end %> + </tbody> </table> <br> diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index cd30926..a832d17 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -1,21 +1,21 @@ <p> - <strong>Status:</strong> - <%= @match.status %> + <strong>Status:</strong> + <%= @match.status %> </p> <p> - <strong>Tournament:</strong> - <%= @match.tournament.id %> + <strong>Tournament:</strong> + <%= @match.tournament.id %> </p> <p> - <strong>Name:</strong> - <%= @match.name %> + <strong>Name:</strong> + <%= @match.name %> </p> <!-- - Match Status 0 => Pairings Stage - Match Status 1 => Match Active - Match Status 2 => Match Finished (Peer Review Starts) - Match Status 3 => Match Completed (Scores Completed OR Results Page) + Match Status 0 => Created, waiting to start + Match Status 1 => Match is running, waiting to finish + Match Status 2 => Match finished, waiting for peer reviews + Match Status 3 => Totally done. Four views:- (status is Match status) A. Pairings, when status is 0 for either Host or Player Or when status is 1 for player @@ -27,85 +27,22 @@ --> -<% if (@match.status== 0) || !@tournament.players.include?(current_user) %> +<div> + <h2>Teams/users</h2> + <ul> <% @match.teams.each do |team| %> - <ol> - <% team.users.collect{|u| u.user_name}.each do |k| %> - <li><%= k %></li> + <li>Team <%= team.id %><ul> + <% team.users.each do |user| %> + <% if @match.status <= 1 %> + <li><%= user.user_name %></li> + <% else %> + <li><%= user.user_name %> - SCORE: <%= @match.scores.select{|s| s.user == user}.first.value %></li> + <% end %> <% end %> - </ol> + </ul></li> <% end %> - - -<!-- - This is what the Players and the Hosts of the tournament will view when the Match Status is 1 ---> -<% elsif (@match.status==1) %> - <% if @tournament.hosts.include?(current_user) && @scores.empty? %> - <%= form_tag(tournament_match_path(@tournament, @match), method: "put") do %> - <input type="hidden" name="update_action" value="score"> - <% @match.teams.each do |team| %> - <fieldset><legend>Team <%= team.id.to_s %></legend> - <% team.users.collect{|u| u.user_name}.each do |k| %> - <label>Score for <%= k %> - <br> - <%= text_field_tag("scores[#{k}]", 0, size: 3) %> - </label> - <% end %> - </fieldset> - <% end %> - <%= submit_tag("Enter Scores") %> - <% end %> - <% else %> - <% if @scores.empty? %> - <p> The host has yet to post the scores of the match </p> - <% @match.teams.each do |team| %> - <ol> - <% team.users.collect{|u| u.user_name}.each do |k| %> - <li><%= k %></li> - <% end %> - </ol> - <% end %> - <% else %> - <% @match.teams.each do |team| %> - <ol> - <% team.users.each do |user| %> - <li><%= user.user_name %> - SCORE: <%= @scores.select{|s| s.user == user}.first.value %></li> - <% end %> - </ol> - <% end %> - <% end %> - <% end %> - -<!-- - When Match Status is 2 - Players see the Peer Review Page - Host see the Game Status ---> -<% elsif (@match.status==2) %> - <% if (@tournament.players.include?(current_user)) %> - <% @match.teams.each do |team| %> - <% if team.users.include?(current_user) %> - <ol id="boxes" class="sortable"> - <% team.users.collect{|u| u.user_name}.each do |k| %> - <li><%= k%> - <br> - <% 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 %> - </li> - <% end %> - </ol> - <% end %> - <% end %> - <% elsif (@tournament.hosts.include?(current_user)) %> - <label>Game Status Page Goes here! Because you are a Host that is not a player!</label> - <% end %> -<% end %> + </ul> +</div> <% unless @match.winner.nil? %> <p> @@ -114,25 +51,65 @@ </p> <% end %> -<% if @tournament.players.include?(current_user) %> -<br /> -<div id="host"> - <%= form_tag(tournament_match_path(@tournament, @match), method: "put") do %> - <% case @match.status %> +<div id="action"> + <%= form_tag(tournament_match_path(@tournament, @match), method: "put") do %> + <% case @match.status %> <% when 0 %> - <input type="hidden" name="update_action" value="start"> - <%= submit_tag("Start Match") %> - <% when 1 %> - <input type="hidden" name="update_action" value="peer"> - <%= submit_tag("Begin Peer Evaluation") %> - <% when 2 %> - <input type="hidden" name="update_action" value="finish"> - <%= submit_tag("End Match") %> - <% when 3 %> - <input type="hidden" name="update_action" value="reset"> - <%= submit_tag("Reset Status") %> - <% end %> - <% end %> - + <!-- Created, waiting to start --> + <% if @tournament.hosts.include? current_user %> + <input type="hidden" name="update_action" value="start"> + <%= submit_tag("Start Match", :disabled => @match.teams.count < @tournament.min_teams_per_match) %> + <% else %> + <p>Match is waiting to start.</p> + <% end %> + <% when 1 %> + <!-- Started, waiting to finish --> + <% if @tournament.hosts.include? current_user %> + <input type="hidden" name="update_action" value="finish"> + <% @match.teams.each do |team| %> + <fieldset><legend>Team <%= team.id.to_s %></legend> + <% team.users.collect{|u| u.user_name}.each do |k| %><label> + Score for <%= k %><br> + <%= text_field_tag("scores[#{k}]", 0, size: 3) %> + </label><% end %> + </fieldset> + <% end %> + <%= submit_tag("Finish match") %> + <% else %> + <p>The match is running; the host has yet to post the scores of the match.</p> + <% end %> + <% when 2 %> + <!-- Finished, waiting for peer reviews --> + <input type="hidden" name="update_action" value="peer"> + <% 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) %> + <ol id="boxes" class="sortable"> + <% team.users.collect{|u| u.user_name}.each do |k| %> + <li><%= k%> + <br> + <% 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 %> + </li> + <% end %> + </ol> + <% end %> + <% end %> + <%= submit_tag("Submit peer evaluation") %> + <% else %> + Waiting for peer evaluations to be submitted. + <% end %> + <% when 3 %> + <!-- Totally done --> + This match is done. + <input type="hidden" name="update_action" value="reset"> + <%= submit_tag("Reset Status") %> + <% end # case %> + <% end # form %> </div> -<% end %> |