Change bracket format to boxes, modularize the brackets, bold the bracket winners, and change the format of the round 1 line

app/models/match.rb

@@ -129,35 +129,47 @@ class Match < ActiveRecord::Base
 	end
 
 	def w1_bracket_name
-      if self.w1 != nil
-      	return "#{w1_name} (#{wrestler1.school.abbreviation})"
-      else
-      	"#{w1_name}"
+	  return_string = ""
+	  return_string_ending = ""
+      if self.w1 and self.winner_id == self.w1
+      	return_string = return_string + "<strong>"
+      	return_string_ending = return_string_ending + "</strong>"
       end
+      if self.w1 != nil
+      	if self.round == 1
+          if self.wrestler1.original_seed
+          	return_string = return_string + "[#{wrestler1.original_seed}] "
+          end
+          return_string = return_string + "#{w1_name} - #{wrestler1.school.name} (#{wrestler1.season_win}-#{wrestler1.season_loss})"
+      	else
+      	  return_string = return_string + "#{w1_name} (#{wrestler1.school.abbreviation})"
+      	end
+      else
+      	return_string = return_string + "#{w1_name}"
+      end
+      return return_string + return_string_ending
 	end
 
 	def w2_bracket_name
+      return_string = ""
+	  return_string_ending = ""
+      if self.w2 and self.winner_id == self.w2
+      	return_string = return_string + "<strong>"
+      	return_string_ending = return_string_ending + "</strong>"
+      end
       if self.w2 != nil
-      	return "#{w2_name} (#{wrestler2.school.abbreviation})"
+      	if self.round == 1
+      	  if self.wrestler2.original_seed
+          	return_string = return_string + "#{wrestler2.original_seed} "
+          end
+          return_string = return_string + "#{w2_name} - #{wrestler2.school.name} (#{wrestler2.season_win}-#{wrestler2.season_loss})"
+      	else
+      	  return_string = return_string + "#{w2_name} (#{wrestler2.school.abbreviation})"
+      	end
       else
-      	"#{w2_name}"
-      end
-	end
-
-	def w1_bracket_name_round_one
-      if self.w1 != nil
-      	return "#{wrestler1.original_seed} #{w1_name} - #{wrestler1.school.abbreviation}"
-      else
-      	"#{w1_name}"
-      end
-	end
-
-	def w2_bracket_name_round_one
-      if self.w2 != nil
-      	return "#{wrestler2.original_seed} #{w2_name} - #{wrestler2.school.abbreviation}"
-      else
-      	"#{w2_name}"
+      	return_string = return_string + "#{w2_name}"
       end
+      return return_string + return_string_ending
 	end
 
 	def winner_name

app/models/tournament.rb

@@ -128,10 +128,26 @@ class Tournament < ActiveRecord::Base
         end
         return error_string
   	end
+
+  	def double_elim_number_of_wrestlers
+  		error_string = ""
+        if self.tournament_type == "Double Elimination 1-6"
+        	weights_with_too_many_wrestlers = weights.select{|w| w.wrestlers.size > 16}
+        	weight_with_too_few_wrestlers = weights.select{|w| w.wrestlers.size < 4}
+        	weights_with_too_many_wrestlers.each do |weight|
+        		error_string = error_string + " The weight class #{weight.max} has more than 16 wrestlers."
+        	end
+        	weight_with_too_few_wrestlers.each do |weight|
+        		error_string = error_string + " The weight class #{weight.max} has less than 4 wrestlers."
+        	end
+        end
+        return error_string
+    end
   	
   	def match_generation_error
   		errorString = "There is a tournament error."
   		modified_sixteen_man_error = modified_sixteen_man_number_of_wrestlers
+        double_elim_error = double_elim_number_of_wrestlers
   		if pool_to_bracket_weights_with_too_many_wrestlers != nil
   			errorString = errorString + " The following weights have too many wrestlers "
   			pool_to_bracket_weights_with_too_many_wrestlers.each do |w|
@@ -140,11 +156,10 @@ class Tournament < ActiveRecord::Base
   			return errorString
   		elsif modified_sixteen_man_error.length > 0
   			return errorString + modified_sixteen_man_error
