mirror of
https://github.com/jcwimer/wrestlingApp
synced 2026-04-17 13:24:36 +00:00
Refactored names of methods and some db column
This commit is contained in:
@@ -13,7 +13,7 @@ class CalculateWrestlerTeamScore
|
||||
end
|
||||
|
||||
def earnedPoints
|
||||
return poolPoints + bracketPoints + placementPoints + bonusWinPoints + byePoints
|
||||
return poolPoints + bracketPoints + placement_points + bonusWinPoints + byePoints
|
||||
end
|
||||
|
||||
def deductedPoints
|
||||
@@ -24,17 +24,17 @@ class CalculateWrestlerTeamScore
|
||||
points
|
||||
end
|
||||
|
||||
def placementPoints
|
||||
def placement_points
|
||||
PoolBracketPlacementPoints.new(@wrestler).calcPoints if @tournament.tournament_type == "Pool to bracket"
|
||||
end
|
||||
|
||||
def bracketPoints
|
||||
(@wrestler.championshipAdvancementWins.size * 2) + (@wrestler.consoAdvancementWins.size * 1)
|
||||
(@wrestler.championship_advancement_wins.size * 2) + (@wrestler.consolation_advancement_wins.size * 1)
|
||||
end
|
||||
|
||||
def poolPoints
|
||||
if @tournament.tournament_type == "Pool to bracket"
|
||||
(@wrestler.poolWins.size * 2)
|
||||
(@wrestler.pool_wins.size * 2)
|
||||
else
|
||||
0
|
||||
end
|
||||
@@ -42,7 +42,7 @@ class CalculateWrestlerTeamScore
|
||||
|
||||
def byePoints
|
||||
if @tournament.tournament_type == "Pool to bracket"
|
||||
if @wrestler.poolWins.size >= 1 and @wrestler.hasAPoolBye == true
|
||||
if @wrestler.pool_wins.size >= 1 and @wrestler.has_a_pool_bye == true
|
||||
2
|
||||
else
|
||||
0
|
||||
@@ -53,7 +53,7 @@ class CalculateWrestlerTeamScore
|
||||
end
|
||||
|
||||
def bonusWinPoints
|
||||
(@wrestler.pinWins.size * 2) + (@wrestler.techWins.size * 1.5) + (@wrestler.majorWins.size * 1)
|
||||
(@wrestler.pin_wins.size * 2) + (@wrestler.tech_wins.size * 1.5) + (@wrestler.major_wins.size * 1)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -16,7 +16,7 @@ class PoolBracketPlacementPoints
|
||||
if @bracket == "fourPoolsToSemi"
|
||||
whilePointsAreZero { @points = fourPoolsToSemi }
|
||||
end
|
||||
if @wrestler.weight.wrestlers.size <= 6 && @wrestler.weight.allPoolMatchesFinished(1)
|
||||
if @wrestler.weight.wrestlers.size <= 6 && @wrestler.weight.all_pool_matches_finished(1)
|
||||
whilePointsAreZero { @points = onePool }
|
||||
end
|
||||
return @points
|
||||
@@ -29,11 +29,11 @@ class PoolBracketPlacementPoints
|
||||
end
|
||||
|
||||
def bracket_position_size(bracket_position_name)
|
||||
@wrestler.allMatches.select{|m| m.bracket_position == bracket_position_name}.size
|
||||
@wrestler.all_matches.select{|m| m.bracket_position == bracket_position_name}.size
|
||||
end
|
||||
|
||||
def won_bracket_position_size(bracket_position_name)
|
||||
@wrestler.matchesWon.select{|m| m.bracket_position == bracket_position_name}.size
|
||||
@wrestler.matches_won.select{|m| m.bracket_position == bracket_position_name}.size
|
||||
end
|
||||
|
||||
def fourPoolsToQuarter
|
||||
@@ -67,14 +67,14 @@ class PoolBracketPlacementPoints
|
||||
end
|
||||
|
||||
def onePool
|
||||
poolOrder = @wrestler.weight.poolOrder(1)
|
||||
if @wrestler == poolOrder.first
|
||||
pool_placement_order = @wrestler.weight.pool_placement_order(1)
|
||||
if @wrestler == pool_placement_order.first
|
||||
return firstPlace
|
||||
elsif @wrestler == poolOrder.second
|
||||
elsif @wrestler == pool_placement_order.second
|
||||
return secondPlace
|
||||
elsif @wrestler == poolOrder.third
|
||||
elsif @wrestler == pool_placement_order.third
|
||||
return thirdPlace
|
||||
elsif @wrestler == poolOrder.fourth
|
||||
elsif @wrestler == pool_placement_order.fourth
|
||||
return fourthPlace
|
||||
end
|
||||
return 0
|
||||
|
||||
@@ -2,7 +2,7 @@ class SwapWrestlers
|
||||
attr_accessor :wrestler1_id, :wrestler2_id
|
||||
|
||||
|
||||
def swapWrestlers(wrestler1_id,wrestler2_id)
|
||||
def swap_wrestlers_bracket_lines(wrestler1_id,wrestler2_id)
|
||||
w1 = Wrestler.find(wrestler1_id)
|
||||
w2 = Wrestler.find(wrestler2_id)
|
||||
|
||||
@@ -12,15 +12,15 @@ class SwapWrestlers
|
||||
w3.original_seed = w1.original_seed
|
||||
w3.bracket_line = w1.bracket_line
|
||||
w3.pool = w1.pool
|
||||
swapWrestlerMatches(w1.allMatches,w1.id,w3.id)
|
||||
swapWrestlerMatches(w1.all_matches,w1.id,w3.id)
|
||||
|
||||
#Swap wrestler 1 and wrestler 2
|
||||
swapWrestlerMatches(w2.allMatches,w2.id,w1.id)
|
||||
swapWrestlerMatches(w2.all_matches,w2.id,w1.id)
|
||||
w1.bracket_line = w2.bracket_line
|
||||
w1.pool = w2.pool
|
||||
|
||||
|
||||
swapWrestlerMatches(w3.allMatches,w3.id,w2.id)
|
||||
swapWrestlerMatches(w3.all_matches,w3.id,w2.id)
|
||||
w2.bracket_line = w3.bracket_line
|
||||
w2.pool = w3.pool
|
||||
|
||||
|
||||
Reference in New Issue
Block a user