diff --git a/app/models/match.rb b/app/models/match.rb index 0051fc3..8464995 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -99,6 +99,23 @@ class Match < ActiveRecord::Base self.loser2_name end end + + def w1_bracket_name + if self.w1 != nil + return "#{w1_name} (#{wrestler1.school.abbreviation})" + else + "" + end + end + + def w2_bracket_name + if self.w2 != nil + return "#{w2_name} (#{wrestler2.school.abbreviation})" + else + "" + end + end + def winner_name if self.finished != 1 return "" @@ -110,6 +127,15 @@ class Match < ActiveRecord::Base return self.w2_name end end + + def bracket_winner_name + if winner_name != "" + return "#{winner_name} (#{Wrestler.find(winner_id).school.abbreviation})" + else + "" + end + end + def weight_max self.weight.max end diff --git a/app/models/school.rb b/app/models/school.rb index 738da56..6b931c2 100644 --- a/app/models/school.rb +++ b/app/models/school.rb @@ -11,6 +11,15 @@ class School < ActiveRecord::Base before_destroy do self.tournament.destroy_all_matches end + + def abbreviation + name_array = self.name.split(' ') + if name_array.size > 1 + return "#{name_array[0].chars.to_a.first}#{name_array[1].chars.to_a[0..1].join('').upcase}" + else + return "#{name_array[0].chars.to_a[0..2].join('').upcase}" + end + end #calculate score here def page_score_string diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 939a880..2338dcc 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -1,11 +1,11 @@

Bout: <%= @match.bout_number %>

-

Weight Class: <%= @match.wrestler1.weight.max %>

+

Weight Class: <%= @match.weight.max %>