+  		elsif double_elim_error.length > 0
+  			return error_string + double_elim_error
   		else
   			nil
   		end
   	end
-  	
-  	
-  	
-end
+end

app/views/schools/stats.html.erb

@@ -30,11 +30,11 @@
                 
                 <tbody>
                   <tr>
-                    <td><%= m.w1_name %></td>
+                    <td><%= m.w1_bracket_name %></td>
                     <td><%= m.w1_stat %></td>
                   </tr>
                   <tr>
-                    <td><%= m.w2_name %></td>
+                    <td><%= m.w2_bracket_name %></td>
                     <td><%= m.w2_stat %></td>
                   </tr>
                 </tbody>

app/views/tournaments/_bracket_final.html.erb

@@ -0,0 +1,15 @@
+  <div class="round">
+  	<% @final_match.each do |match| %>
+		<div class="game">
+		  <div class="game-top "><%= match.w1_bracket_name.html_safe %> <span></span></div>
+		  <div class="bout-number"><p><%= match.bout_number %> <%= match.bracket_score_string %></p><p><%= @winner_place %> Place Winner</p></div>
+		  <div class="game-bottom "><%= match.w2_bracket_name.html_safe %><span></span></div>
+		</div>
+  </div>
+  <!-- <div class="round">
+		<div class="game">
+		  <div class="bracket-winner"> <%= match.bracket_winner_name %></div>
+		  <div class="bout_number"><%= @winner_place %> Place Winner</div>
+		</div>
+	<% end %>
+  </div> -->

app/views/tournaments/_bracket_partial.html.erb

@@ -3,58 +3,78 @@ table.smallText tr td { font-size: 10px; }
 /*
  *  Bracket Layout Specifics
 */
