Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Consider task duration in ordergroup stats.

Browse source 
* Also added duration to task template in workgroup task_duration.
This commit is contained in:
benni 2011-05-07 21:54:00 +02:00
parent be85296ddb
commit c2496aa4fd
19 changed files with 80 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
db/migrate/20110507184920_add_duration_to_tasks.rb
View file

@ -1,6 +1,6 @@
class AddDurationToTasks < ActiveRecord::Migration
def self.up
add_column :tasks, :duration, :integer
add_column :tasks, :duration, :integer, :default => 1
end
def self.down

9
db/migrate/20110507192928_add_task_duration_to_workgroups.rb Normal file
View file

@ -0,0 +1,9 @@
class AddTaskDurationToWorkgroups < ActiveRecord::Migration
def self.up
add_column :groups, :task_duration, :integer, :default => 1
end
def self.down
remove_column :groups, :task_duration
end
end

27
db/schema.rb
View file

@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20110507184920) do
ActiveRecord::Schema.define(:version => 20110507192928) do
create_table "article_categories", :force => true do |t|
t.string "name", :default => "", :null => false
@ -129,27 +129,28 @@ ActiveRecord::Schema.define(:version => 20110507184920) do
add_index "group_orders", ["ordergroup_id"], :name => "index_group_orders_on_ordergroup_id"
create_table "groups", :force => true do |t|
t.string "type", :default => "", :null => false
t.string "name", :default => "", :null => false
t.string "type", :default => "", :null => false
t.string "name", :default => "", :null => false
t.string "description"
t.decimal "account_balance", :precision => 8, :scale => 2, :default => 0.0, :null => false
t.decimal "account_balance", :default => 0.0, :null => false
t.datetime "account_updated"
t.datetime "created_on", :null => false
t.boolean "role_admin", :default => false, :null => false
t.boolean "role_suppliers", :default => false, :null => false
t.boolean "role_article_meta", :default => false, :null => false
t.boolean "role_finance", :default => false, :null => false
t.boolean "role_orders", :default => false, :null => false
t.boolean "weekly_task", :default => false
t.datetime "created_on", :null => false
t.boolean "role_admin", :default => false, :null => false
t.boolean "role_suppliers", :default => false, :null => false
t.boolean "role_article_meta", :default => false, :null => false
t.boolean "role_finance", :default => false, :null => false
t.boolean "role_orders", :default => false, :null => false
t.boolean "weekly_task", :default => false
t.integer "weekday"
t.string "task_name"
t.string "task_description"
t.integer "task_required_users", :default => 1
t.integer "task_required_users", :default => 1
t.datetime "deleted_at"
t.string "contact_person"
t.string "contact_phone"
t.string "contact_address"
t.text "stats"
t.integer "task_duration", :default => 1
end
add_index "groups", ["name"], :name => "index_groups_on_name", :unique => true
@ -311,7 +312,7 @@ ActiveRecord::Schema.define(:version => 20110507184920) do
t.datetime "updated_on", :null => false
t.integer "required_users", :default => 1
t.boolean "weekly"
t.integer "duration"
t.integer "duration", :default => 1
end
add_index "tasks", ["due_date"], :name => "index_tasks_on_due_date"