Merge pull request #4 from devfu/items

relate Items & CompartmentsItems
dalegregory · Apr 16, 2012 · ac19450 · ac19450
2 parents af255ec + a8db0cc
commit ac19450
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/app/models/compartments_items.rb b/app/models/compartments_items.rb
@@ -9,8 +9,15 @@ class CompartmentsItems < ActiveRecord::Base
                   :operation,
                   :quantity_limit
 
+  belongs_to :item
+
   validates :compartment_type, presence: true
   validates :item_code,        presence: true
   validates :operation,        inclusion: { in: Modula::OPERATIONS }
 
+  def item_code= code
+    self[:item_code] = code
+    self.item = Item.find_by_code code
+  end
+
 end
diff --git a/app/models/item.rb b/app/models/item.rb
@@ -4,6 +4,9 @@ class Item < ActiveRecord::Base
                   :description,
                   :operation
 
+  has_many :compartments_items
+
   validates :code,      presence: true
   validates :operation, inclusion: { in: Modula::OPERATIONS }
+
 end
diff --git a/db/migrate/20120413003642_create_compartments_items.rb b/db/migrate/20120413003642_create_compartments_items.rb
@@ -2,6 +2,8 @@ class CreateCompartmentsItems < ActiveRecord::Migration
 
   def change
     create_table :compartments_items do |t|
+      t.belongs_to :item
+
       t.decimal :capacity
       t.decimal :quantity_limit
       t.integer :height

diff --git a/db/schema.rb b/db/schema.rb
@@ -14,6 +14,7 @@
 ActiveRecord::Schema.define(:version => 20120413004841) do
 
   create_table "compartments_items", :force => true do |t|
+    t.integer  "item_id"
     t.decimal  "capacity",                        :precision => 10, :scale => 0
     t.decimal  "quantity_limit",                  :precision => 10, :scale => 0
     t.integer  "height"