Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks
Great!
This commit is contained in:
commit
db8a929f0b
22 changed files with 223 additions and 174 deletions
|
@ -18,6 +18,9 @@ class TasksController < ApplicationController
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@task = Task.new(params[:task])
|
@task = Task.new(params[:task])
|
||||||
|
if params[:periodic]
|
||||||
|
@task.periodic_task_group = PeriodicTaskGroup.new
|
||||||
|
end
|
||||||
if @task.save
|
if @task.save
|
||||||
redirect_to tasks_url, :notice => I18n.t('tasks.create.notice')
|
redirect_to tasks_url, :notice => I18n.t('tasks.create.notice')
|
||||||
else
|
else
|
||||||
|
@ -32,13 +35,20 @@ class TasksController < ApplicationController
|
||||||
def edit
|
def edit
|
||||||
@task = Task.find(params[:id])
|
@task = Task.find(params[:id])
|
||||||
@task.current_user_id = current_user.id
|
@task.current_user_id = current_user.id
|
||||||
|
if @task.periodic?
|
||||||
|
flash.now[:alert] = I18n.t('tasks.edit.warning_periodic').html_safe
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
@task = Task.find(params[:id])
|
@task = Task.find(params[:id])
|
||||||
|
was_periodic = @task.periodic?
|
||||||
@task.attributes=(params[:task])
|
@task.attributes=(params[:task])
|
||||||
if @task.errors.empty? && @task.save
|
if @task.errors.empty? && @task.save
|
||||||
flash[:notice] = I18n.t('tasks.update.notice')
|
flash[:notice] = I18n.t('tasks.update.notice')
|
||||||
|
if was_periodic and not @task.periodic?
|
||||||
|
flash[:notice] = I18n.t('tasks.update.notice_converted')
|
||||||
|
end
|
||||||
if @task.workgroup
|
if @task.workgroup
|
||||||
redirect_to workgroup_tasks_url(workgroup_id: @task.workgroup_id)
|
redirect_to workgroup_tasks_url(workgroup_id: @task.workgroup_id)
|
||||||
else
|
else
|
||||||
|
@ -53,7 +63,12 @@ class TasksController < ApplicationController
|
||||||
task = Task.find(params[:id])
|
task = Task.find(params[:id])
|
||||||
# Save user_ids to update apple statistics after destroy
|
# Save user_ids to update apple statistics after destroy
|
||||||
user_ids = task.user_ids
|
user_ids = task.user_ids
|
||||||
|
if params[:periodic]
|
||||||
|
task.periodic_task_group.exclude_tasks_before(task)
|
||||||
|
task.periodic_task_group.destroy
|
||||||
|
else
|
||||||
task.destroy
|
task.destroy
|
||||||
|
end
|
||||||
task.update_ordergroup_stats(user_ids)
|
task.update_ordergroup_stats(user_ids)
|
||||||
|
|
||||||
redirect_to tasks_url, :notice => I18n.t('tasks.destroy.notice')
|
redirect_to tasks_url, :notice => I18n.t('tasks.destroy.notice')
|
||||||
|
|
29
app/models/periodic_task_group.rb
Normal file
29
app/models/periodic_task_group.rb
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
class PeriodicTaskGroup < ActiveRecord::Base
|
||||||
|
has_many :tasks, dependent: :destroy
|
||||||
|
|
||||||
|
PeriodDays = 7
|
||||||
|
|
||||||
|
def has_next_task?
|
||||||
|
return false if tasks.empty?
|
||||||
|
return false if tasks.first.due_date.nil?
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_next_task
|
||||||
|
template_task = tasks.first
|
||||||
|
self.next_task_date ||= template_task.due_date + PeriodDays
|
||||||
|
|
||||||
|
next_task = template_task.dup
|
||||||
|
next_task.due_date = next_task_date
|
||||||
|
next_task.save
|
||||||
|
|
||||||
|
self.next_task_date += PeriodDays
|
||||||
|
self.save
|
||||||
|
end
|
||||||
|
|
||||||
|
def exclude_tasks_before(task)
|
||||||
|
tasks.where("due_date < '#{task.due_date}'").each do |t|
|
||||||
|
t.update_attribute(:periodic_task_group, nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,7 +1,9 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
class Task < ActiveRecord::Base
|
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
|
||||||
|
|
||||||
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)
|
||||||
|
@ -16,7 +18,9 @@ class Task < ActiveRecord::Base
|
||||||
validates :required_users, :presence => true
|
validates :required_users, :presence => true
|
||||||
validates_numericality_of :duration, :required_users, :only_integer => true, :greater_than => 0
|
validates_numericality_of :duration, :required_users, :only_integer => true, :greater_than => 0
|
||||||
validates_length_of :description, maximum: 250
|
validates_length_of :description, maximum: 250
|
||||||
|
validates :done, exclusion: { in: [true] }, if: :periodic?, on: :create
|
||||||
|
|
||||||
|
before_save :exclude_from_periodic_task_group, if: :changed?, unless: :new_record?
|
||||||
after_save :update_ordergroup_stats
|
after_save :update_ordergroup_stats
|
||||||
|
|
||||||
# Find all tasks, for which the current user should be responsible
|
# Find all tasks, for which the current user should be responsible
|
||||||
|
@ -46,6 +50,10 @@ class Task < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def periodic?
|
||||||
|
not periodic_task_group.nil?
|
||||||
|
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
|
||||||
|
@ -100,5 +108,10 @@ class Task < ActiveRecord::Base
|
||||||
def update_ordergroup_stats(user_ids = self.user_ids)
|
def update_ordergroup_stats(user_ids = self.user_ids)
|
||||||
Ordergroup.joins(:users).where(users: {id: user_ids}).each(&:update_stats!)
|
Ordergroup.joins(:users).where(users: {id: user_ids}).each(&:update_stats!)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def exclude_from_periodic_task_group
|
||||||
|
self.periodic_task_group = nil
|
||||||
|
true
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -6,51 +6,9 @@ class Workgroup < Group
|
||||||
has_many :open_tasks, :class_name => 'Task', :conditions => ['done = ?', false], :order => 'due_date ASC'
|
has_many :open_tasks, :class_name => 'Task', :conditions => ['done = ?', false], :order => 'due_date ASC'
|
||||||
|
|
||||||
validates_uniqueness_of :name
|
validates_uniqueness_of :name
|
||||||
validates_presence_of :task_name, :weekday, :task_required_users, :next_weekly_tasks_number,
|
|
||||||
:if => :weekly_task
|
|
||||||
validates_numericality_of :next_weekly_tasks_number, :greater_than => 0, :less_than => 21, :only_integer => true,
|
|
||||||
:if => :weekly_task
|
|
||||||
validates_length_of :task_description, maximum: 250
|
|
||||||
validate :last_admin_on_earth, :on => :update
|
validate :last_admin_on_earth, :on => :update
|
||||||
before_destroy :check_last_admin_group
|
before_destroy :check_last_admin_group
|
||||||
|
|
||||||
def self.weekdays
|
|
||||||
days = I18n.t('date.day_names')
|
|
||||||
(0..days.length-1).map {|i| [days[i], i.to_s]}
|
|
||||||
end
|
|
||||||
|
|
||||||
# Returns an Array with date-objects to represent the next weekly-tasks
|
|
||||||
def next_weekly_tasks
|
|
||||||
# our system starts from 0 (sunday) to 6 (saturday)
|
|
||||||
# get difference between groups weekday and now
|
|
||||||
diff = self.weekday - Time.now.wday
|
|
||||||
if diff >= 0
|
|
||||||
# weektask is in current week
|
|
||||||
nextTask = diff.day.from_now
|
|
||||||
else
|
|
||||||
# weektask is in the next week
|
|
||||||
nextTask = (diff + 7).day.from_now
|
|
||||||
end
|
|
||||||
# now generate the Array
|
|
||||||
nextTasks = Array.new
|
|
||||||
next_weekly_tasks_number.times do
|
|
||||||
nextTasks << nextTask.to_date
|
|
||||||
nextTask = 1.week.from_now(nextTask)
|
|
||||||
end
|
|
||||||
return nextTasks
|
|
||||||
end
|
|
||||||
|
|
||||||
def task_attributes(date)
|
|
||||||
{
|
|
||||||
:name => task_name,
|
|
||||||
:description => task_description,
|
|
||||||
:due_date => date,
|
|
||||||
:required_users => task_required_users,
|
|
||||||
:duration => task_duration,
|
|
||||||
:weekly => true
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
# Check before destroy a group, if this is the last group with admin role
|
# Check before destroy a group, if this is the last group with admin role
|
||||||
|
|
|
@ -45,26 +45,6 @@
|
||||||
= f.label :role_orders
|
= f.label :role_orders
|
||||||
%br/
|
%br/
|
||||||
= f.check_box :role_orders
|
= f.check_box :role_orders
|
||||||
%p
|
|
||||||
= f.label :weekly_task
|
|
||||||
%br/
|
|
||||||
= f.check_box :weekly_task
|
|
||||||
%p
|
|
||||||
= f.label :weekday
|
|
||||||
%br/
|
|
||||||
= f.text_field :weekday
|
|
||||||
%p
|
|
||||||
= f.label :task_name
|
|
||||||
%br/
|
|
||||||
= f.text_field :task_name
|
|
||||||
%p
|
|
||||||
= f.label :task_description
|
|
||||||
%br/
|
|
||||||
= f.text_field :task_description
|
|
||||||
%p
|
|
||||||
= f.label :task_required_users
|
|
||||||
%br/
|
|
||||||
= f.text_field :task_required_users
|
|
||||||
%p
|
%p
|
||||||
= f.label :deleted_at
|
= f.label :deleted_at
|
||||||
%br/
|
%br/
|
||||||
|
|
|
@ -12,11 +12,6 @@
|
||||||
%th Role Article Meta
|
%th Role Article Meta
|
||||||
%th Role Finance
|
%th Role Finance
|
||||||
%th Role Orders
|
%th Role Orders
|
||||||
%th Weekly Task
|
|
||||||
%th Weekday
|
|
||||||
%th Task Name
|
|
||||||
%th Task Description
|
|
||||||
%th Task Required Users
|
|
||||||
%th Deleted At
|
%th Deleted At
|
||||||
%th Contact Person
|
%th Contact Person
|
||||||
%th Contact Phone
|
%th Contact Phone
|
||||||
|
@ -34,11 +29,6 @@
|
||||||
%td= h ordergroup.role_article_meta
|
%td= h ordergroup.role_article_meta
|
||||||
%td= h ordergroup.role_finance
|
%td= h ordergroup.role_finance
|
||||||
%td= h ordergroup.role_orders
|
%td= h ordergroup.role_orders
|
||||||
%td= h ordergroup.weekly_task
|
|
||||||
%td= h ordergroup.weekday
|
|
||||||
%td= h ordergroup.task_name
|
|
||||||
%td= h ordergroup.task_description
|
|
||||||
%td= h ordergroup.task_required_users
|
|
||||||
%td= h ordergroup.deleted_at
|
%td= h ordergroup.deleted_at
|
||||||
%td= h ordergroup.contact_person
|
%td= h ordergroup.contact_person
|
||||||
%td= h ordergroup.contact_phone
|
%td= h ordergroup.contact_phone
|
||||||
|
|
|
@ -13,13 +13,6 @@
|
||||||
- members = group.users
|
- members = group.users
|
||||||
= "(#{members.size})"
|
= "(#{members.size})"
|
||||||
= members.collect(&:nick).join(", ")
|
= members.collect(&:nick).join(", ")
|
||||||
- if group.is_a?(Workgroup)
|
- unless group.is_a?(Workgroup)
|
||||||
%dt= t('.weekly_job') + ':'
|
|
||||||
%dd
|
|
||||||
- if group.weekly_task
|
|
||||||
=h "#{group.task_name} am #{weekday(group.weekday)}"
|
|
||||||
- else
|
|
||||||
= t '.no_weekly_job'
|
|
||||||
- else
|
|
||||||
%dt= t '.apple_limit'
|
%dt= t '.apple_limit'
|
||||||
%dd= group.ignore_apple_restriction ? t('.deactivated') : t('.activated')
|
%dd= group.ignore_apple_restriction ? t('.deactivated') : t('.activated')
|
||||||
|
|
|
@ -3,17 +3,6 @@
|
||||||
|
|
||||||
= yield
|
= yield
|
||||||
|
|
||||||
- if f.object.is_a?(Workgroup)
|
|
||||||
%h3= t '.title'
|
|
||||||
= f.input :weekly_task
|
|
||||||
#weekly_task_fields
|
|
||||||
= f.input :weekday, as: :select, collection: Workgroup.weekdays
|
|
||||||
= f.input :task_name
|
|
||||||
= f.input :task_required_users
|
|
||||||
= f.input :task_duration, :as => :select, :collection => (1..3)
|
|
||||||
= f.input :task_description, as: :text, input_html: {rows: 5}
|
|
||||||
= f.input :next_weekly_tasks_number
|
|
||||||
|
|
||||||
= f.input :user_tokens, :as => :string,
|
= f.input :user_tokens, :as => :string,
|
||||||
:input_html => { 'data-pre' => f.object.users.map { |u| u.token_attributes }.to_json }
|
:input_html => { 'data-pre' => f.object.users.map { |u| u.token_attributes }.to_json }
|
||||||
|
|
||||||
|
|
|
@ -25,5 +25,7 @@
|
||||||
= f.input :due_date, as: :date_picker
|
= f.input :due_date, as: :date_picker
|
||||||
= f.input :done
|
= f.input :done
|
||||||
.form-actions
|
.form-actions
|
||||||
= f.submit class: 'btn'
|
= f.submit class: 'btn btn-primary'
|
||||||
|
- if @task.new_record?
|
||||||
|
= f.submit t('.submit.periodic'), name: 'periodic', class: 'btn'
|
||||||
= link_to t('ui.or_cancel'), :back
|
= link_to t('ui.or_cancel'), :back
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th= t '.due_date'
|
%th= t '.due_date'
|
||||||
|
%th
|
||||||
%th= t '.task'
|
%th= t '.task'
|
||||||
%th{:colspan => '2'}
|
%th{:colspan => '2'}
|
||||||
= t '.who'
|
= t '.who'
|
||||||
|
@ -11,6 +12,9 @@
|
||||||
- done = task.done ? " done" : ""
|
- done = task.done ? " done" : ""
|
||||||
%tr{:class => done }
|
%tr{:class => done }
|
||||||
%td= format_date(task.due_date) unless task.due_date.nil?
|
%td= format_date(task.due_date) unless task.due_date.nil?
|
||||||
|
%td
|
||||||
|
- if task.periodic?
|
||||||
|
%i.icon-repeat{title: t('tasks.repeated')}
|
||||||
%td= link_to t('.task_format', name: task.name, duration: task.duration), task_path(task)
|
%td= link_to t('.task_format', name: task.name, duration: task.duration), task_path(task)
|
||||||
%td
|
%td
|
||||||
= task_assignments task
|
= task_assignments task
|
||||||
|
|
|
@ -10,7 +10,10 @@
|
||||||
%dd= simple_format(@task.description)
|
%dd= simple_format(@task.description)
|
||||||
- if @task.due_date.present?
|
- if @task.due_date.present?
|
||||||
%dt= t '.due_date'
|
%dt= t '.due_date'
|
||||||
%dd= format_date(@task.due_date)
|
%dd
|
||||||
|
= format_date(@task.due_date)
|
||||||
|
- if @task.periodic?
|
||||||
|
%i.icon-repeat{title: t('tasks.repeated')}
|
||||||
%dt= t 'simple_form.labels.task.duration'
|
%dt= t 'simple_form.labels.task.duration'
|
||||||
%dd= t('.hours', count: @task.duration)
|
%dd= t('.hours', count: @task.duration)
|
||||||
%dt= t 'simple_form.labels.task.user_list'
|
%dt= t 'simple_form.labels.task.user_list'
|
||||||
|
@ -29,3 +32,6 @@
|
||||||
= link_to t('ui.edit'), edit_task_path(@task), class: 'btn'
|
= link_to t('ui.edit'), edit_task_path(@task), class: 'btn'
|
||||||
= link_to t('ui.delete'), task_path(@task), :method => :delete, :confirm => "Die Aufgabe wirklich löschen?",
|
= link_to t('ui.delete'), task_path(@task), :method => :delete, :confirm => "Die Aufgabe wirklich löschen?",
|
||||||
class: 'btn btn-danger'
|
class: 'btn btn-danger'
|
||||||
|
- if @task.periodic?
|
||||||
|
= link_to t('.delete_group'), task_path(@task, periodic: true), method: :delete,
|
||||||
|
confirm: t('.confirm_delete_group'), class: 'btn btn-danger'
|
||||||
|
|
|
@ -1,16 +1,6 @@
|
||||||
- title t('.title', workgroup: @group.name)
|
- title t('.title', workgroup: @group.name)
|
||||||
= render 'nav'
|
= render 'nav'
|
||||||
|
|
||||||
%section.well
|
|
||||||
%h3= t '.weekly.title'
|
|
||||||
- if @group.weekly_task
|
|
||||||
= t('.weekly.desc', weekday: weekday(@group.weekday), task: @group.task_name).html_safe
|
|
||||||
- else
|
|
||||||
= t('.weekly.empty').html_safe
|
|
||||||
|
|
||||||
- if @current_user.member_of?(@group) or @current_user.role_admin?
|
|
||||||
= link_to t('.weekly.edit'), edit_foodcoop_workgroup_path(@group), class: 'btn'
|
|
||||||
|
|
||||||
%section
|
%section
|
||||||
%h3= t '.title_all'
|
%h3= t '.title_all'
|
||||||
= render 'list', tasks: @group.open_tasks
|
= render 'list', tasks: @group.open_tasks
|
||||||
|
|
|
@ -45,26 +45,6 @@
|
||||||
= f.label :role_orders
|
= f.label :role_orders
|
||||||
%br/
|
%br/
|
||||||
= f.check_box :role_orders
|
= f.check_box :role_orders
|
||||||
%p
|
|
||||||
= f.label :weekly_task
|
|
||||||
%br/
|
|
||||||
= f.check_box :weekly_task
|
|
||||||
%p
|
|
||||||
= f.label :weekday
|
|
||||||
%br/
|
|
||||||
= f.text_field :weekday
|
|
||||||
%p
|
|
||||||
= f.label :task_name
|
|
||||||
%br/
|
|
||||||
= f.text_field :task_name
|
|
||||||
%p
|
|
||||||
= f.label :task_description
|
|
||||||
%br/
|
|
||||||
= f.text_field :task_description
|
|
||||||
%p
|
|
||||||
= f.label :task_required_users
|
|
||||||
%br/
|
|
||||||
= f.text_field :task_required_users
|
|
||||||
%p
|
%p
|
||||||
= f.label :deleted_at
|
= f.label :deleted_at
|
||||||
%br/
|
%br/
|
||||||
|
|
|
@ -12,11 +12,6 @@
|
||||||
%th Role Article Meta
|
%th Role Article Meta
|
||||||
%th Role Finance
|
%th Role Finance
|
||||||
%th Role Orders
|
%th Role Orders
|
||||||
%th Weekly Task
|
|
||||||
%th Weekday
|
|
||||||
%th Task Name
|
|
||||||
%th Task Description
|
|
||||||
%th Task Required Users
|
|
||||||
%th Deleted At
|
%th Deleted At
|
||||||
%th Contact Person
|
%th Contact Person
|
||||||
%th Contact Phone
|
%th Contact Phone
|
||||||
|
@ -34,11 +29,6 @@
|
||||||
%td= h workgroup.role_article_meta
|
%td= h workgroup.role_article_meta
|
||||||
%td= h workgroup.role_finance
|
%td= h workgroup.role_finance
|
||||||
%td= h workgroup.role_orders
|
%td= h workgroup.role_orders
|
||||||
%td= h workgroup.weekly_task
|
|
||||||
%td= h workgroup.weekday
|
|
||||||
%td= h workgroup.task_name
|
|
||||||
%td= h workgroup.task_description
|
|
||||||
%td= h workgroup.task_required_users
|
|
||||||
%td= h workgroup.deleted_at
|
%td= h workgroup.deleted_at
|
||||||
%td= h workgroup.contact_person
|
%td= h workgroup.contact_person
|
||||||
%td= h workgroup.contact_phone
|
%td= h workgroup.contact_phone
|
||||||
|
|
|
@ -81,6 +81,11 @@ de:
|
||||||
too_long: ist zu lang (nicht mehr als %{count} Zeichen)
|
too_long: ist zu lang (nicht mehr als %{count} Zeichen)
|
||||||
too_short: ist zu kurz (nicht weniger als %{count} Zeichen)
|
too_short: ist zu kurz (nicht weniger als %{count} Zeichen)
|
||||||
wrong_length: hat die falsche Länge (muss genau %{count} Zeichen haben)
|
wrong_length: hat die falsche Länge (muss genau %{count} Zeichen haben)
|
||||||
|
models:
|
||||||
|
task:
|
||||||
|
attributes:
|
||||||
|
done:
|
||||||
|
exclusion: erledigte Aufgaben können nicht wöchentlich wiederholt werden
|
||||||
template:
|
template:
|
||||||
body: ! 'Bitte überprüfen Sie die folgenden Felder:'
|
body: ! 'Bitte überprüfen Sie die folgenden Felder:'
|
||||||
header:
|
header:
|
||||||
|
@ -1626,12 +1631,6 @@ de:
|
||||||
role_finance: Finanzen
|
role_finance: Finanzen
|
||||||
role_orders: Bestellverwaltung
|
role_orders: Bestellverwaltung
|
||||||
role_suppliers: Lieferanten
|
role_suppliers: Lieferanten
|
||||||
task_description: Beschreibung
|
|
||||||
task_duration: Vor. Dauer in Stunden
|
|
||||||
task_name: Name für Job
|
|
||||||
task_required_users: Benötige Verantwortliche
|
|
||||||
weekday: Wochentag
|
|
||||||
weekly_task: Monatlichen Job definieren?
|
|
||||||
'no': Nein
|
'no': Nein
|
||||||
required:
|
required:
|
||||||
mark: ! '*'
|
mark: ! '*'
|
||||||
|
@ -1756,12 +1755,15 @@ de:
|
||||||
notice: Aufgabe wurde gelöscht
|
notice: Aufgabe wurde gelöscht
|
||||||
edit:
|
edit:
|
||||||
title: Aufgabe bearbeiten
|
title: Aufgabe bearbeiten
|
||||||
|
warning_periodic: <strong>Warnung:</strong> Diese Aufgabe ist Teil einer Gruppe von <em>wöchentlichen Aufgaben</em>. Beim Speichern wird sie aus der Gruppe ausgeschlossen und in eine <em>gewöhnliche Aufgabe</em> umgewandelt.
|
||||||
error_not_found: Keine Arbeitsgruppe gefunden
|
error_not_found: Keine Arbeitsgruppe gefunden
|
||||||
form:
|
form:
|
||||||
search:
|
search:
|
||||||
hint: Nach Nutzerin suchen
|
hint: Nach Nutzerin suchen
|
||||||
noresult: Keine Nutzerin gefunden
|
noresult: Keine Nutzerin gefunden
|
||||||
placeholder: Suche ...
|
placeholder: Suche ...
|
||||||
|
submit:
|
||||||
|
periodic: Wöchentliche Aufgabe speichern
|
||||||
index:
|
index:
|
||||||
show_group_tasks: Gruppenaufgaben anzeigen
|
show_group_tasks: Gruppenaufgaben anzeigen
|
||||||
title: Aufgaben
|
title: Aufgaben
|
||||||
|
@ -1785,10 +1787,13 @@ de:
|
||||||
new_task: Neue Aufgabe erstellen
|
new_task: Neue Aufgabe erstellen
|
||||||
new:
|
new:
|
||||||
title: Neue Aufgabe erstellen
|
title: Neue Aufgabe erstellen
|
||||||
|
repeated: Aufgabe wird wöchentlich wiederholt
|
||||||
set_done:
|
set_done:
|
||||||
notice: Aufgabenstatus wurde aktualisiert
|
notice: Aufgabenstatus wurde aktualisiert
|
||||||
show:
|
show:
|
||||||
accept_task: Aufgabe übernehmen
|
accept_task: Aufgabe übernehmen
|
||||||
|
confirm_delete_group: Diese und alle folgenden wöchentlichen Aufgaben wirklich löschen?
|
||||||
|
delete_group: Aufgabe und folgende löschen
|
||||||
due_date: Fälligkeitsdatum
|
due_date: Fälligkeitsdatum
|
||||||
hours: ! '%{count}h'
|
hours: ! '%{count}h'
|
||||||
mark_done: Als erledigt markieren
|
mark_done: Als erledigt markieren
|
||||||
|
@ -1796,6 +1801,7 @@ de:
|
||||||
title: Aufgabe anzeigen
|
title: Aufgabe anzeigen
|
||||||
update:
|
update:
|
||||||
notice: Aufgabe wurde aktualisiert
|
notice: Aufgabe wurde aktualisiert
|
||||||
|
notice_converted: Aufgabe wurde aktualisiert und in eine gewöhnliche Aufgabe umgewandelt
|
||||||
user:
|
user:
|
||||||
more: Nichts zu tun? %{tasks_link} gibt es bestimmt Arbeit
|
more: Nichts zu tun? %{tasks_link} gibt es bestimmt Arbeit
|
||||||
tasks_link: Hier
|
tasks_link: Hier
|
||||||
|
@ -1805,11 +1811,6 @@ de:
|
||||||
workgroup:
|
workgroup:
|
||||||
title: Aufgaben für %{workgroup}
|
title: Aufgaben für %{workgroup}
|
||||||
title_all: Alle Aufgaben der Gruppe
|
title_all: Alle Aufgaben der Gruppe
|
||||||
weekly:
|
|
||||||
desc: ! '<p>Jeden <b>%{weekday}</b> hat diese Arbeitsgruppe folgenden Job: <b>%{task}</b></p> <p>Die Wochenaufgaben werden von der Foodsoft automatisch erstellt. Eintragen müsst Ihr Euch aber selber.</p>'
|
|
||||||
edit: Wöchentliche Aufgaben anpassen
|
|
||||||
empty: Noch keine Wochenaufgaben angelegt.
|
|
||||||
title: Wöchentliche Aufgaben
|
|
||||||
time:
|
time:
|
||||||
am: vormittags
|
am: vormittags
|
||||||
formats:
|
formats:
|
||||||
|
|
|
@ -81,6 +81,11 @@ en:
|
||||||
too_long: is too long (no more than %{count} characters)
|
too_long: is too long (no more than %{count} characters)
|
||||||
too_short: is too short (use more than %{count} characters)
|
too_short: is too short (use more than %{count} characters)
|
||||||
wrong_length: is the wrong length (has to have exactly %{count} characters)
|
wrong_length: is the wrong length (has to have exactly %{count} characters)
|
||||||
|
models:
|
||||||
|
task:
|
||||||
|
attributes:
|
||||||
|
done:
|
||||||
|
exclusion: finished tasks may not be repeated weekly
|
||||||
template:
|
template:
|
||||||
body: ! 'Please check the following fields:'
|
body: ! 'Please check the following fields:'
|
||||||
header:
|
header:
|
||||||
|
@ -1758,12 +1763,15 @@ en:
|
||||||
notice: Task has been deleted
|
notice: Task has been deleted
|
||||||
edit:
|
edit:
|
||||||
title: Edit task
|
title: Edit task
|
||||||
|
warning_periodic: <strong>Warning:</strong> This task is part of a group of <em>weekly tasks</em>. When saving it will be excluded from the group and it will be converted to a <em>regular task</em>.
|
||||||
error_not_found: No workgroup found
|
error_not_found: No workgroup found
|
||||||
form:
|
form:
|
||||||
search:
|
search:
|
||||||
hint: Search for user
|
hint: Search for user
|
||||||
noresult: No user found
|
noresult: No user found
|
||||||
placeholder: Search ...
|
placeholder: Search ...
|
||||||
|
submit:
|
||||||
|
periodic: Save weekly task
|
||||||
index:
|
index:
|
||||||
show_group_tasks: Show group tasks
|
show_group_tasks: Show group tasks
|
||||||
title: Tasks
|
title: Tasks
|
||||||
|
@ -1787,10 +1795,13 @@ en:
|
||||||
new_task: Create new task
|
new_task: Create new task
|
||||||
new:
|
new:
|
||||||
title: Create new tasks
|
title: Create new tasks
|
||||||
|
repeated: Task is repeated weekly
|
||||||
set_done:
|
set_done:
|
||||||
notice: The state of the task has been updated
|
notice: The state of the task has been updated
|
||||||
show:
|
show:
|
||||||
accept_task: Accept task
|
accept_task: Accept task
|
||||||
|
confirm_delete_group: Really delete this and all subsequent tasks?
|
||||||
|
delete_group: Delete task and subsequent
|
||||||
due_date: Due date
|
due_date: Due date
|
||||||
hours: ! '%{count}h'
|
hours: ! '%{count}h'
|
||||||
mark_done: Mark task as done
|
mark_done: Mark task as done
|
||||||
|
@ -1798,6 +1809,7 @@ en:
|
||||||
title: Show task
|
title: Show task
|
||||||
update:
|
update:
|
||||||
notice: Task has been updated
|
notice: Task has been updated
|
||||||
|
notice_converted: Task has been updated and was converted to a regular task
|
||||||
user:
|
user:
|
||||||
more: Nothing to do? %{tasks_link} are tasks for sure.
|
more: Nothing to do? %{tasks_link} are tasks for sure.
|
||||||
tasks_link: Here
|
tasks_link: Here
|
||||||
|
|
13
db/migrate/20130615073715_create_periodic_task_groups.rb
Normal file
13
db/migrate/20130615073715_create_periodic_task_groups.rb
Normal 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
|
60
db/migrate/20130622095040_move_weekly_tasks.rb
Normal file
60
db/migrate/20130622095040_move_weekly_tasks.rb
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
class MoveWeeklyTasks < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
Workgroup.where(weekly_task: true).each do |workgroup|
|
||||||
|
task_group = PeriodicTaskGroup.create
|
||||||
|
puts "Moving weekly task for workgroup #{workgroup.name} to group #{task_group.id}"
|
||||||
|
workgroup.tasks.undone.each do |task|
|
||||||
|
task.update_column(:periodic_task_group_id, task_group.id) if weekly_task?(workgroup, task)
|
||||||
|
end
|
||||||
|
tasks = task_group.tasks.order(:due_date)
|
||||||
|
task_group.next_task_date = tasks.last.due_date + PeriodicTaskGroup::PeriodDays unless tasks.empty?
|
||||||
|
task_group.save!
|
||||||
|
puts "Associated #{tasks.count} tasks with group and set next_task_date to #{task_group.next_task_date}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
PeriodicTaskGroup.all.each do |task_group|
|
||||||
|
unless task_group.tasks.empty?
|
||||||
|
task = task_group.tasks.first
|
||||||
|
workgroup = task.workgroup
|
||||||
|
puts "Writing task data of group #{task_group.id} to workgroup #{workgroup.name}"
|
||||||
|
workgroup_attributes = {
|
||||||
|
weekly_task: true,
|
||||||
|
weekday: task.due_date.days_to_week_start(:sunday),
|
||||||
|
task_name: task.name,
|
||||||
|
task_description: task.description,
|
||||||
|
task_required_users: task.required_users,
|
||||||
|
task_duration: task.duration
|
||||||
|
}
|
||||||
|
workgroup.update_attributes workgroup_attributes
|
||||||
|
task_group.tasks.update_all weekly: true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
def weekly_task?(workgroup, task)
|
||||||
|
group_task = {
|
||||||
|
weekday: workgroup.weekday,
|
||||||
|
name: workgroup.task_name,
|
||||||
|
description: workgroup.task_description,
|
||||||
|
required_users: workgroup.task_required_users,
|
||||||
|
duration: workgroup.task_duration,
|
||||||
|
weekly: true,
|
||||||
|
done: false,
|
||||||
|
workgroup_id: workgroup.id
|
||||||
|
}
|
||||||
|
task_task = {
|
||||||
|
weekday: task.due_date.days_to_week_start(:sunday),
|
||||||
|
name: task.name,
|
||||||
|
description: task.description,
|
||||||
|
required_users: task.required_users,
|
||||||
|
duration: task.duration,
|
||||||
|
weekly: task.weekly,
|
||||||
|
done: task.done,
|
||||||
|
workgroup_id: task.workgroup_id
|
||||||
|
}
|
||||||
|
group_task == task_task
|
||||||
|
end
|
||||||
|
end
|
9
db/migrate/20130624084223_remove_weekly_from_tasks.rb
Normal file
9
db/migrate/20130624084223_remove_weekly_from_tasks.rb
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
class RemoveWeeklyFromTasks < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
remove_column :tasks, :weekly
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
add_column :tasks, :weekly, :boolean
|
||||||
|
end
|
||||||
|
end
|
19
db/migrate/20130624085246_remove_weekly_task_from_groups.rb
Normal file
19
db/migrate/20130624085246_remove_weekly_task_from_groups.rb
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
class RemoveWeeklyTaskFromGroups < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
remove_column :groups, :weekly_task
|
||||||
|
remove_column :groups, :weekday
|
||||||
|
remove_column :groups, :task_name
|
||||||
|
remove_column :groups, :task_description
|
||||||
|
remove_column :groups, :task_required_users
|
||||||
|
remove_column :groups, :task_duration
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
add_column :groups, :task_duration, :integer
|
||||||
|
add_column :groups, :task_required_users, :integer
|
||||||
|
add_column :groups, :task_description, :string
|
||||||
|
add_column :groups, :task_name, :string
|
||||||
|
add_column :groups, :weekday, :integer
|
||||||
|
add_column :groups, :weekly_task, :boolean
|
||||||
|
end
|
||||||
|
end
|
16
db/schema.rb
16
db/schema.rb
|
@ -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 => 20121230142516) do
|
ActiveRecord::Schema.define(:version => 20130624085246) 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
|
||||||
|
@ -143,17 +143,11 @@ ActiveRecord::Schema.define(:version => 20121230142516) do
|
||||||
t.boolean "role_article_meta", :default => false, :null => false
|
t.boolean "role_article_meta", :default => false, :null => false
|
||||||
t.boolean "role_finance", :default => false, :null => false
|
t.boolean "role_finance", :default => false, :null => false
|
||||||
t.boolean "role_orders", :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.datetime "deleted_at"
|
t.datetime "deleted_at"
|
||||||
t.string "contact_person"
|
t.string "contact_person"
|
||||||
t.string "contact_phone"
|
t.string "contact_phone"
|
||||||
t.string "contact_address"
|
t.string "contact_address"
|
||||||
t.text "stats"
|
t.text "stats"
|
||||||
t.integer "task_duration", :default => 1
|
|
||||||
t.integer "next_weekly_tasks_number", :default => 8
|
t.integer "next_weekly_tasks_number", :default => 8
|
||||||
t.boolean "ignore_apple_restriction", :default => false
|
t.boolean "ignore_apple_restriction", :default => false
|
||||||
end
|
end
|
||||||
|
@ -268,6 +262,12 @@ ActiveRecord::Schema.define(:version => 20121230142516) 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"
|
||||||
|
@ -316,8 +316,8 @@ ActiveRecord::Schema.define(:version => 20121230142516) do
|
||||||
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.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"
|
||||||
|
|
|
@ -16,21 +16,6 @@ namespace :foodsoft do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
desc "Create upcoming workgroups tasks (next 3 to 7 weeks)"
|
|
||||||
task :create_upcoming_weekly_tasks => :environment do
|
|
||||||
workgroups = Workgroup.where(weekly_task: true)
|
|
||||||
for workgroup in workgroups
|
|
||||||
puts "Create weekly tasks for #{workgroup.name}"
|
|
||||||
# Loop through next tasks weekly tasks method,
|
|
||||||
# skip the next 3 weeks, to allow manually deleting tasks
|
|
||||||
workgroup.next_weekly_tasks[3..-1].each do |date|
|
|
||||||
unless workgroup.tasks.exists?({:due_date => date, :weekly => true})
|
|
||||||
workgroup.tasks.create(workgroup.task_attributes(date))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
desc "Notify workgroup of upcoming weekly task"
|
desc "Notify workgroup of upcoming weekly task"
|
||||||
task :notify_users_of_weekly_task => :environment do
|
task :notify_users_of_weekly_task => :environment do
|
||||||
for workgroup in Workgroup.all
|
for workgroup in Workgroup.all
|
||||||
|
@ -50,4 +35,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 + 50
|
||||||
|
tg.create_next_task
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue