cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-18 21:42:16 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jacob Cody Wimer
2020-03-04 14:22:29 -05:00
parent d2c68d7c6b
commit 6d5f6d39f7
11 changed files with 279 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/models/match.rb
View File

@@ -129,35 +129,47 @@ class Match < ActiveRecord::Base
end end
def w1_bracket_name def w1_bracket_name
if self.w1 != nil return_string = ""
return "#{w1_name} (#{wrestler1.school.abbreviation})" return_string_ending = ""
else if self.w1 and self.winner_id == self.w1
"#{w1_name}" return_string = return_string + "<strong>"
return_string_ending = return_string_ending + "</strong>"
end 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 end
def w2_bracket_name 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 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 else
"#{w2_name}" return_string = return_string + "#{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}"
end end
return return_string + return_string_ending
end end
def winner_name def winner_name

15
app/views/tournaments/_bracket_final.html.erb Normal file
View File

@@ -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> -->

86
app/views/tournaments/_bracket_partial.html.erb
View File

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

9
app/views/tournaments/_bracket_round.html.erb Normal file
View File

@@ -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>

136
app/views/tournaments/_eight_man_double_elimination_bracket.html.erb
View File

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

167
app/views/tournaments/_fourPoolQuarterBracket.html.erb
View File

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

156
app/views/tournaments/_fourPoolSemiBracket.html.erb
View File

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

2
app/views/tournaments/_pool.html.erb
View File

@@ -18,7 +18,7 @@
<tbody> <tbody>
<% @wrestlers.select{|w| w.pool == @pool}.sort_by{|w| w.bracket_line}.each do |w| %> <% @wrestlers.select{|w| w.pool == @pool}.sort_by{|w| w.bracket_line}.each do |w| %>
<tr> <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 %> <% @round = 1 %>
<% until @matches.select{|m| m.round == @round}.blank? %> <% until @matches.select{|m| m.round == @round}.blank? %>
<% if @round <= @pools %> <% if @round <= @pools %>

179
app/views/tournaments/_sixteen_man_double_elimination_bracket.html.erb
View File

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

59
app/views/tournaments/_twoPoolFinalBracket.html.erb
View File

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

75
app/views/tournaments/_twoPoolSemiBracket.html.erb
View File

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