Consider task duration in ordergroup stats.
* Also added duration to task template in workgroup task_duration.
This commit is contained in:
parent
be85296ddb
commit
c2496aa4fd
19 changed files with 80 additions and 32 deletions
|
|
@ -8,6 +8,11 @@
|
|||
%b Beschreibung
|
||||
%br/
|
||||
= form.text_area :description, :cols => 50, :rows => 10
|
||||
%p
|
||||
%b Dauer
|
||||
%small Wie lange dauert die Aufgabe, 1-3 Stunden
|
||||
%br/
|
||||
= form.select :duration, options_for_select(1..3, @task.duration)
|
||||
%p
|
||||
%b Verantwortliche
|
||||
%small Aufgaben können mehrere Verantwortliche haben
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
- done = task.done ? " done" : ""
|
||||
%tr{:class => cycle('even','odd', :name => "tasks") + done }
|
||||
%td= format_date(task.due_date) unless task.due_date.nil?
|
||||
%td= link_to task.name, task_path(task)
|
||||
%td= link_to "#{task.name} (#{task.duration}h)", task_path(task)
|
||||
%td
|
||||
- unless task.users.empty?
|
||||
- owner = Array.new
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
- for task in @tasks
|
||||
%tr{:class => cycle('even','odd')}
|
||||
%td= task.due_date unless task.due_date.nil?
|
||||
%td= link_to task.name, :controller => "tasks", :action => "show", :id => task
|
||||
%td= link_to "#{task.name} (#{task.duration}h)", :controller => "tasks", :action => "show", :id => task
|
||||
%td
|
||||
- unless task.users.empty?
|
||||
= task.users.map(&:nick).join(", ")
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@
|
|||
%tr
|
||||
%td Fälligkeitsdatum
|
||||
%td= format_date(@task.due_date)
|
||||
%tr
|
||||
%td Dauer in Stunden
|
||||
%td= @task.duration
|
||||
%tr
|
||||
%td Verantwortliche Menschen
|
||||
%td= render :partial => "assignments"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue