From 118c4db30be2da232be40bd2e5f43dbcdf70ad04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Gonz=C3=A1lez=20Ma=C3=B1an=C3=A1?=
 <gabriel@estilopanda.com>
Date: Fri, 23 Oct 2015 19:13:54 -0400
Subject: [PATCH 1/3] oops :P

---
 spec/spec_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ccef9e4..1c284b0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -20,7 +20,7 @@
 CodeClimate::TestReporter.start
 require 'factory_girl'
 
-Uncomment to exclude files for test coverage.
+# Uncomment to exclude files for test coverage.
 SimpleCov.start do
   add_filter 'app/controllers/match_tokens_controller.rb'
   add_filter 'app/controllers/match_tokens_controller.rb'

From ad0d880190d6b3cf284b45c3493b648e8be6dbb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Gonz=C3=A1lez=20Ma=C3=B1an=C3=A1?=
 <gabriel@estilopanda.com>
Date: Mon, 7 Dec 2015 11:24:45 -0400
Subject: [PATCH 2/3] Changes to user real names.

---
 app/decorators/user_decorator.rb | 4 ++--
 app/views/home/index.haml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb
index 76d8d1f..49ea326 100644
--- a/app/decorators/user_decorator.rb
+++ b/app/decorators/user_decorator.rb
@@ -20,9 +20,9 @@ def real_name
     if object.real_name.nil?
       markup = '(sin nombre real)'
     elsif object.real_name.present? && object.real_middle_name && object.real_last_name
-      markup = object.real_name + ' ' + object.real_middle_name + ' ' + object.real_last_name
+      markup = object.real_name + ' ' + ' ' + object.real_last_name.first + '.'
     elsif object.real_name.present? && object.real_last_name
-      markup = object.real_name + ' ' + object.real_last_name
+      markup = object.real_name + ' ' + object.real_last_name.first + '.'
     end
     h.content_tag(:i, markup.html_safe)
   end
diff --git a/app/views/home/index.haml b/app/views/home/index.haml
index 98daeb3..9a70f21 100644
--- a/app/views/home/index.haml
+++ b/app/views/home/index.haml
@@ -111,8 +111,8 @@
      })
     }
     $('#user-table').DataTable({
-      "bAutoWidth": false,
-      "aoColumns" : [ { sWidth: "10%" }, { sWidth: "50%" }, { sWidth: "15%" }, { sWidth: "5%" }, { sWidth: "15%" }],
+      "bAutoWidth": false
+      "aoColumns" : [ { sWidth: "15%" }, { sWidth: "20%" }, { sWidth: "25%" }, { sWidth: "15%" }, { sWidth: "20%" }],
       "bPaginate": false,
       "showNEntries": false,
       "bInfo":false,

From 50b62a5af8c3897a7b1205a5c1656bbf49e77d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Gonz=C3=A1lez=20Ma=C3=B1an=C3=A1?=
 <gabriel@estilopanda.com>
Date: Mon, 7 Dec 2015 11:32:28 -0400
Subject: [PATCH 3/3] Fix match rating calculations for matches that have
 already ended.

---
 app/controllers/matches_controller.rb | 4 ++--
 app/models/team.rb                    | 8 ++++++--
 spec/models/match_spec.rb             | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index b9f3c21..b74a129 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -147,8 +147,8 @@ def establish_match_entities(match)
 
     return true if @radiant_team.nil?
     if match.ended? && match.users_and_stats.present?
-      @radiant_team_avg = Team.rating_average @radiant_team
-      @dire_team_avg = Team.rating_average @dire_team
+      @radiant_team_avg = Team.rating_average @radiant_team, match
+      @dire_team_avg = Team.rating_average @dire_team, match
     else
       @radiant_team_avg = (@radiant_team.users.sum(:rating) / @radiant_team.users.count)
       @dire_team_avg = (@dire_team.users.sum(:rating) / @dire_team.users.count)
diff --git a/app/models/team.rb b/app/models/team.rb
index 57db299..c538b2c 100644
--- a/app/models/team.rb
+++ b/app/models/team.rb
@@ -38,8 +38,12 @@ def team_rating_change(match, winner, radiant, dire)
     end
 
     # Calculates team average rating.
-    def rating_average(team)
-      sum = 0; team.users.each { |u| sum += u['rating'].to_i }
+    def rating_average(team, match)
+      if match.ended?
+        sum = 0; team.each { |u| sum += u['rating'].to_i }
+      else
+        sum = 0; team.users.each { |u| sum += u['rating'].to_i }
+      end
       sum / 5
     end
   end
diff --git a/spec/models/match_spec.rb b/spec/models/match_spec.rb
index 812e1cb..d5069b7 100644
--- a/spec/models/match_spec.rb
+++ b/spec/models/match_spec.rb
@@ -148,7 +148,7 @@
     fill_match_with_users(match, 10)
 
     match.start
-    expect((Team.rating_average(match.teams.first)) - (Team.rating_average(match.teams.last)).abs).to be <= 6
+    expect((Team.rating_average(match.teams.first, match)) - (Team.rating_average(match.teams.last, match)).abs).to be <= 6
   end
 
   it 'should end a match and assign winner team correctly.' do