diff --git a/app/models/player_card.rb b/app/models/player_card.rb index 9aa2e152..52a3ca93 100644 --- a/app/models/player_card.rb +++ b/app/models/player_card.rb @@ -1,4 +1,3 @@ class PlayerCard < ActiveRecord::Base belongs_to :player - belongs_to :card end diff --git a/app/views/games/show.html.haml b/app/views/games/show.html.haml index 40b692a5..03ed576c 100644 --- a/app/views/games/show.html.haml +++ b/app/views/games/show.html.haml @@ -17,6 +17,10 @@ %ol - @game.players.each do |player| %li= player + - unless player.player_cards.empty? + %ul.cards + - player.player_cards.each do |card| + %li= [card.rank, card.suit].join(' ') = link_to 'Edit', edit_game_path(@game) \| diff --git a/db/migrate/20150409115031_add_attrs_to_player_cards.rb b/db/migrate/20150409115031_add_attrs_to_player_cards.rb new file mode 100644 index 00000000..d38e23f1 --- /dev/null +++ b/db/migrate/20150409115031_add_attrs_to_player_cards.rb @@ -0,0 +1,7 @@ +class AddAttrsToPlayerCards < ActiveRecord::Migration + def change + add_column :player_cards, :value, :integer + add_column :player_cards, :rank, :string + add_column :player_cards, :suit, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index f1f26284..5c96ccc7 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: 20150104203850) do +ActiveRecord::Schema.define(version: 20150409115031) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,6 +28,9 @@ ActiveRecord::Schema.define(version: 20150104203850) do t.integer "card_id" t.datetime "created_at" t.datetime "updated_at" + t.integer "value" + t.string "rank" + t.string "suit" end add_index "player_cards", ["card_id"], name: "index_player_cards_on_card_id", using: :btree