From 627a08b7dbbd12f80e956c06a5f6e3fedaddd25f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 23 Apr 2013 17:49:24 +0530 Subject: [PATCH] [report] total added in daily time log summary report --- .../daily_time_log_summary.py | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/projects/report/daily_time_log_summary/daily_time_log_summary.py b/projects/report/daily_time_log_summary/daily_time_log_summary.py index 808d1ba7d0..8c1e2668cd 100644 --- a/projects/report/daily_time_log_summary/daily_time_log_summary.py +++ b/projects/report/daily_time_log_summary/daily_time_log_summary.py @@ -19,23 +19,29 @@ def execute(filters=None): time_logs = webnotes.conn.sql("""select * from `tabTime Log` where docstatus < 2 %s order by owner asc""" % (conditions, ), filters, as_dict=1) - data = [] if time_logs: profiles = [time_logs[0].owner] - total_hours = 0 + data = [] + total_hours = total_employee_hours = count = 0 for tl in time_logs: if tl.owner not in profiles: profiles.append(tl.owner) - data.append([]) - + data.append(["", "", "", "Total", total_employee_hours, "", "", "", "", ""]) + total_employee_hours = 0 + data.append([tl.name, profile_map[tl.owner], tl.from_time, tl.to_time, tl.hours, tl.activity_type, tl.task, task_map.get(tl.task), tl.project, tl.status]) - + + count += 1 total_hours += flt(tl.hours) - + total_employee_hours += flt(tl.hours) + + if count == len(time_logs): + data.append(["", "", "", "Total Hours", total_employee_hours, "", "", "", "", ""]) + if total_hours: - data.append(["", "", "", "Total", total_hours, "", "", "", "", ""]) + data.append(["", "", "", "Grand Total", total_hours, "", "", "", "", ""]) return columns, data