From fd3308f9aacc9efb2a2692dbff8090dfcd663c88 Mon Sep 17 00:00:00 2001
From: guntasgrewal
Date: Mon, 7 Apr 2014 00:51:27 -0400
Subject: Matches move forward more
---
app/views/matches/show.html.erb | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
(limited to 'app/views')
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 109aa70..cd30926 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -26,6 +26,7 @@
Note:- The change of status from 1 to 2 is coming from League Data Pull (RIOT API)
-->
+
<% if (@match.status== 0) || !@tournament.players.include?(current_user) %>
<% @match.teams.each do |team| %>
@@ -37,7 +38,7 @@
<% elsif (@match.status==1) %>
<% if @tournament.hosts.include?(current_user) && @scores.empty? %>
@@ -87,7 +88,16 @@
<% if team.users.include?(current_user) %>
<% team.users.collect{|u| u.user_name}.each do |k| %>
- - <%= 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 %>
@@ -104,7 +114,7 @@
<% end %>
-<% if @tournament.hosts.include?(current_user) %>
+<% if @tournament.players.include?(current_user) %>
<%= form_tag(tournament_match_path(@tournament, @match), method: "put") do %>
@@ -118,9 +128,11 @@
<% when 2 %>
<%= submit_tag("End Match") %>
+ <% when 3 %>
+
+ <%= submit_tag("Reset Status") %>
<% end %>
<% end %>
-
<% end %>
--
cgit v1.2.3-2-g168b
From c524bba025ffd09044ce35efc85ee720f3179111 Mon Sep 17 00:00:00 2001
From: tkimia
Date: Mon, 7 Apr 2014 01:06:50 -0400
Subject: lol# On branch master
---
app/views/matches/index.html.erb | 90 ++++++++++++++++++++------------
app/views/tournaments/_selected.html.erb | 1 -
2 files changed, 58 insertions(+), 33 deletions(-)
(limited to 'app/views')
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 052d176..1941179 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -37,8 +37,19 @@
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index b66acb0..c3a1736 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -17,5 +17,4 @@
<% end %>
- <%= f.submit %>
<% end %>
--
cgit v1.2.3-2-g168b