diff --git a/app/models/match.rb b/app/models/match.rb index 698cc19..825a7b8 100644 --- a/app/models/match.rb +++ b/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 + "" + return_string_ending = return_string_ending + "" 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 + "" + return_string_ending = return_string_ending + "" + 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 diff --git a/app/views/tournaments/_bracket_final.html.erb b/app/views/tournaments/_bracket_final.html.erb new file mode 100644 index 0000000..97a672e --- /dev/null +++ b/app/views/tournaments/_bracket_final.html.erb @@ -0,0 +1,15 @@ +
+ <% @final_match.each do |match| %> +
+
<%= match.w1_bracket_name.html_safe %>
+

<%= match.bout_number %> <%= match.bracket_score_string %>

<%= @winner_place %> Place Winner

+
<%= match.w2_bracket_name.html_safe %>
+
+
+ \ No newline at end of file diff --git a/app/views/tournaments/_bracket_partial.html.erb b/app/views/tournaments/_bracket_partial.html.erb index 6436acf..141c7c6 100644 --- a/app/views/tournaments/_bracket_partial.html.erb +++ b/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; } diff --git a/app/views/tournaments/_bracket_round.html.erb b/app/views/tournaments/_bracket_round.html.erb new file mode 100644 index 0000000..826785a --- /dev/null +++ b/app/views/tournaments/_bracket_round.html.erb @@ -0,0 +1,9 @@ +
+<% @round_matches.sort_by{|m| m.bracket_position_number}.each do |match| %> +
+
<%= match.w1_bracket_name.html_safe %>
+
<%= match.bout_number %> <%= match.bracket_score_string %> 
+
<%= match.w2_bracket_name.html_safe %>
+
+<% end %> +
\ No newline at end of file diff --git a/app/views/tournaments/_eight_man_double_elimination_bracket.html.erb b/app/views/tournaments/_eight_man_double_elimination_bracket.html.erb index 364a298..45ebddf 100644 --- a/app/views/tournaments/_eight_man_double_elimination_bracket.html.erb +++ b/app/views/tournaments/_eight_man_double_elimination_bracket.html.erb @@ -1,109 +1,33 @@

Championship Bracket

-
- - - - - <% end %> -
+
+ + <% @round_matches = @matches.select{|m|m.bracket_position == "Quarter"} %> + <%= render 'bracket_round' %> + + <% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %> + <%= render 'bracket_round' %> + + <% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %> + <% @winner_place = "1st" %> + <%= render 'bracket_final' %> +

Consolation Bracket

-
- - - - - <% end %> -
+
+ + <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Quarter"} %> + <%= render 'bracket_round' %> + + <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Semis"} %> + <%= render 'bracket_round' %> + + <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %> + <% @winner_place = "3rd" %> + <%= render 'bracket_final' %> +

5/6 place match

-
- - - <% end %> -
\ No newline at end of file +
+ + <% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %> + <% @winner_place = "5th" %> + <%= render 'bracket_final' %> +
\ No newline at end of file diff --git a/app/views/tournaments/_fourPoolQuarterBracket.html.erb b/app/views/tournaments/_fourPoolQuarterBracket.html.erb index cae57b0..61e1a03 100644 --- a/app/views/tournaments/_fourPoolQuarterBracket.html.erb +++ b/app/views/tournaments/_fourPoolQuarterBracket.html.erb @@ -1,132 +1,37 @@
Bracket After Pool
-
- - - - - <% end %> -
-
- - - <% end %> -
-
- - - - <% end %> -
-
- - - <% end %> -
- - - - +
+ + <% @round_matches = @matches.select{|m|m.bracket_position == "Quarter"} %> + <%= render 'bracket_round' %> + + <% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %> + <%= render 'bracket_round' %> + + <% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %> + <% @winner_place = "1st" %> + <%= render 'bracket_final' %> +
+
+
+ + <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %> + <% @winner_place = "3rd" %> + <%= render 'bracket_final' %> +
+
+
+ + <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Semis"} %> + <%= render 'bracket_round' %> + + <% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %> + <% @winner_place = "5th" %> + <%= render 'bracket_final' %> +
+
+
+ + <% @final_match = @matches.select{|m|m.bracket_position == "7/8"} %> + <% @winner_place = "7th" %> + <%= render 'bracket_final' %> +
\ No newline at end of file diff --git a/app/views/tournaments/_fourPoolSemiBracket.html.erb b/app/views/tournaments/_fourPoolSemiBracket.html.erb index a2c4e10..fe4a7e7 100644 --- a/app/views/tournaments/_fourPoolSemiBracket.html.erb +++ b/app/views/tournaments/_fourPoolSemiBracket.html.erb @@ -1,124 +1,34 @@
Bracket After Pool
-
- - - - <% end %> -
- -
- - - <% end %> -
- - -
- - - - <% end %> -
-
- - - <% end %> -
- - - - +
+ + <% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %> + <%= render 'bracket_round' %> + + <% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %> + <% @winner_place = "1st" %> + <%= render 'bracket_final' %> +
+
+
+ + <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %> + <% @winner_place = "3rd" %> + <%= render 'bracket_final' %> +
+
+
+ + <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Semis"} %> + <%= render 'bracket_round' %> + + <% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %> + <% @winner_place = "5th" %> + <%= render 'bracket_final' %> +
+
+
+ + <% @final_match = @matches.select{|m|m.bracket_position == "7/8"} %> + <% @winner_place = "7th" %> + <%= render 'bracket_final' %> +
\ No newline at end of file diff --git a/app/views/tournaments/_pool.html.erb b/app/views/tournaments/_pool.html.erb index 46c46b6..68e1581 100644 --- a/app/views/tournaments/_pool.html.erb +++ b/app/views/tournaments/_pool.html.erb @@ -18,7 +18,7 @@ <% @wrestlers.select{|w| w.pool == @pool}.sort_by{|w| w.bracket_line}.each do |w| %> - + <% @round = 1 %> <% until @matches.select{|m| m.round == @round}.blank? %> <% if @round <= @pools %> diff --git a/app/views/tournaments/_sixteen_man_double_elimination_bracket.html.erb b/app/views/tournaments/_sixteen_man_double_elimination_bracket.html.erb index 849f6c0..464802f 100644 --- a/app/views/tournaments/_sixteen_man_double_elimination_bracket.html.erb +++ b/app/views/tournaments/_sixteen_man_double_elimination_bracket.html.erb @@ -1,143 +1,42 @@

