Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.

test/fixtures/groups.yml

@@ -3,37 +3,44 @@
 #
 # Table name: groups
 #
-#  id                  :integer(4)      not null, primary key
+#  id                  :integer         not null, primary key
 #  type                :string(255)     default(""), not null
 #  name                :string(255)     default(""), not null
 #  description         :string(255)
-#  actual_size         :integer(4)
-#  account_balance     :decimal(8, 2)   default(0.0), not null
+#  account_balance     :decimal(, )     default(0.0), not null
 #  account_updated     :datetime
 #  created_on          :datetime        not null
-#  role_admin          :boolean(1)      not null
-#  role_suppliers      :boolean(1)      not null
-#  role_article_meta   :boolean(1)      not null
-#  role_finance        :boolean(1)      not null
-#  role_orders         :boolean(1)      not null
-#  weekly_task         :boolean(1)
-#  weekday             :integer(4)
+#  role_admin          :boolean         not null
+#  role_suppliers      :boolean         not null
+#  role_article_meta   :boolean         not null
+#  role_finance        :boolean         not null
+#  role_orders         :boolean         not null
+#  weekly_task         :boolean
+#  weekday             :integer
 #  task_name           :string(255)
 #  task_description    :string(255)
-#  task_required_users :integer(4)      default(1)
+#  task_required_users :integer         default(1)
 #  deleted_at          :datetime
+#  contact_person      :string(255)
+#  contact_phone       :string(255)
+#  contact_address     :string(255)
 #
 
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-first:
-  id: 1
-  name: Order Group 1
-  type: Ordergroup
-another:
-  id: 2
-  name: Order Group 2
-  type: Ordergroup
 admins:
-  id: 3
+  type: Workgroup
   name: Administrators
-  role_admin: true    
+  description: System administrators.
+  role_admin: true
+  role_suppliers: true
+  role_article_meta: true
+  role_finance: true
+  role_orders: true
+bananas:
+  type: Ordergroup
+  name: Banangroup
+  account_balance: 100.00
+  account_updated: <%= 1.weeks.ago.strftime("%d.%m.%Y") %>
+  contact_person: Tim
+  contact_phone: 030 123132456
+  contact_address: Waldermarstrasse 43, 10988 Berlin