3 files changed, 24 insertions, 11 deletions
diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb
index 8c1ce26..c863ede 100644
--- a/app/models/remote_username.rb
+++ b/app/models/remote_username.rb
@@ -4,7 +4,7 @@ class RemoteUsername < ActiveRecord::Base
 
 	def value
 		begin
-			return JSON.parse(self.json_value)
+			return JSON::restore(self.json_value)
 		rescue
 			return {}
 		end
diff --git a/app/models/statistic.rb b/app/models/statistic.rb
index fefa3a8..d62d413 100644
--- a/app/models/statistic.rb
+++ b/app/models/statistic.rb
@@ -2,9 +2,11 @@ class Statistic < ActiveRecord::Base
 	belongs_to :user
 	belongs_to :match
 
+	validates(:name, presence: true, length: { minimum: 1 })
+
 	def value
 		begin
-			return JSON.parse(self.json_value)
+			return JSON::restore(self.json_value)
 		rescue
 			return {}
 		end
@@ -16,12 +18,15 @@ class Statistic < ActiveRecord::Base
 
 	after_save :update_match
 	def update_match
-		if (self.name == "win") and (self.value)
-			self.match.winner = self.match.teams.find{|t| t.users.include? self.user}
-		end
-		if 	(self.match.status == 2) and (self.match.finished?)
-			self.match.status = 3
+		ActiveRecord::Base.transaction do
+			if (self.name == "win") and (self.value)
+				self.match.winner = self.match.teams.find{|t| t.users.include? self.user}
+			end
+			if 	(self.match.status == 2) and (self.match.finished?)
+				#self.match.tournament_stage.scoring.score(self.match)
+				self.match.status = 3
+			end
+			self.match.save!
 		end
-		self.match.save
 	end
 end
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index bf5518f..8f6f09c 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -26,14 +26,22 @@
 <div>
 	<h2>Teams/users</h2>
 	<ul>
+	<% if @match.status == 3
+	   	scores = @match.tournament_stage.scoring.score(@match)
+	   end
+	%>
 	<% @match.teams.each do |team| %>
 		<li>Team <%= team.id %><ul>
 			<% team.users.each do |user| %>
-				<% if @match.status <= 1 %>
+				<% if @match.status < 3 %>
 					<li><%= user.user_name %></li>
 				<% else %>
-					<% score = user.statistics.where(:name => "score", :match => @match).first %>
-					<li><%= user.user_name %> - SCORE: <%= score ? score.value : 0 %></li>
+					<% stats = Statistic.where(user: user, match: @match) %>
+					<li><%= user.user_name %> - Score: <%= scores[user] %><ul>
+						<% stats.all.reject{|s|s.name=="score"}.each do |stat| %>
+							<li><%= stat.name %>: <%= stat.value %></li>
+						<% end %>
+					</ul></li>
 				<% end %>
 			<% end %>
 		</ul></li>