From d69838310e4d2949954871b2d7ee4087653c0dfa Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Wed, 31 Dec 2014 10:38:49 -0500 Subject: [PATCH] Working on pools --- app/models/match.rb | 6 +--- app/models/weight.rb | 28 +++++++++------ app/views/tournaments/show.html.erb | 2 +- ...41226133941_assign_wrestler_pool_number.rb | 5 +++ db/schema.rb | 3 +- db/seeds.rb | 35 +++++++++++-------- 6 files changed, 47 insertions(+), 32 deletions(-) create mode 100644 db/migrate/20141226133941_assign_wrestler_pool_number.rb diff --git a/app/models/match.rb b/app/models/match.rb index ff698b5..7bca276 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -2,9 +2,5 @@ class Match < ActiveRecord::Base belongs_to :tournament WIN_TYPES = ["Decision", "Major", "Tech Fall", "Pin", "Forfeit", "Injury Default", "Default"] - def bout - @round_number = self.round * 1000 - - self.bout_number = @round_number + self.id - end + end diff --git a/app/models/weight.rb b/app/models/weight.rb index 452063f..0e8f91b 100644 --- a/app/models/weight.rb +++ b/app/models/weight.rb @@ -6,21 +6,22 @@ class Weight < ActiveRecord::Base def generatePool @wrestlers = Wrestler.where(weight_id: self.id) - poolNumber(@wrestlers) - @wrestlers.each do |wrestler| - puts wrestler.inspect - + if self.pools == 1 + onePool(@wrestlers) + elsif self.pools == 2 + + elsif self.pools == 4 + end - puts 'Pool size:' - puts self.pools end - def poolNumber(wrestlers) - if wrestlers.size <= 5 + def pools + @wrestlers = Wrestler.where(weight_id: self.id) + if @wrestlers.size <= 5 self.pools = 1 - elsif (wrestlers.size > 5) && (wrestlers.size <= 8) + elsif (@wrestlers.size > 5) && (@wrestlers.size <= 8) self.pools = 2 - elsif (wrestlers.size > 8) && (wrestlers.size <= 16) + elsif (@wrestlers.size > 8) && (@wrestlers.size <= 16) self.pools = 4 end end @@ -28,6 +29,13 @@ class Weight < ActiveRecord::Base def fourPool end + + def onePool(wrestlers) + wrestlers.each do |wrestler| + wrestler.poolNumber = 1 + wrestler.save + end + end end diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 69566be..5c23ede 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -28,7 +28,7 @@ <% if user_signed_in? %> <%= link_to "New #{@tournament.name} School" , "/schools/new?tournament=#{@tournament.id}" %>
- BE CAREFUL <%= link_to "Generate Pool Matches" , "/static_pages/generate_matches?tournament=#{@tournament.id}" %> + BE CAREFUL <%= link_to "Generate Pool Matches" , "/static_pages/generate_matches?tournament=#{@tournament.id}", :class=>"btn" %> <% end %>

diff --git a/db/migrate/20141226133941_assign_wrestler_pool_number.rb b/db/migrate/20141226133941_assign_wrestler_pool_number.rb new file mode 100644 index 0000000..3a67320 --- /dev/null +++ b/db/migrate/20141226133941_assign_wrestler_pool_number.rb @@ -0,0 +1,5 @@ +class AssignWrestlerPoolNumber < ActiveRecord::Migration + def change + add_column :wrestlers, :poolNumber, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 55a7ab1..5e72049 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140131123907) do +ActiveRecord::Schema.define(version: 20141226133941) do create_table "matches", force: true do |t| t.integer "r_id" @@ -88,6 +88,7 @@ ActiveRecord::Schema.define(version: 20140131123907) do t.integer "season_win" t.integer "season_loss" t.string "criteria" + t.integer "poolNumber" end end diff --git a/db/seeds.rb b/db/seeds.rb index 2d7063e..bea45e2 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -9,23 +9,28 @@ if Rails.env.development? User.create(email: 'test@test.com', password: 'password', password_confirmation: 'password') Tournament.create(id: 200, name: 'test', address: 'some place', director: 'some guy', director_email: 'hismail@email.com') School.create(id: 200, name: 'Central Crossing', tournament_id: 200) + School.create(id: 201, name: 'Turd Town', tournament_id: 200) + School.create(id: 202, name: 'Shit Show', tournament_id: 200) + School.create(id: 203, name: 'Westland', tournament_id: 200) + School.create(id: 204, name: 'Grove City', tournament_id: 200) + School.create(id: 205, name: 'Franklin Heights', tournament_id: 200) Weight.create(id: 200, max: 132, tournament_id: 200 ) Wrestler.create(name: 'Guy 1', school_id: 200, weight_id: 200, original_seed: 1, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 2', school_id: 200, weight_id: 200, original_seed: 2, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 3', school_id: 200, weight_id: 200, original_seed: 3, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 4', school_id: 200, weight_id: 200, original_seed: 4, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 5', school_id: 200, weight_id: 200, original_seed: 5, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 6', school_id: 200, weight_id: 200, original_seed: 6, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 7', school_id: 200, weight_id: 200, original_seed: 7, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 8', school_id: 200, weight_id: 200, original_seed: 8, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 9', school_id: 200, weight_id: 200, original_seed: 9, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 10', school_id: 200, weight_id: 200, original_seed: 10, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 11', school_id: 200, weight_id: 200, original_seed: 11, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 12', school_id: 200, weight_id: 200, original_seed: 12, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 13', school_id: 200, weight_id: 200, original_seed: 13, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 14', school_id: 200, weight_id: 200, original_seed: 14, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 15', school_id: 200, weight_id: 200, original_seed: 15, season_win: 0, season_loss: 0, criteria: 'N/A') - Wrestler.create(name: 'Guy 16', school_id: 200, weight_id: 200, original_seed: 16, season_win: 0, season_loss: 0, criteria: 'N/A') + Wrestler.create(name: 'Guy 2', school_id: 201, weight_id: 200, original_seed: 2, season_win: 0, season_loss: 0, criteria: 'N/A') + Wrestler.create(name: 'Guy 3', school_id: 202, weight_id: 200, original_seed: 3, season_win: 0, season_loss: 0, criteria: 'N/A') + Wrestler.create(name: 'Guy 4', school_id: 203, weight_id: 200, original_seed: 4, season_win: 0, season_loss: 0, criteria: 'N/A') + Wrestler.create(name: 'Guy 5', school_id: 204, weight_id: 200, original_seed: 5, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 6', school_id: 200, weight_id: 200, original_seed: 6, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 7', school_id: 200, weight_id: 200, original_seed: 7, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 8', school_id: 200, weight_id: 200, original_seed: 8, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 9', school_id: 200, weight_id: 200, original_seed: 9, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 10', school_id: 200, weight_id: 200, original_seed: 10, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 11', school_id: 200, weight_id: 200, original_seed: 11, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 12', school_id: 200, weight_id: 200, original_seed: 12, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 13', school_id: 200, weight_id: 200, original_seed: 13, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 14', school_id: 200, weight_id: 200, original_seed: 14, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 15', school_id: 200, weight_id: 200, original_seed: 15, season_win: 0, season_loss: 0, criteria: 'N/A') +# Wrestler.create(name: 'Guy 16', school_id: 200, weight_id: 200, original_seed: 16, season_win: 0, season_loss: 0, criteria: 'N/A') end if Rails.env.production?