Continuing pool bracket movements

app/models/match.rb

@@ -37,4 +37,9 @@ class Match < ActiveRecord::Base
 			self.save
 		end
 	end
+	def poolNumber
+		if self.w1 
+			Wrestler.find(self.w1).generatePoolNumber
+		end
+	end
 end

app/models/pooladvance.rb

@@ -11,7 +11,7 @@ class Pooladvance
 
  def advanceWrestler
    if self.wrestler.poolMatches.size > self.wrestler.finishedMatches.size
-	exit
+	return nil
    end
    poolToBracketAdvancment
    bracketAdvancment
@@ -22,7 +22,7 @@ class Pooladvance
    @poolWrestlers = self.wrestler.weight.wrestlers_for_pool(@pool)
    @poolWrestlers.each do |w|  
      if w.finishedBracketMatches.size > 0
-	exit
+	return nil
      end
    end
    #Move to correct spot in bracket from pool
@@ -49,8 +49,29 @@ class Pooladvance
 end
 
  def bracketAdvancment
+   if self.wrestler.finishedBracketMatches.size == 0
+	return nil
+   end
    #Move to next correct spot in bracket
+   @matches = self.wrestler.finishedMatches.sort_by{|m| m.round}.reverse
+   @last_match = @matches.first
+   if @last_match.winner_id == self.wrestler.id
+	winnerAdvance(@last_match)
+   end
+   if @last_match.winner_id != self.wrestler.id
+	loserAdvance(@last_match)
+   end
  end
 
+ def winnerAdvance(last_match)
 
+ end
+
+ def loserAdvance(last_match)
+    @bout = last_match.bout_number
+    @next_match = Match.where("loser_name = ?","Loser of #{@bout}")
+    if @next_match.size > 0
+	@next_match.first.replaceLoserNameWithWrestler(self.wrestler,"Loser of #{@bout}")
+    end
+ end
 end

app/models/weight.rb

@@ -131,6 +131,6 @@ class Weight < ActiveRecord::Base
 	
 	def poolOrder
 		@wrestlers = self.wrestlers
-		@wrestlers.sort_by{|w| w.poolWins}.reverse
+		@wrestlers.sort_by{|w| w.poolWins.count}.reverse!
 	end
 end

app/models/wrestler.rb

@@ -21,7 +21,7 @@ class Wrestler < ActiveRecord::Base
 		@pool = self.weight.returnPoolNumber(self)
 	end
 
-	def boutByRound(round,matches)
+	def boutByRound(round)
 		@match = allMatches.select{|m| m.round == round}.first
 		if @match.blank?
 			return "BYE"
@@ -36,7 +36,8 @@ class Wrestler < ActiveRecord::Base
 	end
        
 	def poolMatches
-		allMatches.select{|m| m.bracket_position == "Pool"}
+		@poolMatches = allMatches.select{|m| m.bracket_position == "Pool"}
+		@poolMatches.select{|m| m.poolNumber == self.generatePoolNumber}
 	end
 	
 	def finishedMatches
@@ -67,4 +68,10 @@ class Wrestler < ActiveRecord::Base
 			return 0
 		end
 	end
+
+	def advanceInBracket
+		@advance = Pooladvance.new
+		@advance.wrestler = self
+		@advance.advanceWrestler
+	end
 end

app/views/static_pages/_pool.html.erb

@@ -21,7 +21,7 @@
     			<% @round = 1 %>
     			<% until @matches.select{|m| m.round == @round}.blank? %>
     			    <% if @round <= @pools %>
-    			        <td><%= w.boutByRound(@round,@matches) %><br>Result</td>
+    			        <td><%= w.boutByRound(@round) %><br>Result</td>
     			    <% end %>
     			    <% @round = @round + 1 %>
     			<% end %>
@@ -32,4 +32,4 @@
     </table>
 <% @pool = @pool + 1 %>
 <% @round = 1 %>
-<% end %>
+<% end %>