cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-14 17:06:46 +00:00
Code Issues Releases Wiki Activity

Fixed bug in pooladvance and refactored

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-12-03 20:27:38 +00:00
parent b334c1fad3
commit 5898393fac
3 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/match.rb
View File

@@ -5,7 +5,7 @@ class Match < ActiveRecord::Base
has_many :wrestlers, :through => :weight
after_save do
if self.finished == 1
if self.finished == 1 && self.winner_id != nil
advance_wrestlers
calcSchoolPoints
end
@@ -14,7 +14,7 @@ class Match < ActiveRecord::Base
WIN_TYPES = ["Decision", "Major", "Tech Fall", "Pin", "Forfeit", "Injury Default", "Default", "DQ"]
def calcSchoolPoints
if self.w1? && self.w2?
if self.w1 && self.w2
wrestler1.school.calcScore
wrestler2.school.calcScore
end
@@ -29,7 +29,7 @@ class Match < ActiveRecord::Base
end
def advance_wrestlers
if self.w1? && self.w2?
if self.w1 && self.w2
@w1 = wrestler1
@w2 = wrestler2
@w1.advanceInBracket
@@ -56,7 +56,7 @@ class Match < ActiveRecord::Base
end
def w1_name
if self.w1
if self.w1 != nil
wrestler1.name
else
self.loser1_name
@@ -64,7 +64,7 @@ class Match < ActiveRecord::Base
end
def w2_name
if self.w2
if self.w2 != nil
wrestler2.name
else
self.loser2_name