Added duration to tasks. Annotated all models.

test/fixtures/articles.yml

@@ -1,29 +1,3 @@
-# == Schema Information
-#
-# Table name: articles
-#
-#  id                  :integer         not null, primary key
-#  name                :string(255)     default(""), not null
-#  supplier_id         :integer         default(0), not null
-#  article_category_id :integer         default(0), not null
-#  unit                :string(255)     default(""), not null
-#  note                :string(255)
-#  availability        :boolean         default(TRUE), not null
-#  manufacturer        :string(255)
-#  origin              :string(255)
-#  shared_updated_on   :datetime
-#  price               :decimal(, )
-#  tax                 :float
-#  deposit             :decimal(, )     default(0.0)
-#  unit_quantity       :integer         default(1), not null
-#  order_number        :string(255)
-#  created_at          :datetime
-#  updated_at          :datetime
-#  quantity            :integer         default(0)
-#  deleted_at          :datetime
-#  type                :string(255)
-#
-
 # == Schema Information
 <<<<<<< HEAD:test/fixtures/articles.yml
 =======
@@ -100,3 +74,28 @@ applejuice:
   unit: 1L
   price: 1.33
   tax: 7.0
+
+
+# == Schema Information
+#
+# Table name: articles
+#
+#  id             :integer(4)      not null, primary key
+#  name           :string(255)     not null
+#  supplier_id    :integer(4)      not null
+#  number         :string(255)
+#  note           :string(255)
+#  manufacturer   :string(255)
+#  origin         :string(255)
+#  unit           :string(255)
+#  price          :decimal(8, 2)   default(0.0), not null
+#  tax            :decimal(3, 1)   default(7.0), not null
+#  deposit        :decimal(8, 2)   default(0.0), not null
+#  unit_quantity  :decimal(4, 1)   default(1.0), not null
+#  scale_quantity :decimal(4, 2)
+#  scale_price    :decimal(8, 2)
+#  created_on     :datetime
+#  updated_on     :datetime
+#  list           :string(255)
+#
+

test/fixtures/assignments.yml

@@ -1,3 +1,5 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
 # == Schema Information
 #
 # Table name: assignments
@@ -5,7 +7,6 @@
 #  id       :integer         not null, primary key
 #  user_id  :integer         default(0), not null
 #  task_id  :integer         default(0), not null
-#  accepted :boolean
+#  accepted :boolean         default(FALSE)
 #
 
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html

test/fixtures/groups.yml

@@ -1,30 +1,3 @@
-# == Schema Information
-#
-# Table name: groups
-#
-#  id                  :integer         not null, primary key
-#  type                :string(255)     default(""), not null
-#  name                :string(255)     default(""), not null
-#  description         :string(255)
-#  account_balance     :decimal(, )     default(0.0), not null
-#  account_updated     :datetime
-#  created_on          :datetime        not null
-#  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         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
 admins:
   type: Workgroup
@@ -43,3 +16,32 @@ bananas:
   contact_person: Tim
   contact_phone: 030 123132456
   contact_address: Waldermarstrasse 43, 10988 Berlin
+
+# == Schema Information
+#
+# Table name: groups
+#
+#  id                  :integer         not null, primary key
+#  type                :string(255)     default(""), not null
+#  name                :string(255)     default(""), not null
+#  description         :string(255)
+#  account_balance     :decimal(8, 2)   default(0.0), not null
+#  account_updated     :datetime
+#  created_on          :datetime        not null
+#  role_admin          :boolean         default(FALSE), not null
+#  role_suppliers      :boolean         default(FALSE), not null
+#  role_article_meta   :boolean         default(FALSE), not null
+#  role_finance        :boolean         default(FALSE), not null
+#  role_orders         :boolean         default(FALSE), not null
+#  weekly_task         :boolean         default(FALSE)
+#  weekday             :integer
+#  task_name           :string(255)
+#  task_description    :string(255)
+#  task_required_users :integer         default(1)
+#  deleted_at          :datetime
+#  contact_person      :string(255)
+#  contact_phone       :string(255)
+#  contact_address     :string(255)
+#  stats               :text
+#
+

test/fixtures/messages.yml

@@ -1,3 +1,6 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+
 # == Schema Information
 #
 # Table name: messages
@@ -8,9 +11,7 @@
 #  subject        :string(255)     not null
 #  body           :text
 #  email_state    :integer         default(0), not null
-#  private        :boolean
+#  private        :boolean         default(FALSE)
 #  created_at     :datetime
 #
 
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-

test/fixtures/pages.yml

@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: pages
-#
-#  id           :integer         not null, primary key
-#  title        :string(255)
-#  body         :text
-#  permalink    :string(255)
-#  lock_version :integer         default(0)
-#  updated_by   :integer
-#  redirect     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
-#
-
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
 one:
@@ -24,3 +9,20 @@ two:
   title: MyString
   body: MyText
   permalink: MyString
+
+# == Schema Information
+#
+# Table name: pages
+#
+#  id           :integer         not null, primary key
+#  title        :string(255)
+#  body         :text
+#  permalink    :string(255)
+#  lock_version :integer         default(0)
+#  updated_by   :integer
+#  redirect     :integer
+#  parent_id    :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#
+

test/fixtures/suppliers.yml

@@ -1,22 +1,3 @@
-# == Schema Information
-#
-# Table name: suppliers
-#
-#  id            :integer(4)      not null, primary key
-#  name          :string(255)     not null
-#  address       :string(255)     not null
-#  phone         :string(255)     not null
-#  phone2        :string(255)
-#  fax           :string(255)
-#  email         :string(255)
-#  url           :string(255)
-#  delivery_days :string(255)
-#  note          :string(255)
-#  created_on    :datetime
-#  updated_on    :datetime
-#  lists         :string(255)
-#
-
 # == Schema Information
 <<<<<<< HEAD:test/fixtures/suppliers.yml
 =======
@@ -58,3 +39,28 @@ terra:
     hesitate to ask for it.
   min_order_quantity: 80,-€ (gross)
   
+
+
+# == Schema Information
+#
+# Table name: suppliers
+#
+#  id            :integer(4)      not null, primary key
+#  name          :string(255)     not null
+#  address       :string(255)     not null
+#  phone         :string(255)     not null
+#  phone2        :string(255)
+#  fax           :string(255)
+#  email         :string(255)
+#  url           :string(255)
+#  delivery_days :string(255)
+#  note          :string(255)
+#  created_on    :datetime
+#  updated_on    :datetime
+#  lists         :string(255)
+#  bnn_sync      :boolean(1)      default(FALSE)
+#  bnn_host      :string(255)
+#  bnn_user      :string(255)
+#  bnn_password  :string(255)
+#
+

test/fixtures/tasks.yml

@@ -1,3 +1,5 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
 # == Schema Information
 #
 # Table name: tasks
@@ -6,12 +8,13 @@
 #  name           :string(255)     default(""), not null
 #  description    :string(255)
 #  due_date       :date
-#  done           :boolean
+#  done           :boolean         default(FALSE)
 #  workgroup_id   :integer
-#  assigned       :boolean
+#  assigned       :boolean         default(FALSE)
 #  created_on     :datetime        not null
 #  updated_on     :datetime        not null
 #  required_users :integer         default(1)
+#  weekly         :boolean
+#  duration       :integer
 #
 
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html