-main {
-  display:flex;
-}
-
-.round {
-  display:flex;
-  flex-direction:column;
-  width: 145px;
-  list-style:none;
-  padding:0;
+.bracket {
+  display: flex;
   font-size: 10px;
 }
-
-.game + li {
-  flex-grow:1;
-}
-
-li:first-child,li:last-child {
-  flex-grow:.5;
-}
-
 .game {
-  padding-left:5px;
+  min-width: 150px;
+  min-height: 50px;
+  /*background-color: #ddd;*/
+  border: 1px solid #ddd;
+  margin: 5px;
 }
 
-.winner {
-  font-weight:bold;
+/*.game:after {
+  content:'';
+  border-color: #4f7a38;
+  border-width: 2px;
+  position: absolute;
+  display: block;
+  width: 10px;
+  right: -11px;
 }
 
-.game span {
-  float:right;
-  margin-right:5px;
+.game:nth-of-type(odd):after {
+  border-right-style: solid;
+  border-top-style: solid;
+  height: 100%;
+  top: 50%;
+}
+
+.game:nth-of-type(even):after {
+  border-right-style: solid;
+  border-bottom-style: solid;
+  height: 100%;
+  top: -50%;
+}
+
+.game:before {
+  content:'';
+  border-top: 2px solid #4f7a38;
+  position: absolute;
+  height: 2px;
+  width: 10px;
+  left: -10px;
+  top: 50%;
+}*/
+
+.round {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
 }
 
 .game-top {
-  border-bottom:1px solid #aaa;
-}
-
-.game-top + li {
-  border-right:1px solid #aaa; min-height:5px;
+  border-bottom:1px solid #ddd;
+  padding: 2px;
+  min-height: 12px;
 }
 
 .bout-number {
   text-align: center;
-  padding-top: 15px;
+  /*padding-top: 15px;*/
 }
 .bracket-winner {
-  border-bottom:1px solid #aaa;
+  border-bottom:1px solid #ddd;
+  padding: 2px;
+  min-height: 12px;
 }
 
 .game-bottom {
-  border-bottom:1px solid #aaa; border-right:1px solid #aaa;
+  border-top:1px solid #ddd;
+  padding: 2px;
+  min-height: 12px;
 }
 </style>
   <table class='smallText'>

app/views/tournaments/_bracket_round.html.erb

@@ -0,0 +1,9 @@
+<div class="round">
+<% @round_matches.sort_by{|m| m.bracket_position_number}.each do |match| %>
+	<div class="game">
+	  <div class="game-top "><%= match.w1_bracket_name.html_safe %> <span></span></div>
+	  <div class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</div>
+	  <div class="game-bottom "><%= match.w2_bracket_name.html_safe %><span></span></div>
+	</div>
+<% end %>
+</div>

app/views/tournaments/_eight_man_double_elimination_bracket.html.erb

@@ -1,109 +1,33 @@
 <h4>Championship Bracket</h4>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		<li class="game game-top "><%= match.w1_bracket_name_round_one %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name_round_one %><span></span></li>
-		<li></li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-2">
-		<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		<li></li>
-		<% end %>
-	</ul>
-	<ul class="round round-3">
-		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li>&nbsp;</li>
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		<li></li>
-		
-	</ul>
-	<ul class="round round-4">
-		<li>&nbsp;</li>
-		<li class="bracket-winner"> <%= match.bracket_winner_name %> <span></span></li>
-		1st
-        <li></li>
-		
-	</ul>
-	<% end %>	
-</main>
+<div class="bracket">
+  <!--Round 1-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Quarter"} %>
+  <%= render 'bracket_round' %>
+  <!--Round 2-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %>
+  <%= render 'bracket_round' %>
+  <!--Round 3-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %>
+  <% @winner_place = "1st" %>
+  <%= render 'bracket_final' %>
+</div>
 <h4>Consolation Bracket</h4>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		<li>&nbsp;</li>
-
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-2">
-		<% @matches.select{|m|m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		<li>&nbsp;</li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-3">
-		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-4">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"> <%= match.bracket_winner_name %> <span></span></li>
-		3rd
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<% end %>	
-</main>
+<div class="bracket">
+  <!--Round 1-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Quarter"} %>	
+  <%= render 'bracket_round' %>
+  <!--Round 2-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Semis"} %>	
+  <%= render 'bracket_round' %>
+  <!--Round 3-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %>
+  <% @winner_place = "3rd" %>
+  <%= render 'bracket_final' %>
+</div>
 <h4>5/6 place match</h4>
-<main id="bracket">
-    <ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "5/6"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-2">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"> <%= match.bracket_winner_name %> <span></span></li>
-		5th
-
-		<li>&nbsp;</li>
-	</ul>
-	<% end %>
-</main>
+<div class="bracket">
+  <!--Round 1-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %>
+  <% @winner_place = "5th" %>
+  <%= render 'bracket_final' %>
+</div>

app/views/tournaments/_fourPoolQuarterBracket.html.erb

@@ -1,132 +1,37 @@
 <h5>Bracket After Pool</h5>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-2">
-		<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		<li>&nbsp;</li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-3">
-		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-4">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %> <span></span></li>
-		1st
-
-		<li>&nbsp;</li>
-		
-	</ul>
-		<% end %>	
-</main>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-2">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"> <%= match.bracket_winner_name %><span></span></li>
-		3rd
-
-		<li>&nbsp;</li>
-		
-	</ul>	
-		<% end %>
-</main>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-2">
-		<% @matches.select{|m|m.bracket_position == "5/6"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-3">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"> <%= match.bracket_winner_name %><span></span></li>
-		5th
-
-		<li>&nbsp;</li>
-		
-	</ul>	
-		<% end %>
-</main>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "7/8"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-2">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %> <span></span></li>
-		7th
-
-		<li>&nbsp;</li>
-		
-	</ul>	
-		<% end %>
-</main>
-
-
-
-
+<div class="bracket">
+<!--Round 1 -->
+  	<% @round_matches = @matches.select{|m|m.bracket_position == "Quarter"} %>
+	<%= render 'bracket_round' %>
+<!--Round 2-->
+  	<% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %>
+	<%= render 'bracket_round' %>
+<!--Round 3-->
+  	<% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %>
+  	<% @winner_place = "1st" %>
+	<%= render 'bracket_final' %>
+</div>
+<br>
+<div class="bracket">
+<!--Round 1-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %>
+  	<% @winner_place = "3rd" %>
+	<%= render 'bracket_final' %>
+</div>
+ <br>
+<div class="bracket">
+<!--Round 1 -->
+  	<% @round_matches = @matches.select{|m|m.bracket_position == "Conso Semis"} %>
+	<%= render 'bracket_round' %>
+<!--Round 2-->
+  	<% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %>
+  	<% @winner_place = "5th" %>
+	<%= render 'bracket_final' %>
+</div>
+<br>
+<div class="bracket">
+<!--Round 1-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "7/8"} %>
+  	<% @winner_place = "7th" %>
+	<%= render 'bracket_final' %>
+</div>

app/views/tournaments/_fourPoolSemiBracket.html.erb

@@ -1,124 +1,34 @@
 <h5>Bracket After Pool</h5>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-2">
-		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-3">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %><span></span></li>
-		1st
-
-		<li>&nbsp;</li>
-		
-	</ul>	
-		<% end %>
-</main>
-
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-2">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %><span></span></li>
-		3rd
-
-		<li>&nbsp;</li>
-		
-	</ul>	
-		<% end %>
-</main>
-
-
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-2">
-		<% @matches.select{|m|m.bracket_position == "5/6"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-3">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %><span></span></li>
-		5th
-
-		<li>&nbsp;</li>
-		
-	</ul>	
-		<% end %>
-</main>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "7/8"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-2">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %><span></span></li>
-		7th
-
-		<li>&nbsp;</li>
-		
-	</ul>	
-		<% end %>
-</main>
-
-
-
-
+<div class="bracket">
+<!--Round 1-->
+  	<% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %>
+	<%= render 'bracket_round' %>
+<!--Round 2-->
+  	<% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %>
+  	<% @winner_place = "1st" %>
+	<%= render 'bracket_final' %>
+</div>
+<br>
+<div class="bracket">
+<!--Round 1-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %>
+  	<% @winner_place = "3rd" %>
+	<%= render 'bracket_final' %>
+</div>
+ <br>
+<div class="bracket">
+<!--Round 1 -->
+  	<% @round_matches = @matches.select{|m|m.bracket_position == "Conso Semis"} %>
+	<%= render 'bracket_round' %>
+<!--Round 2-->
+  	<% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %>
+  	<% @winner_place = "5th" %>
+	<%= render 'bracket_final' %>
+</div>
+<br>
+<div class="bracket">
+<!--Round 1-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "7/8"} %>
+  	<% @winner_place = "7th" %>
+	<%= render 'bracket_final' %>
+</div>

app/views/tournaments/_pool.html.erb

@@ -18,7 +18,7 @@
     	<tbody>
     		<% @wrestlers.select{|w| w.pool == @pool}.sort_by{|w| w.bracket_line}.each do |w| %>
     		<tr>
-    			<td><%= w.original_seed %> <%= w.name %> - <%= w.school.name %></td>
+    			<td>[<%= w.original_seed %>] <%="#{w.name} - #{w.school.name} (#{w.season_win}-#{w.season_loss})" %></td>
     			<% @round = 1 %>
     			<% until @matches.select{|m| m.round == @round}.blank? %>
     			    <% if @round <= @pools %>

app/views/tournaments/_sixteen_man_double_elimination_bracket.html.erb

@@ -1,143 +1,42 @@
 <h4>Championship Bracket</h4>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "Bracket" and m.round == 1}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		<li class="game game-top "><%= match.w1_bracket_name_round_one %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name_round_one %><span></span></li>
-		<li>&nbsp;</li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-2">
-		<% @matches.select{|m|m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li></li>
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		<li></li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-3">
-		<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li></li>
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		<li></li>
-		<% end %>
-	</ul>
-	<ul class="round round-4">
-		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li></li>
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		<li></li>
-		
-	</ul>
-	<ul class="round round-5">
-		<li></li>
-		<li class="bracket-winner"> <%= match.bracket_winner_name %> <span></span></li>
-		1st
-        <li></li>
-		
-	</ul>
-	<% end %>	
-</main>
+<div class="bracket">
+  <!--Round 1-->
+  <%  @round_matches = @matches.select{|m|m.bracket_position == "Bracket" and m.round == 1} %>
+  <%= render 'bracket_round' %>
+  <!--Round 2-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Quarter"} %>
+  <%= render 'bracket_round' %>
+  <!--Round 3-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %>
+  <%= render 'bracket_round' %>
+  <!--Round 4-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %>
+  <% @winner_place = "1st" %>
+  <%= render 'bracket_final' %>
+</div>
 <h4>Consolation Bracket</h4>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "Conso" and m.round == 2}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		<li>&nbsp;</li>
-
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-2">
-		<% @matches.select{|m|m.bracket_position == "Conso" and m.round == 3}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		
-		<% end %>
-	</ul>
-	<ul class="round round-3">
-		<% @matches.select{|m|m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		<li>&nbsp;</li>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		
-		<% end %>
-	</ul>
-	<ul class="round round-4">
-		<% @matches.select{|m|m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-		<li>&nbsp;</li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-5">
-		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-6">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"> <%= match.bracket_winner_name %> <span></span></li>
-		3rd
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<% end %>	
-</main>
+<div class="bracket">
+  <!--Round 1-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Conso" and m.round == 2} %>		
+  <%= render 'bracket_round' %>
+  <!--Round 2-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Conso" and m.round == 3} %>		
+  <%= render 'bracket_round' %>
+  <!--Round 3-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Quarter"} %>	
+  <%= render 'bracket_round' %>
+  <!--Round 4-->
+  <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Semis"} %>	
+  <%= render 'bracket_round' %>
+  <!--Round 5-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %>
+  <% @winner_place = "3rd" %>
+  <%= render 'bracket_final' %>
+</div>
 <h4>5/6 place match</h4>
-<main id="bracket">
-    <ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "5/6"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-2">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"> <%= match.bracket_winner_name %> <span></span></li>
-		5th
-
-		<li>&nbsp;</li>
-	</ul>
-	<% end %>
-</main>
+<div class="bracket">
+  <!--Round 1-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %>
+  <% @winner_place = "5th" %>
+  <%= render 'bracket_final' %>
+</div>

app/views/tournaments/_twoPoolFinalBracket.html.erb

@@ -1,47 +1,14 @@
 <h5>Bracket After Pool</h5>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-2">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %><span></span></li>
-		1st
-
-		<li>&nbsp;</li>
-	</ul>
-		<% end %>
-</main>
-
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-2">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %> <span></span></li>
-		3rd
-
-		<li>&nbsp;</li>
-	</ul>
-		<% end %>
-</main>
-
+<div class="bracket">
+<!--Round 1-->
+  	<% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %>
+  	<% @winner_place = "1st" %>
+	<%= render 'bracket_final' %>
+</div>
+<br>
+<div class="bracket">
+<!--Round 1-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %>
+  	<% @winner_place = "3rd" %>
+	<%= render 'bracket_final' %>
+</div>

app/views/tournaments/_twoPoolSemiBracket.html.erb

@@ -1,60 +1,17 @@
 <h5>Bracket After Pool</h5>
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-		<% end %>
-	</ul>
-	<ul class="round round-2">
-		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-3">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %><span></span></li>
-		1st
-
-		<li>&nbsp;</li>
-		
-	</ul>	
-		<% end %>
-</main>
-
-<main id="bracket">
-	<ul class="round round-1">
-		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li>&nbsp;</li>
-		
-		<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
-		<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
-		<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
-
-		<li>&nbsp;</li>
-		
-	</ul>
-	<ul class="round round-2">
-		<li>&nbsp;</li>
-		
-		<li class="bracket-winner"><%= match.bracket_winner_name %><span></span></li>
-		3rd
-
-		<li>&nbsp;</li>
-		
-	</ul>	
-		<% end %>
-</main>
+<div class="bracket">
+<!--Round 1-->
+  	<% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %>
+	<%= render 'bracket_round' %>
+<!--Round 2-->
+  	<% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %>
+  	<% @winner_place = "1st" %>
+	<%= render 'bracket_final' %>
+</div>
+<br>
+<div class="bracket">
+<!--Round 1-->
+  <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %>
+  	<% @winner_place = "3rd" %>
+	<%= render 'bracket_final' %>
+</div>

test/integration/double_elimination_eight_man_match_generation_test.rb

@@ -78,7 +78,7 @@ class DoubleEliminationEightManMatchGeneration < ActionDispatch::IntegrationTest
 
     match2 = @tournament.matches.select{|m| m.bracket_position == "Conso Semis"}.first
     wrestler2 = get_wrestler_by_name("Test2")
-    match2.w1 = wrestler.id
+    match2.w1 = wrestler2.id
     match2.save
 
     assert wrestler.reload.placement_points == 3

test/integration/double_elimination_run_through_test.rb

@@ -63,5 +63,101 @@ class DoubleEliminationRunThrough < ActionDispatch::IntegrationTest
     # end
   end
 
+  test "16 man double elimination" do
+    create_double_elim_tournament_single_weight_1_6(14)
+    matches = @tournament.matches.reload
 
+    round1 = matches.select{|m| m.round == 1}
+    winner_by_name("Test9", round1.select{|m| m.bracket_position_number == 2}.first)
+    winner_by_name("Test5", round1.select{|m| m.bracket_position_number == 3}.first)
+    winner_by_name("Test4", round1.select{|m| m.bracket_position_number == 4}.first)
+    winner_by_name("Test13", round1.select{|m| m.bracket_position_number == 5}.first)
+    winner_by_name("Test6", round1.select{|m| m.bracket_position_number == 6}.first)
+    winner_by_name("Test10", round1.select{|m| m.bracket_position_number == 7}.first)
+
+    quarter = matches.select{|m| m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}
+    assert quarter.first.reload.wrestler1.name == "Test1"
+    assert quarter.first.reload.wrestler2.name == "Test9"
+    assert quarter.second.reload.wrestler1.name == "Test5"
+    assert quarter.second.reload.wrestler2.name == "Test4"
+    assert quarter.third.reload.wrestler1.name == "Test13"
+    assert quarter.third.reload.wrestler2.name == "Test6"
+    assert quarter.fourth.reload.wrestler1.name == "Test10"
+    assert quarter.fourth.reload.wrestler2.name == "Test2"
+
+    conso_round2 = matches.select{|m| m.bracket_position == "Conso" and m.round == 2}.sort_by{|m| m.bracket_position_number}
+    assert conso_round2.first.reload.wrestler2.name == "Test8"
+    assert conso_round2.second.reload.wrestler1.name == "Test12"
+    assert conso_round2.second.reload.wrestler2.name == "Test14"
+    assert conso_round2.third.reload.wrestler1.name == "Test3"
+    assert conso_round2.third.reload.wrestler2.name == "Test11"
+    assert conso_round2.fourth.reload.wrestler1.name == "Test7"
+
+    winner_by_name("Test1", quarter.first)
+    winner_by_name("Test5", quarter.second)
+    winner_by_name("Test13", quarter.third)
+    winner_by_name("Test10", quarter.fourth)
+    winner_by_name("Test12", conso_round2.second)
+    winner_by_name("Test3", conso_round2.third)
+
+    semis = matches.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
+    assert semis.first.reload.wrestler1.name == "Test1"
+    assert semis.first.reload.wrestler2.name == "Test5"
+    assert semis.second.reload.wrestler1.name == "Test13"
+    assert semis.second.reload.wrestler2.name == "Test10"
+
+    conso_round3 = matches.select{|m| m.bracket_position == "Conso" and m.round == 3}.sort_by{|m| m.bracket_position_number}
+    assert conso_round3.first.reload.wrestler1.name == "Test2"
+    assert conso_round3.first.reload.wrestler2.name == "Test8"
+    assert conso_round3.second.reload.wrestler1.name == "Test6"
+    assert conso_round3.second.reload.wrestler2.name == "Test12"
+    assert conso_round3.third.reload.wrestler1.name == "Test4"
+    assert conso_round3.third.reload.wrestler2.name == "Test3"
+    assert conso_round3.fourth.reload.wrestler1.name == "Test9"
+    assert conso_round3.fourth.reload.wrestler2.name == "Test7"
+
+    winner_by_name("Test2", conso_round3.first)
+    winner_by_name("Test6", conso_round3.second)
+    winner_by_name("Test3", conso_round3.third)
+    winner_by_name("Test9", conso_round3.fourth)
+
+    conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
+    assert conso_quarter.first.reload.wrestler1.name == "Test2"
+    assert conso_quarter.first.reload.wrestler2.name == "Test6"
+    assert conso_quarter.second.reload.wrestler1.name == "Test3"
+    assert conso_quarter.second.reload.wrestler2.name == "Test9"
+
+    winner_by_name("Test5",semis.first)
+    winner_by_name("Test10",semis.second)
+    winner_by_name("Test2", conso_quarter.first)
+    winner_by_name("Test3", conso_quarter.second)
+
+    conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
+    assert conso_semis.first.reload.wrestler1.name == "Test1"
+    assert conso_semis.first.reload.wrestler2.name == "Test2"
+    assert conso_semis.second.reload.wrestler1.name == "Test13"
+    assert conso_semis.second.reload.wrestler2.name == "Test3"
+
+    winner_by_name("Test2",conso_semis.first)
+    winner_by_name("Test3",conso_semis.second)
+
+    first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
+    third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
+    fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
+
+    assert first_finals.reload.wrestler1.name == "Test5"
+    assert first_finals.reload.wrestler2.name == "Test10"
+
+    assert third_finals.reload.wrestler1.name == "Test2"
+    assert third_finals.reload.wrestler2.name == "Test3"
+
+    assert fifth_finals.reload.wrestler1.name == "Test1"
+    assert fifth_finals.reload.wrestler2.name == "Test13"
+
+    # DEBUG
+    # matches.sort_by{|m| m.bout_number}.each do |match|
+    #   match.reload
+    #   puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
+    # end
+  end
 end

test/integration/double_elimination_sixteen_man_match_generation_test.rb

@@ -0,0 +1,141 @@
+require 'test_helper'
+
+class DoubleEliminationSixteenManMatchGeneration < ActionDispatch::IntegrationTest
+  def setup
+    create_double_elim_tournament_single_weight_1_6(14)
+  end
+
+  test "Match generation works" do
+    assert @tournament.matches.count == 29
+    assert @tournament.matches.select{|m| m.bracket_position == "1/2"}.count == 1
+    assert @tournament.matches.select{|m| m.bracket_position == "3/4"}.count == 1
+    assert @tournament.matches.select{|m| m.bracket_position == "5/6"}.count == 1
+    assert @tournament.matches.select{|m| m.bracket_position == "Bracket" and m.round == 1}.count == 8
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2}.count == 4
+    assert @tournament.matches.select{|m| m.bracket_position == "Quarter"}.count == 4
+    assert @tournament.matches.select{|m| m.bracket_position == "Semis"}.count == 2
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 3}.count == 4
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso Quarter"}.count == 2
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso Semis"}.count == 2
+  end
+
+  test "Seeded wrestlers have correct first line" do
+    @tournament.matches.reload
+    match1 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 1}.first
+    match2 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 2}.first
+    match3 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 3}.first
+    match4 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 4}.first
+    match5 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 5}.first
+    match6 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 6}.first
+    match7 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 7}.first
+    match8 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 8}.first
+    
+    assert match1.wrestler1.bracket_line == 1
+    assert match1.loser2_name == "BYE"
+
+    assert match2.wrestler1.bracket_line == 8
+    assert match2.wrestler2.bracket_line == 9
+
+    assert match3.wrestler1.bracket_line == 5
+    assert match3.wrestler2.bracket_line == 12
+
+    assert match4.wrestler1.bracket_line == 4
+    assert match4.wrestler2.bracket_line == 14
+
+    assert match5.wrestler1.bracket_line == 3
+    assert match5.wrestler2.bracket_line == 13
+
+    assert match6.wrestler1.bracket_line == 6
+    assert match6.wrestler2.bracket_line == 11
+
+    assert match7.wrestler1.bracket_line == 7
+    assert match7.wrestler2.bracket_line == 10
+
+    assert match8.wrestler1.bracket_line == 2
+    assert match8.loser2_name == "BYE"
+  end
+
+  test "Byes are advanced correctly" do
+    @tournament.matches.reload
+    match1 = @tournament.matches.select{|match| match.round == 2 and match.bracket_position == "Quarter" and match.bracket_position_number == 1}.first
+    match2 = @tournament.matches.select{|match| match.round == 2 and match.bracket_position == "Quarter" and match.bracket_position_number == 4}.first
+
+    assert match1.wrestler1.name == "Test1"
+    assert match2.wrestler2.name == "Test2"
+  end
+
+  test "Loser names set up correctly" do
+    @tournament.matches.reload
+    match1 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 1}.first
+    match2 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 2}.first
+    match3 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 3}.first
+    match4 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 4}.first
+    match5 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 5}.first
+    match6 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 6}.first
+    match7 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 7}.first
+    match8 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 8}.first
+
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 1}.first.loser1_name == "BYE"
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{match2.bout_number}"
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 2}.first.loser1_name == "Loser of #{match3.bout_number}"
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 2}.first.loser2_name == "Loser of #{match4.bout_number}"
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 3}.first.loser1_name == "Loser of #{match5.bout_number}"
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 3}.first.loser2_name == "Loser of #{match6.bout_number}"
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 4}.first.loser1_name == "Loser of #{match7.bout_number}"
+    assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 4}.first.loser2_name == "BYE"
+
+    quarter1 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 1}.first
+    quarter2 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 2}.first
+    quarter3 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 3}.first
+    quarter4 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 4}.first
+    consoround2match1 = @tournament.matches.select{|match| match.bracket_position == "Conso" and match.round == 3 && match.bracket_position_number == 1}.first
+    consoround2match2 = @tournament.matches.select{|match| match.bracket_position == "Conso" and match.round == 3 && match.bracket_position_number == 2}.first
+    consoround2match3 = @tournament.matches.select{|match| match.bracket_position == "Conso" and match.round == 3 && match.bracket_position_number == 3}.first
+    consoround2match4 = @tournament.matches.select{|match| match.bracket_position == "Conso" and match.round == 3 && match.bracket_position_number == 4}.first
+
+    assert consoround2match1.loser1_name == "Loser of #{quarter4.bout_number}"
+    assert consoround2match2.loser1_name == "Loser of #{quarter3.bout_number}"
+    assert consoround2match3.loser1_name == "Loser of #{quarter2.bout_number}"
+    assert consoround2match4.loser1_name == "Loser of #{quarter1.bout_number}"
+
+    semis1 = @tournament.matches.select{|match| match.bracket_position == "Semis" and match.bracket_position_number == 1}.first
+    semis2 = @tournament.matches.select{|match| match.bracket_position == "Semis" and match.bracket_position_number == 2}.first
+    consosemis1 = @tournament.matches.select{|match| match.bracket_position == "Conso Semis" and match.bracket_position_number == 1}.first
+    consosemis2 = @tournament.matches.select{|match| match.bracket_position == "Conso Semis" and match.bracket_position_number == 2}.first
+
+    assert consosemis1.loser1_name == "Loser of #{semis1.bout_number}"  
+    assert consosemis2.loser1_name == "Loser of #{semis2.bout_number}"  
+
+    assert @tournament.matches.select{|m| m.bracket_position == "5/6" && m.bracket_position_number == 1}.first.loser1_name == "Loser of #{consosemis1.bout_number}"
+    assert @tournament.matches.select{|m| m.bracket_position == "5/6" && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{consosemis2.bout_number}" 
+  end
+
+  test "Placement points are given when moving through bracket" do
+    match = @tournament.matches.select{|m| m.bracket_position == "Semis"}.first
+    wrestler = get_wrestler_by_name("Test1")
+    match.w1 = wrestler.id
+    match.save
+
+    match2 = @tournament.matches.select{|m| m.bracket_position == "Conso Semis"}.first
+    wrestler2 = get_wrestler_by_name("Test2")
+    match2.w1 = wrestler2.id
+    match2.save
+
+    assert wrestler.reload.placement_points == 3
+    assert wrestler2.reload.placement_points == 3
+  end
+
+  test "Run through all matches works" do
+    @tournament.matches.sort_by{ |match| match.bout_number }.each do |match|
+      match.reload
+      if match.finished != 1 and match.w1 and match.w2
+          match.winner_id = match.w1
+          match.win_type = "Decision"
+          match.score = "0-0"
+          match.finished = 1
+          match.save
+      end
+    end
+    assert @tournament.matches.reload.select{|m| m.finished == 0}.count == 0
+  end
+end