mozcode
/
stoptime
1
0
Fork 0
Code Issues 25 Pull Requests Releases Wiki Activity

Merge branch 'feature/19b3cc-fix-no-active-tasks-overview' into development (closes: #19b3cc)

This commit is contained in:
Paul van Tilburg 2014-11-08 12:07:32 +01:00
parent 856d22b617 4cf1517b43
commit d4985a2242
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
stoptime.rb
View File

@ -895,18 +895,22 @@ module StopTime::Controllers
# {Views#overview}.
def get
@tasks = {}
@tasks_summary = {}
@task_count = 0
@active_tasks = {}
@active_tasks_summary = {}
Customer.all.each do |customer|
tasks = customer.active_tasks
tasks = customer.unbilled_tasks
@tasks[customer] = tasks
@tasks_summary[customer] = tasks.inject([0.0, 0.0]) do |summ, task|
task_summ = task.summary
summ[0] += task_summ[0]
summ[1] += task_summ[2]
summ
end
@task_count += tasks.count
active_tasks = customer.active_tasks
@active_tasks[customer] = active_tasks
@active_tasks_summary[customer] =
active_tasks.inject([0.0, 0.0]) do |summ, task|
task_summ = task.summary
summ[0] += task_summ[0]
summ[1] += task_summ[2]
summ
end
end
render :overview
end
@ -1784,12 +1788,22 @@ module StopTime::Views
text! "No projects/tasks found! Create one " +
"#{a "here", :href => R(CustomersNTasksNew, customer.id)}."
end
elsif @active_tasks[customer].empty?
p do
text! "No active projects/tasks found! " +
"Register time on one of these tasks: "
br
@tasks[customer].each do |task|
a task.name, :href => R(CustomersNTasksN, customer.id, task.id)
text! "·" unless task == @tasks[customer].last
end
end
else
table.table.table_condensed do
col.task
col.hours
col.amount
@tasks[customer].each do |task|
@active_tasks[customer].each do |task|
tr do
summary = task.summary
td do
@ -1803,8 +1817,8 @@ module StopTime::Views
end
tr do
td { b "Total" }
td.text_right { "%.2fh" % @tasks_summary[customer][0] }
td.text_right { "€ %.2f" % @tasks_summary[customer][1] }
td.text_right { "%.2fh" % @active_tasks_summary[customer][0] }
td.text_right { "€ %.2f" % @active_tasks_summary[customer][1] }
end
end
end