From 8caaf588fd36e4bd63982a89159b96a9ae008aca Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Fri, 6 Feb 2015 13:26:58 -0500
Subject: [PATCH] Made two pool for 7-10 people

---
 app/controllers/static_pages_controller.rb |  1 +
 app/models/weight.rb                       |  4 ++--
 app/views/schools/show.html.erb            |  4 +++-
 app/views/static_pages/_fourPool.html.erb  |  4 ++--
 app/views/static_pages/_twoPool.html.erb   |  6 ++++--
 app/views/weights/show.html.erb            | 10 +++++++++-
 config/routes.rb                           |  1 +
 7 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
index fb659e9..121f864 100644
--- a/app/controllers/static_pages_controller.rb
+++ b/app/controllers/static_pages_controller.rb
@@ -52,6 +52,7 @@ class StaticPagesController < ApplicationController
 	    end
 	    if @tournament
 	    	@weights = Weight.where(tournament_id: @tournament.id)
+	    	@weights = @weights.sort_by{|x|[x.max]}
 	    end
 	end
 
diff --git a/app/models/weight.rb b/app/models/weight.rb
index cf133f5..088b215 100644
--- a/app/models/weight.rb
+++ b/app/models/weight.rb
@@ -22,9 +22,9 @@ class Weight < ActiveRecord::Base
 		@wrestlers = Wrestler.where(weight_id: self.id)
 		if @wrestlers.size <= 6
 			self.pools = 1
-		elsif  (@wrestlers.size > 6) && (@wrestlers.size <= 8)
+		elsif  (@wrestlers.size > 6) && (@wrestlers.size <= 10)
 			self.pools = 2
-		elsif (@wrestlers.size > 8) && (@wrestlers.size <= 16)
+		elsif (@wrestlers.size > 10) && (@wrestlers.size <= 16)
 			self.pools = 4
 		end
 	end
diff --git a/app/views/schools/show.html.erb b/app/views/schools/show.html.erb
index 1f89ea4..c252f50 100644
--- a/app/views/schools/show.html.erb
+++ b/app/views/schools/show.html.erb
@@ -49,7 +49,9 @@
         <tr>
           <td><%= wrestler.name %></td>
           <td><%= Weight.find(wrestler.weight_id).max %></td>
-          <td><%= wrestler.original_seed %></td>
+          <td>
+              <%= wrestler.original_seed %>
+          </td>
           <td><%= wrestler.season_win %>-<%= wrestler.season_loss %></td>
           <td><%= wrestler.criteria %> Win <%= wrestler.seasonWinPercentage %>%</td>
           <td><% if wrestler.extra? == true %>
diff --git a/app/views/static_pages/_fourPool.html.erb b/app/views/static_pages/_fourPool.html.erb
index 2dc9b0b..2315440 100644
--- a/app/views/static_pages/_fourPool.html.erb
+++ b/app/views/static_pages/_fourPool.html.erb
@@ -12,7 +12,7 @@
 		<% @poolOneWrestlers.each do |w| %>
 		<tr>
 			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
-			<td><%= w.boutByRound(1) %><br>Result</td>
+			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
 		</tr>
@@ -35,7 +35,7 @@
 		<% @poolTwoWrestlers.each do |w| %>
 		<tr>
 			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
-			<td><%= w.boutByRound(1) %><br>Result</td>
+			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
 		</tr>
diff --git a/app/views/static_pages/_twoPool.html.erb b/app/views/static_pages/_twoPool.html.erb
index 8290b2a..79555db 100644
--- a/app/views/static_pages/_twoPool.html.erb
+++ b/app/views/static_pages/_twoPool.html.erb
@@ -6,15 +6,17 @@
 			<th>R1</th>
 			<th>R2</th>
 			<th>R3</th>
+			<th>R4</th>
 		</tr>
 	</thead>
 	<tbody>
 		<% @poolOneWrestlers.each do |w| %>
 		<tr>
 			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
-			<td><%= w.boutByRound(1) %><br>Result</td>
+			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
+			<td><%= w.boutByRound(4) %></td>
 		</tr>
 		<% end %>
   	</tbody>
@@ -34,7 +36,7 @@
 		<% @poolTwoWrestlers.each do |w| %>
 		<tr>
 			<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
-			<td><%= w.boutByRound(1) %><br>Result</td>
+			<td><%= w.boutByRound(1) %><br></td>
 			<td><%= w.boutByRound(2) %></td>
 			<td><%= w.boutByRound(3) %></td>
 		</tr>
diff --git a/app/views/weights/show.html.erb b/app/views/weights/show.html.erb
index 85ca098..f3823a2 100644
--- a/app/views/weights/show.html.erb
+++ b/app/views/weights/show.html.erb
@@ -28,7 +28,13 @@
       			<tr>
       				<td><%= wrestler.name %></td>
       				<td><%= School.find(wrestler.school_id).name %></td>
-      				<td><%= wrestler.original_seed %></td>
+      				<td>
+                <% if user_signed_in? %>
+                  <%= wrestler.original_seed %>
+                <% else %>
+                  <%= wrestler.original_seed %>
+                <% end %>
+              </td>
       				<td><%= wrestler.season_win %>-<%= wrestler.season_loss %></td>
       				<td><%= wrestler.criteria %> Win <%= wrestler.seasonWinPercentage %>%</td>
       				<td><% if wrestler.extra? == true %>
@@ -49,3 +55,5 @@
 
 
 
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 09ef9c1..1e13fd5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -30,6 +30,7 @@ Wrestling::Application.routes.draw do
   get 'static_pages/results'
   get 'static_pages/team_scores'
 
+
   # Example of regular route:
   #   get 'products/:id' => 'catalog#view'