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}" %>
+
+
+
+
+