From eba979740c0ef95575a404824479bca5b3b8cc9b Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Fri, 6 Feb 2015 23:29:00 +0000
Subject: [PATCH] fixed generation sort

---
 app/models/pool.rb                        | 18 +++++++++---------
 app/models/weight.rb                      |  2 +-
 app/views/static_pages/_fourPool.html.erb |  8 ++++----
 app/views/static_pages/_onePool.html.erb  |  2 +-
 app/views/static_pages/_twoPool.html.erb  |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/models/pool.rb b/app/models/pool.rb
index 51296d2..c38dbdf 100644
--- a/app/models/pool.rb
+++ b/app/models/pool.rb
@@ -1,6 +1,6 @@
 class Pool
 	def onePool(wrestlers,weight_id,tournament)
-		wrestlers.each do |w|
+		wrestlers.sort_by{|x|[x.original_seed]}.each do |w|
 			w.poolNumber = 1
 			w.save
 		end
@@ -12,7 +12,7 @@ class Pool
 		#wrestlers.sort_by{|x|[x.original_seed]}
 		
 		pool = 1
-		wrestlers.each do |w|
+		wrestlers.sort_by{|x|[x.original_seed]}.each do |w|
 			w.poolNumber = pool
 			w.save
 			if pool < 2
@@ -27,16 +27,16 @@ class Pool
 
 
 	def fourPools(wrestlers,weight_id,tournament)
-		#wrestlers.sort_by{|x|[x.original_seed]}
 		
-		pool = 1
-		wrestlers.each do |w|
-			w.poolNumber = pool
+		
+		@pool = 1
+		wrestlers.sort_by{|x|[x.original_seed]}.each do |w|
+			w.poolNumber = @pool
 			w.save
-			if pool < 4
-				pool = pool + 1
+			if @pool < 4
+				@pool = @pool + 1
 			else
-				pool =1
+				@pool =1
 			end
 		end
 		roundRobin(1,tournament,weight_id)
diff --git a/app/models/weight.rb b/app/models/weight.rb
index 541e051..102a74a 100644
--- a/app/models/weight.rb
+++ b/app/models/weight.rb
@@ -6,7 +6,7 @@ class Weight < ActiveRecord::Base
 
 	def generatePool
 		@wrestlers = Wrestler.where(weight_id: self.id)
-		@wrestlers.sort_by{|x|[x.original_seed]}
+		#@wrestlers.sort_by{|w| [w.original_seed]}
 		if self.pools == 1
 			@pool = Pool.new
 			@pool.onePool(@wrestlers,self.id,self.tournament_id)
diff --git a/app/views/static_pages/_fourPool.html.erb b/app/views/static_pages/_fourPool.html.erb
index a868fb3..3ddd053 100644
--- a/app/views/static_pages/_fourPool.html.erb
+++ b/app/views/static_pages/_fourPool.html.erb
@@ -11,7 +11,7 @@
 	<tbody>
 		<% @poolOneWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
 		<tr>
-			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
+			<td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
 			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
@@ -34,7 +34,7 @@
 	<tbody>
 		<% @poolTwoWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
 		<tr>
-			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
+			<td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
 			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
@@ -57,7 +57,7 @@
 	<tbody>
 		<% @poolThreeWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
 		<tr>
-			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
+			<td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
 			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
@@ -80,7 +80,7 @@
 	<tbody>
 		<% @poolFourWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
 		<tr>
-			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
+			<td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
 			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
diff --git a/app/views/static_pages/_onePool.html.erb b/app/views/static_pages/_onePool.html.erb
index 9d9894d..2cec087 100644
--- a/app/views/static_pages/_onePool.html.erb
+++ b/app/views/static_pages/_onePool.html.erb
@@ -13,7 +13,7 @@
 	<tbody>
 		<% @poolOneWrestlers.each do |w| %>
 		<tr>
-			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
+			<td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
 			<td><%= w.boutByRound(1) %><br>Result</td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
diff --git a/app/views/static_pages/_twoPool.html.erb b/app/views/static_pages/_twoPool.html.erb
index e0076a1..d57f9c7 100644
--- a/app/views/static_pages/_twoPool.html.erb
+++ b/app/views/static_pages/_twoPool.html.erb
@@ -12,7 +12,7 @@
 	<tbody>
 		<% @poolOneWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
 		<tr>
-			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
+			<td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
 			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
@@ -36,7 +36,7 @@
 	<tbody>
 		<% @poolTwoWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
 		<tr>
-			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
+			<td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
 			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>