Championship Bracket

-
- - - - - - <% end %> -
+
+ + <% @round_matches = @matches.select{|m|m.bracket_position == "Bracket" and m.round == 1} %> + <%= render 'bracket_round' %> + + <% @round_matches = @matches.select{|m|m.bracket_position == "Quarter"} %> + <%= render 'bracket_round' %> + + <% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %> + <%= render 'bracket_round' %> + + <% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %> + <% @winner_place = "1st" %> + <%= render 'bracket_final' %> +

Consolation Bracket

-
- - - - - - - <% end %> -
+
+ + <% @round_matches = @matches.select{|m|m.bracket_position == "Conso" and m.round == 2} %> + <%= render 'bracket_round' %> + + <% @round_matches = @matches.select{|m|m.bracket_position == "Conso" and m.round == 3} %> + <%= render 'bracket_round' %> + + <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Quarter"} %> + <%= render 'bracket_round' %> + + <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Semis"} %> + <%= render 'bracket_round' %> + + <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %> + <% @winner_place = "3rd" %> + <%= render 'bracket_final' %> +

5/6 place match

-
- - - <% end %> -
\ No newline at end of file +
+ + <% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %> + <% @winner_place = "5th" %> + <%= render 'bracket_final' %> +
\ No newline at end of file diff --git a/app/views/tournaments/_twoPoolFinalBracket.html.erb b/app/views/tournaments/_twoPoolFinalBracket.html.erb index b3bac5f..60bf0dc 100644 --- a/app/views/tournaments/_twoPoolFinalBracket.html.erb +++ b/app/views/tournaments/_twoPoolFinalBracket.html.erb @@ -1,47 +1,14 @@
Bracket After Pool
-
- - - <% end %> -
- -
- - - <% end %> -
- +
+ + <% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %> + <% @winner_place = "1st" %> + <%= render 'bracket_final' %> +
+
+
+ + <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %> + <% @winner_place = "3rd" %> + <%= render 'bracket_final' %> +
\ No newline at end of file diff --git a/app/views/tournaments/_twoPoolSemiBracket.html.erb b/app/views/tournaments/_twoPoolSemiBracket.html.erb index 6da20e2..b061dbe 100644 --- a/app/views/tournaments/_twoPoolSemiBracket.html.erb +++ b/app/views/tournaments/_twoPoolSemiBracket.html.erb @@ -1,60 +1,17 @@
Bracket After Pool
-
- - - - <% end %> -
- -
- - - <% end %> -
+
+ + <% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %> + <%= render 'bracket_round' %> + + <% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %> + <% @winner_place = "1st" %> + <%= render 'bracket_final' %> +
+
+
+ + <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %> + <% @winner_place = "3rd" %> + <%= render 'bracket_final' %> +
\ No newline at end of file
<%= w.original_seed %> <%= w.name %> - <%= w.school.name %>[<%= w.original_seed %>] <%="#{w.name} - #{w.school.name} (#{w.season_win}-#{w.season_loss})" %>