- - + + diff --git a/app/views/tournaments/_fourPoolQuarterBracket.html.erb b/app/views/tournaments/_fourPoolQuarterBracket.html.erb index 5d56699..9d6ce7d 100644 --- a/app/views/tournaments/_fourPoolQuarterBracket.html.erb +++ b/app/views/tournaments/_fourPoolQuarterBracket.html.erb @@ -4,9 +4,9 @@ <% @matches.select{|m|m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
  •  
    • -
  • <%= match.w1_name %>
    • +
  • <%= match.w1_bracket_name %>
  • <%= match.bout_number %> <%= match.bracket_score_string %> 
    • -
  • <%= match.w2_name %>
    • +
  • <%= match.w2_bracket_name %>
  •  
    • @@ -16,9 +16,9 @@ <% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
  •  
    • -
  • <%= match.w1_name %>
    • +
  • <%= match.w1_bracket_name %>
  • <%= match.bout_number %> <%= match.bracket_score_string %> 
    • -
  • <%= match.w2_name %>
    • +
  • <%= match.w2_bracket_name %>
  •  
    • <% end %> @@ -27,9 +27,9 @@ <% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
  •  
    • -
  • <%= match.w1_name %>
    • +
  • <%= match.w1_bracket_name %>
  • <%= match.bout_number %> <%= match.bracket_score_string %> 
    • -
  • <%= match.w2_name %>
    • +
  • <%= match.w2_bracket_name %>
  •  
    • @@ -37,7 +37,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/_twoPoolFinalBracket.html.erb b/app/views/tournaments/_twoPoolFinalBracket.html.erb index 81e5744..8cd446a 100644 --- a/app/views/tournaments/_twoPoolFinalBracket.html.erb +++ b/app/views/tournaments/_twoPoolFinalBracket.html.erb @@ -4,9 +4,9 @@ <% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
  •  
    • -
  • <%= match.w1_name %>
    • +
  • <%= match.w1_bracket_name %>
  • <%= match.bout_number %> <%= match.bracket_score_string %> 
    • -
  • <%= match.w2_name %>
    • +
  • <%= match.w2_bracket_name %>
  •  
    • @@ -14,7 +14,7 @@ - + <% @schools.each do |school| %> - + <% end %> diff --git a/app/views/tournaments/up_matches.html.erb b/app/views/tournaments/up_matches.html.erb index da91c17..394cea3 100644 --- a/app/views/tournaments/up_matches.html.erb +++ b/app/views/tournaments/up_matches.html.erb @@ -28,10 +28,10 @@ <% @mats.each.map do |m| %> - - - - + + + + <% end %> @@ -56,7 +56,7 @@ - + <% end %> <% end %>
    <%= @match.wrestler1.name %> (<%= @match.wrestler1.school.name %>)<%= @match.wrestler2.name %> (<%= @match.wrestler2.school.name %>)<%= @match.w1_name %> <%= "- #{@match.wrestler1.school.name}" if @match.wrestler1 %><%= @match.w2_name %> <%= "- #{@match.wrestler2.school.name}" if @match.wrestler2 %>
    <%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %><%= w.original_seed %> <%= w.name %> - <%= w.school.name %>
    <%= match.bout_number %> <%= match.bracket_position %><%= match.w1_name %> vs <%= match.w2_name %><%= match.w1_bracket_name %> vs <%= match.w2_bracket_name %> <%= match.finished %> <%= link_to 'Show', match, :class=>"btn btn-default btn-sm" %> <%= link_to 'Edit', edit_match_path(match), :class=>"btn btn-primary btn-sm" %> diff --git a/app/views/tournaments/team_scores.html.erb b/app/views/tournaments/team_scores.html.erb index 3c009ff..cba5501 100644 --- a/app/views/tournaments/team_scores.html.erb +++ b/app/views/tournaments/team_scores.html.erb @@ -12,7 +12,7 @@
    <%= school.name %><%= school.name %> (<%= school.abbreviation %>) <%= school.page_score_string %>
    <%= m.name %><% if m.unfinished_matches.first %><%=m.unfinished_matches.first.bout_number%> - <%= m.unfinished_matches.first.weight_max %> lbs
    <%= m.unfinished_matches.first.w1_name %> vs. <%= m.unfinished_matches.first.w2_name %><% end %>    		<% if m.unfinished_matches.second %><%=m.unfinished_matches.second.bout_number%> - <%= m.unfinished_matches.second.weight_max %> lbs
    <%= m.unfinished_matches.second.w1_name %> vs. <%= m.unfinished_matches.second.w2_name %><% end %>    		<% if m.unfinished_matches.third %><%=m.unfinished_matches.third.bout_number%> - <%= m.unfinished_matches.third.weight_max %> lbs
    <%= m.unfinished_matches.third.w1_name %> vs. <%= m.unfinished_matches.third.w2_name %><% end %>    		<% if m.unfinished_matches.fourth %><%=m.unfinished_matches.fourth.bout_number%> - <%= m.unfinished_matches.fourth.weight_max %> lbs
    <%= m.unfinished_matches.fourth.w1_name %> vs. <%= m.unfinished_matches.fourth.w2_name %><% end %>    		<% if m.unfinished_matches.first %><%=m.unfinished_matches.first.bout_number%> - <%= m.unfinished_matches.first.weight_max %> lbs
    <%= m.unfinished_matches.first.w1_bracket_name %> vs. <%= m.unfinished_matches.first.w2_bracket_name %><% end %>    		<% if m.unfinished_matches.second %><%=m.unfinished_matches.second.bout_number%> - <%= m.unfinished_matches.second.weight_max %> lbs
    <%= m.unfinished_matches.second.w1_bracket_name %> vs. <%= m.unfinished_matches.second.w2_bracket_name %><% end %>    		<% if m.unfinished_matches.third %><%=m.unfinished_matches.third.bout_number%> - <%= m.unfinished_matches.third.weight_max %> lbs
    <%= m.unfinished_matches.third.w1_bracket_name %> vs. <%= m.unfinished_matches.third.w2_bracket_name %><% end %>    		<% if m.unfinished_matches.fourth %><%=m.unfinished_matches.fourth.bout_number%> - <%= m.unfinished_matches.fourth.weight_max %> lbs
    <%= m.unfinished_matches.fourth.w1_bracket_name %> vs. <%= m.unfinished_matches.fourth.w2_bracket_name %><% end %>
    Round <%= m.round %> <%= m.bout_number %> <%= m.weight_max %> lbs<%= m.w1_name %> vs. <%= m.w2_name %><%= m.w1_bracket_name %> vs. <%= m.w2_bracket_name %>