diff --git a/app/models/match.rb b/app/models/match.rb index 11c9823..a4f6d98 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -52,8 +52,8 @@ class Match < ActiveRecord::Base if self.w1 && self.w2 @w1 = wrestler1 @w2 = wrestler2 - @w1.advanceInBracket - @w2.advanceInBracket + @w1.advanceInBracket(self) + @w2.advanceInBracket(self) if self.mat self.mat.assignNextMatch end diff --git a/app/models/pool_advance.rb b/app/models/pool_advance.rb index bc49607..177c292 100644 --- a/app/models/pool_advance.rb +++ b/app/models/pool_advance.rb @@ -1,7 +1,8 @@ class PoolAdvance - def initialize(wrestler) + def initialize(wrestler,previousMatch) @wrestler = wrestler + @previousMatch = previousMatch end def advanceWrestler @@ -29,10 +30,10 @@ class PoolAdvance end def bracketAdvancment - if @wrestler.winnerOfLastMatch? + if @previousMatch.winner_id == @wrestler.id winnerAdvance end - if !@wrestler.winnerOfLastMatch? + if @previousMatch.winner_id != @wrestler.id loserAdvance end end diff --git a/app/models/wrestler.rb b/app/models/wrestler.rb index e37d1d0..00a8a21 100644 --- a/app/models/wrestler.rb +++ b/app/models/wrestler.rb @@ -201,7 +201,7 @@ class Wrestler < ActiveRecord::Base end end - def advanceInBracket - PoolAdvance.new(self).advanceWrestler + def advanceInBracket(match) + PoolAdvance.new(self,match).advanceWrestler end end