cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Code Issues Releases Wiki Activity

trying to speed up brackets page

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-11-02 11:14:03 -05:00
parent 3734258e6c
commit 364ee21e3f
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/static_pages_controller.rb
View File

@@ -39,10 +39,10 @@ class StaticPagesController < ApplicationController
def brackets
if params[:weight]
@weight = Weight.find(params[:weight])
@weight = Weight.find(params[:weight]).includes(:matches,:wrestlers)
@tournament = Tournament.find(@weight.tournament_id)
@matches = @tournament.matches.select{|m| m.weight_id == @weight.id}
@wrestlers = Wrestler.where(weight_id: @weight.id).includes(:weight,:school)
@matches = @weight.matches
@wrestlers = @weight.wrestlers.includes(:school)
if @matches.empty? or @wrestlers.empty?
redirect_to "/static_pages/noMatches?tournament=#{@tournament.id}"
else

4
app/models/match.rb
View File

@@ -41,7 +41,7 @@ class Match < ActiveRecord::Base
def w1_name
if self.w1
Wrestler.find(self.w1).name
wrestler1.name
else
self.loser1_name
end
@@ -49,7 +49,7 @@ class Match < ActiveRecord::Base
def w2_name
if self.w2
Wrestler.find(self.w2).name
wrestler2.name
else
self.loser2_name
end

10
app/views/static_pages/up_matches.html.erb
View File

@@ -30,10 +30,10 @@
<% @mats.each.map do |m| %>
<tr>
<td><%= m.name %></td>
<td><%=m.unfinishedMatches.first.bout_number%><br><%= m.unfinishedMatches.first.wrestler1.name %> vs. <%= m.unfinishedMatches.first.wrestler2.name %></td>
<td><%=m.unfinishedMatches.second.bout_number%><br><%= m.unfinishedMatches.second.wrestler1.name %> vs. <%= m.unfinishedMatches.second.wrestler2.name %></td>
<td><%=m.unfinishedMatches.third.bout_number%><br><%= m.unfinishedMatches.third.wrestler1.name %> vs. <%= m.unfinishedMatches.third.wrestler2.name %></td>
<td><%=m.unfinishedMatches.fourth.bout_number%><br><%= m.unfinishedMatches.fourth.wrestler1.name %> vs. <%= m.unfinishedMatches.fourth.wrestler2.name %></td>
<td><%=m.unfinishedMatches.first.bout_number%><br><%= m.unfinishedMatches.first.w1_name %> vs. <%= m.unfinishedMatches.first.w2_name %></td>
<td><%=m.unfinishedMatches.second.bout_number%><br><%= m.unfinishedMatches.second.w1_name %> vs. <%= m.unfinishedMatches.second.w2_name %></td>
<td><%=m.unfinishedMatches.third.bout_number%><br><%= m.unfinishedMatches.third.w1_name %> vs. <%= m.unfinishedMatches.third.w2_name %></td>
<td><%=m.unfinishedMatches.fourth.bout_number%><br><%= m.unfinishedMatches.fourth.w1_name %> vs. <%= m.unfinishedMatches.fourth.w2_name %></td>
</tr>
<% end %>
</tbody>
@@ -59,7 +59,7 @@
<td>Round <%= m.round %></td>
<td><%= m.bout_number %></td>
<td><%= m.weight_max %> lbs</td>
<td><%= m.wrestler1.name %> vs. <%= m.wrestler2.name %></td>
<td><%= m.w1_name %> vs. <%= m.w2_name %></td>
</tr>
<% end %>
</tbody>