Add repeated symbol to task list.

This commit is contained in:
Robert Waltemath 2013-06-27 10:22:22 +02:00
parent 7942ccfae6
commit e5d790021c
5 changed files with 12 additions and 3 deletions

View file

@ -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

View file

@ -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'

View file

@ -1788,6 +1788,7 @@ 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:

View file

@ -1795,6 +1795,7 @@ 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:

View file

@ -308,10 +308,10 @@ ActiveRecord::Schema.define(:version => 20130624085246) 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.datetime "created_on", :null => false t.datetime "created_on", :null => false
t.datetime "updated_on", :null => false t.datetime "updated_on", :null => false