Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: monthly attendance sheet #30748

Merged
merged 1 commit into from
Apr 20, 2022
Merged

fix: monthly attendance sheet #30748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ def execute(filters=None):

data = []

leave_list = None
leave_types = None
if filters.summarized_view:
leave_types = frappe.db.sql("""select name from `tabLeave Type`""", as_list=True)
leave_list = [d[0] + ":Float:120" for d in leave_types]
columns.extend(leave_list)
leave_types = frappe.get_all("Leave Type", pluck="name")
columns.extend([leave_type + ":Float:120" for leave_type in leave_types])
columns.extend([_("Total Late Entries") + ":Float:120", _("Total Early Exits") + ":Float:120"])

if filters.group_by:
Expand All @@ -81,13 +80,19 @@ def execute(filters=None):
holiday_map,
conditions,
default_holiday_list,
leave_list=leave_list,
leave_types=leave_types,
)
emp_att_map.update(emp_att_data)
data += record
else:
record, emp_att_map = add_data(
emp_map, att_map, filters, holiday_map, conditions, default_holiday_list, leave_list=leave_list
emp_map,
att_map,
filters,
holiday_map,
conditions,
default_holiday_list,
leave_types=leave_types,
)
data += record

Expand All @@ -104,12 +109,10 @@ def get_chart_data(emp_att_map, days):
{"name": "Leave", "values": []},
]
for idx, day in enumerate(days, start=0):
p = day.replace("::65", "")
labels.append(day.replace("::65", ""))
total_absent_on_day = 0
total_leave_on_day = 0
total_present_on_day = 0
total_holiday = 0
for emp in emp_att_map.keys():
if emp_att_map[emp][idx]:
if emp_att_map[emp][idx] == "A":
Expand All @@ -134,9 +137,8 @@ def get_chart_data(emp_att_map, days):


def add_data(
employee_map, att_map, filters, holiday_map, conditions, default_holiday_list, leave_list=None
employee_map, att_map, filters, holiday_map, conditions, default_holiday_list, leave_types=None
):

record = []
emp_att_map = {}
for emp in employee_map:
Expand Down Expand Up @@ -222,7 +224,7 @@ def add_data(
else:
leaves[d.leave_type] = d.count

for d in leave_list:
for d in leave_types:
if d in leaves:
row.append(leaves[d])
else:
Expand Down