From 59f20e1698e9be29225a87f0cb5de89dbb89c8d6 Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Wed, 6 Jan 2016 20:26:20 +0000
Subject: [PATCH] Deducted points breaks tie before head to head

---
 app/models/pool_order.rb                  | 2 +-
 app/views/static_pages/about.html.erb     | 2 +-
 test/integration/pool_advancement_test.rb | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/models/pool_order.rb b/app/models/pool_order.rb
index 97155d4..f88b934 100644
--- a/app/models/pool_order.rb
+++ b/app/models/pool_order.rb
@@ -41,10 +41,10 @@ class PoolOrder
 	
 	def breakTie
 		originalTieSize = wrestlersWithSamePoints.size
+		ifWrestlersWithSamePointsIsSameAsOriginal(originalTieSize) { deductedPoints }
 		if originalTieSize == 2
 	    	ifWrestlersWithSamePointsIsSameAsOriginal(originalTieSize) { headToHead }
 		end
-		ifWrestlersWithSamePointsIsSameAsOriginal(originalTieSize) { deductedPoints }
 		ifWrestlersWithSamePointsIsSameAsOriginal(originalTieSize) { teamPoints }
 		ifWrestlersWithSamePointsIsSameAsOriginal(originalTieSize) { mostFalls }
 		ifWrestlersWithSamePointsIsSameAsOriginal(originalTieSize) { mostTechs }
diff --git a/app/views/static_pages/about.html.erb b/app/views/static_pages/about.html.erb
index bd4b70b..52f755d 100644
--- a/app/views/static_pages/about.html.erb
+++ b/app/views/static_pages/about.html.erb
@@ -7,8 +7,8 @@
 <p>At this moment in time, WrestlingDev supports a pool to bracket type tournament for up to 16 teams. The bracket format follows OHSAA's 5 match per day rule. WrestlingDev will automatically generate brackets, generate bout numbers, generate and update a bout board, track team points, and update brackets.</p>
 <p>For pool to bracket tournaments, pool tie breakers are the following:</p>
 <ul>
-    <li>Head to head</li>
     <li>Least team points deducted</li>
+    <li>Head to head</li>
     <li>Most team points scored</li>
     <li>Most wins by fall, default, dq</li>
     <li>Most wins by tech fall</li>
diff --git a/test/integration/pool_advancement_test.rb b/test/integration/pool_advancement_test.rb
index d7a02ae..66bc500 100644
--- a/test/integration/pool_advancement_test.rb
+++ b/test/integration/pool_advancement_test.rb
@@ -96,11 +96,6 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
     endMatch(2004,"Guy4",matches)
     endMatch(2005,"Guy9",matches)
     endMatch(3004,"Guy7",matches)
-    #DEDUCTED POINTS SHOULD NOT MATTER FOR HEAD TO HEAD
-    deduct = Teampointadjust.new
-    deduct.wrestler_id = translateNameToId("Guy3")
-    deduct.points = 1
-    deduct.save
     endMatch(3005,"Guy3",matches)
   end