cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-17 05:15:36 +00:00
Code Issues Releases Wiki Activity

fixed generation sort

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-02-06 23:29:00 +00:00
parent cba5d0a96d
commit eba979740c
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/pool.rb
View File

@@ -1,6 +1,6 @@
class Pool class Pool
def onePool(wrestlers,weight_id,tournament) def onePool(wrestlers,weight_id,tournament)
wrestlers.each do |w| wrestlers.sort_by{|x|[x.original_seed]}.each do |w|
w.poolNumber = 1 w.poolNumber = 1
w.save w.save
end end
@@ -12,7 +12,7 @@ class Pool
#wrestlers.sort_by{|x|[x.original_seed]} #wrestlers.sort_by{|x|[x.original_seed]}
pool = 1 pool = 1
wrestlers.each do |w| wrestlers.sort_by{|x|[x.original_seed]}.each do |w|
w.poolNumber = pool w.poolNumber = pool
w.save w.save
if pool < 2 if pool < 2
@@ -27,16 +27,16 @@ class Pool
def fourPools(wrestlers,weight_id,tournament) def fourPools(wrestlers,weight_id,tournament)
#wrestlers.sort_by{|x|[x.original_seed]}
pool = 1
wrestlers.each do |w| @pool = 1
w.poolNumber = pool wrestlers.sort_by{|x|[x.original_seed]}.each do |w|
w.poolNumber = @pool
w.save w.save
if pool < 4 if @pool < 4
pool = pool + 1 @pool = @pool + 1
else else
pool =1 @pool =1
end end
end end
roundRobin(1,tournament,weight_id) roundRobin(1,tournament,weight_id)

2
app/models/weight.rb
View File

@@ -6,7 +6,7 @@ class Weight < ActiveRecord::Base
def generatePool def generatePool
@wrestlers = Wrestler.where(weight_id: self.id) @wrestlers = Wrestler.where(weight_id: self.id)
@wrestlers.sort_by{|x|[x.original_seed]} #@wrestlers.sort_by{|w| [w.original_seed]}
if self.pools == 1 if self.pools == 1
@pool = Pool.new @pool = Pool.new
@pool.onePool(@wrestlers,self.id,self.tournament_id) @pool.onePool(@wrestlers,self.id,self.tournament_id)

8
app/views/static_pages/_fourPool.html.erb
View File

@@ -11,7 +11,7 @@
<tbody> <tbody>
<% @poolOneWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %> <% @poolOneWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
<tr> <tr>
<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td> <td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
<td><%= w.boutByRound(1) %><br></td> <td><%= w.boutByRound(1) %><br></td>
<td><%= w.boutByRound(2) %></td> <td><%= w.boutByRound(2) %></td>
<td><%= w.boutByRound(3) %></td> <td><%= w.boutByRound(3) %></td>
@@ -34,7 +34,7 @@
<tbody> <tbody>
<% @poolTwoWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %> <% @poolTwoWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
<tr> <tr>
<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td> <td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
<td><%= w.boutByRound(1) %><br></td> <td><%= w.boutByRound(1) %><br></td>
<td><%= w.boutByRound(2) %></td> <td><%= w.boutByRound(2) %></td>
<td><%= w.boutByRound(3) %></td> <td><%= w.boutByRound(3) %></td>
@@ -57,7 +57,7 @@
<tbody> <tbody>
<% @poolThreeWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %> <% @poolThreeWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
<tr> <tr>
<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td> <td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
<td><%= w.boutByRound(1) %><br></td> <td><%= w.boutByRound(1) %><br></td>
<td><%= w.boutByRound(2) %></td> <td><%= w.boutByRound(2) %></td>
<td><%= w.boutByRound(3) %></td> <td><%= w.boutByRound(3) %></td>
@@ -80,7 +80,7 @@
<tbody> <tbody>
<% @poolFourWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %> <% @poolFourWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
<tr> <tr>
<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td> <td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
<td><%= w.boutByRound(1) %><br></td> <td><%= w.boutByRound(1) %><br></td>
<td><%= w.boutByRound(2) %></td> <td><%= w.boutByRound(2) %></td>
<td><%= w.boutByRound(3) %></td> <td><%= w.boutByRound(3) %></td>

2
app/views/static_pages/_onePool.html.erb
View File

@@ -13,7 +13,7 @@
<tbody> <tbody>
<% @poolOneWrestlers.each do |w| %> <% @poolOneWrestlers.each do |w| %>
<tr> <tr>
<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td> <td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
<td><%= w.boutByRound(1) %><br>Result</td> <td><%= w.boutByRound(1) %><br>Result</td>
<td><%= w.boutByRound(2) %></td> <td><%= w.boutByRound(2) %></td>
<td><%= w.boutByRound(3) %></td> <td><%= w.boutByRound(3) %></td>

4
app/views/static_pages/_twoPool.html.erb
View File

@@ -12,7 +12,7 @@
<tbody> <tbody>
<% @poolOneWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %> <% @poolOneWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
<tr> <tr>
<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td> <td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
<td><%= w.boutByRound(1) %><br></td> <td><%= w.boutByRound(1) %><br></td>
<td><%= w.boutByRound(2) %></td> <td><%= w.boutByRound(2) %></td>
<td><%= w.boutByRound(3) %></td> <td><%= w.boutByRound(3) %></td>
@@ -36,7 +36,7 @@
<tbody> <tbody>
<% @poolTwoWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %> <% @poolTwoWrestlers.sort_by{|x|[x.original_seed]}.each do |w| %>
<tr> <tr>
<td><%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td> <td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
<td><%= w.boutByRound(1) %><br></td> <td><%= w.boutByRound(1) %><br></td>
<td><%= w.boutByRound(2) %></td> <td><%= w.boutByRound(2) %></td>
<td><%= w.boutByRound(3) %></td> <td><%= w.boutByRound(3) %></td>