diff --git a/app/models/match.rb b/app/models/match.rb index b1d59b8..9562f58 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -2,4 +2,13 @@ class Match < ActiveRecord::Base belongs_to :tournament WIN_TYPES = ["Decision", "Major", "Tech Fall", "Pin", "Forfeit", "Injury Default", "Default", "DQ"] + + def w1_name + Wrestler.find(self.w1).name + end + + def w2_name + Wrestler.find(self.w2).name + end + end diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 317b5b1..b741c65 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -9,12 +9,13 @@ class Tournament < ActiveRecord::Base def upcomingMatches # @matches = generateMatchups - if self.matchups_array - return matchupHashesToObjects(self.matchups_array) + if self.matches.nil? + return self.matches else @matches = generateMatchups - saveMatchups(@matches) - return @matches + puts @matches.inspect + saveMatchups(@matches) + return @matches end end @@ -34,8 +35,18 @@ class Tournament < ActiveRecord::Base end def saveMatchups(matches) - self.matchups_array = matchupObjectsToHash(matches) - self.save + matches.each do |m| + @match = Match.new + @match.w1 = m.w1 + @match.w2 = m.w2 + @match.round = m.round + @match.boutNumber = m.boutNumber + @match.bracket_position = m.bracket_position + @match.bracket_position_number = m.bracket_position_number + @match.tournament_id = self.id + puts @match.inspect + @match.save + end end diff --git a/app/views/layouts/_cdn.html.erb b/app/views/layouts/_cdn.html.erb index 53233c9..01039df 100644 --- a/app/views/layouts/_cdn.html.erb +++ b/app/views/layouts/_cdn.html.erb @@ -9,5 +9,11 @@ + + + + + + diff --git a/app/views/static_pages/all_brackets.html.erb b/app/views/static_pages/all_brackets.html.erb index fecebfc..8e712e6 100644 --- a/app/views/static_pages/all_brackets.html.erb +++ b/app/views/static_pages/all_brackets.html.erb @@ -3,11 +3,26 @@ #html, #body, #wrapper { width:100%; } - + + <%= link_to "Back to #{@tournament.name} weights", "/static_pages/weights?tournament=#{@tournament.id}" %>

+ + +
+
+
<% @tournament.weights.sort_by{|w| w.max}.each do |w| %>
<% @weight = w %> @@ -32,4 +47,5 @@ <%= render 'fourPoolSemiBracket' %> <% end %>
-<% end %> \ No newline at end of file +<% end %> +
\ No newline at end of file diff --git a/db/migrate/20150425173224_matchup_to_match.rb b/db/migrate/20150425173224_matchup_to_match.rb new file mode 100644 index 0000000..34170e3 --- /dev/null +++ b/db/migrate/20150425173224_matchup_to_match.rb @@ -0,0 +1,11 @@ +class MatchupToMatch < ActiveRecord::Migration + def change + add_column :matches, :weight_id, :integer + add_column :matches, :bracket_position, :string + add_column :matches, :bracket_position_number, :integer + rename_column :matches, :r_id, :w1 + rename_column :matches, :g_id, :w2 + + + end +end diff --git a/db/schema.rb b/db/schema.rb index e7a4408..e0374b7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,11 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150328183257) do +ActiveRecord::Schema.define(version: 20150425173224) do create_table "matches", force: :cascade do |t| - t.integer "r_id" - t.integer "g_id" + t.integer "w1" + t.integer "w2" t.text "g_stat" t.text "r_stat" t.integer "winner_id" @@ -27,6 +27,9 @@ ActiveRecord::Schema.define(version: 20150328183257) do t.integer "round" t.integer "finished" t.integer "boutNumber" + t.integer "weight_id" + t.string "bracket_position" + t.integer "bracket_position_number" end create_table "mats", force: :cascade do |t|