Skip to content

Syncing quick master bugfixes. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
truenito merged 9 commits into from
Dec 7, 2015
Merged

Syncing quick master bugfixes. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
11744aa
Merge pull request #1 from truenito/development
truenito Oct 16, 2015
dd1f60d
Merge pull request #2 from truenito/development
truenito Oct 23, 2015
ffe18f4
Merge pull request #3 from truenito/development
truenito Oct 23, 2015
11a8238
Merge pull request #5 from truenito/development
truenito Oct 23, 2015
2c622d9
Merge pull request #6 from truenito/development
truenito Oct 23, 2015
bb421fa
Merge pull request #7 from truenito/development
truenito Oct 23, 2015
118c4db
oops :P
truenito Oct 23, 2015
ad0d880
Changes to user real names.
truenito Dec 7, 2015
50b62a5
Fix match rating calculations for matches that have already ended.
truenito Dec 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/matches_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions app/decorators/user_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions app/models/team.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/views/home/index.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion spec/models/match_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading