Outlined new concept for multiple periodically recurring tasks (#3).

This commit is contained in:
Robert Waltemath 2012-11-28 10:13:54 +01:00
parent 1822b330d1
commit 1cdb9e8501
7 changed files with 73 additions and 8 deletions

View file

@ -0,0 +1,23 @@
class PeriodicTaskGroup < ActiveRecord::Base
has_many :tasks, :inverse_of => :periodic_task_group, :dependent => :destroy
PeriodDays = 7
def has_next_task?
return false if self.tasks.empty?
return false if self.tasks.first.due_date.nil?
return true
end
def create_next_task
template_task = self.tasks.first
self.next_task_date ||= template_task.due_date + PeriodDays
next_task = template_task.dup
next_task.due_date = self.next_task_date
next_task.save
self.next_task_date += PeriodDays
self.save
end
end

View file

@ -2,6 +2,7 @@ class Task < ActiveRecord::Base
has_many :assignments, :dependent => :destroy has_many :assignments, :dependent => :destroy
has_many :users, :through => :assignments has_many :users, :through => :assignments
belongs_to :workgroup belongs_to :workgroup
belongs_to :periodic_task_group, :inverse_of => :tasks
scope :non_group, where(workgroup_id: nil, done: false) scope :non_group, where(workgroup_id: nil, done: false)
scope :done, where(done: true) scope :done, where(done: true)
@ -45,6 +46,14 @@ class Task < ActiveRecord::Base
end end
end end
def periodic
not periodic_task_group.nil?
end
def periodic=(p)
self.periodic_task_group = PeriodicTaskGroup.new if p == "1"
end
def is_assigned?(user) def is_assigned?(user)
self.assignments.detect {|ass| ass.user_id == user.id } self.assignments.detect {|ass| ass.user_id == user.id }
end end

View file

@ -23,6 +23,7 @@
= f.input :required_users = f.input :required_users
= f.association :workgroup = f.association :workgroup
= f.input :due_date, as: :date_picker = f.input :due_date, as: :date_picker
= f.input :periodic, as: :boolean
= f.input :done = f.input :done
.form-actions .form-actions
= f.submit class: 'btn' = f.submit class: 'btn'

View file

@ -312,6 +312,7 @@ de:
required_users: 'Anzahl' required_users: 'Anzahl'
due_date: 'Wann erledigen?' due_date: 'Wann erledigen?'
workgroup: 'Arbeitsgruppe' workgroup: 'Arbeitsgruppe'
periodic: 'Wöchentlich wiederholen'
done: Erledigt? done: Erledigt?
message: message:
sent_to_all: 'An alle Mitglieder schicken' sent_to_all: 'An alle Mitglieder schicken'

View file

@ -0,0 +1,13 @@
class CreatePeriodicTaskGroups < ActiveRecord::Migration
def change
create_table :periodic_task_groups do |t|
t.date :next_task_date
t.timestamps
end
change_table :tasks do |t|
t.references :periodic_task_group
end
end
end

View file

@ -11,7 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20120929155541) do ActiveRecord::Schema.define(:version => 20121115073715) do
create_table "article_categories", :force => true do |t| create_table "article_categories", :force => true do |t|
t.string "name", :default => "", :null => false t.string "name", :default => "", :null => false
@ -284,6 +284,12 @@ ActiveRecord::Schema.define(:version => 20120929155541) do
add_index "pages", ["permalink"], :name => "index_pages_on_permalink" add_index "pages", ["permalink"], :name => "index_pages_on_permalink"
add_index "pages", ["title"], :name => "index_pages_on_title" add_index "pages", ["title"], :name => "index_pages_on_title"
create_table "periodic_task_groups", :force => true do |t|
t.date "next_task_date"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
create_table "stock_changes", :force => true do |t| create_table "stock_changes", :force => true do |t|
t.integer "delivery_id" t.integer "delivery_id"
t.integer "order_id" t.integer "order_id"
@ -324,17 +330,18 @@ ActiveRecord::Schema.define(:version => 20120929155541) do
add_index "suppliers", ["name"], :name => "index_suppliers_on_name", :unique => true add_index "suppliers", ["name"], :name => "index_suppliers_on_name", :unique => true
create_table "tasks", :force => true do |t| create_table "tasks", :force => true do |t|
t.string "name", :default => "", :null => false t.string "name", :default => "", :null => false
t.string "description" t.string "description"
t.date "due_date" t.date "due_date"
t.boolean "done", :default => false t.boolean "done", :default => false
t.integer "workgroup_id" t.integer "workgroup_id"
t.boolean "assigned", :default => false t.boolean "assigned", :default => false
t.datetime "created_on", :null => false t.datetime "created_on", :null => false
t.datetime "updated_on", :null => false t.datetime "updated_on", :null => false
t.integer "required_users", :default => 1 t.integer "required_users", :default => 1
t.boolean "weekly" t.boolean "weekly"
t.integer "duration", :default => 1 t.integer "duration", :default => 1
t.integer "periodic_task_group_id"
end end
add_index "tasks", ["due_date"], :name => "index_tasks_on_due_date" add_index "tasks", ["due_date"], :name => "index_tasks_on_due_date"

View file

@ -49,4 +49,15 @@ namespace :foodsoft do
end end
end end
end end
desc "Create upcoming periodic tasks"
task :create_upcoming_periodic_tasks => :environment do
for tg in PeriodicTaskGroup.all
if tg.has_next_task?
while tg.next_task_date.nil? or tg.next_task_date < Date.today + 30
tg.create_next_task
end
end
end
end
end end