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

Jump to bottom

fix(Monthly Attendance Sheet): show shift for month full of leaves (backport #2198) #2202

Merged
merged 2 commits into from
Sep 17, 2024
Merged

fix(Monthly Attendance Sheet): show shift for month full of leaves (backport #2198) #2202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11223ca
fix: show shift for month full of leaves
krantheman Sep 16, 2024
5068b19
test: update test to check for shift of employees on leave
krantheman Sep 16, 2024
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
17 changes: 9 additions & 8 deletions hrms/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 @@ -229,7 +229,7 @@ def get_attendance_map(filters: Filters) -> dict:

for d in attendance_list:
if d.status == "On Leave":
leave_map.setdefault(d.employee, []).append(d.day_of_month)
leave_map.setdefault(d.employee, {}).setdefault(d.shift, []).append(d.day_of_month)
continue

if d.shift is None:
Expand All @@ -240,13 +240,14 @@ def get_attendance_map(filters: Filters) -> dict:

# leave is applicable for the entire day so all shifts should show the leave entry
for employee, leave_days in leave_map.items():
# no attendance records exist except leaves
if employee not in attendance_map:
attendance_map.setdefault(employee, {}).setdefault(None, {})

for day in leave_days:
for shift in attendance_map[employee].keys():
attendance_map[employee][shift][day] = "On Leave"
for assigned_shift, days in leave_days.items():
# no attendance records exist except leaves
if employee not in attendance_map:
attendance_map.setdefault(employee, {}).setdefault(assigned_shift, {})

for day in days:
for shift in attendance_map[employee].keys():
attendance_map[employee][shift][day] = "On Leave"

return attendance_map

Expand Down
7 changes: 5 additions & 2 deletions hrms/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ def test_monthly_attendance_sheet_report(self):
mark_attendance(self.employee, previous_month_first + relativedelta(days=1), "Present")
mark_attendance(self.employee, previous_month_first + relativedelta(days=2), "On Leave")

employee_on_leave_with_shift = make_employee("employee@leave.com", company=self.company)
mark_attendance(employee_on_leave_with_shift, previous_month_first, "On Leave", "Day Shift")

filters = frappe._dict(
{
"month": previous_month_first.month,
Expand All @@ -50,14 +53,14 @@ def test_monthly_attendance_sheet_report(self):
)
report = execute(filters=filters)

record = report[1][0]
datasets = report[3]["data"]["datasets"]
absent = datasets[0]["values"]
present = datasets[1]["values"]
leaves = datasets[2]["values"]

# ensure correct attendance is reflected on the report
self.assertEqual(self.employee, record.get("employee"))
self.assertEqual(self.employee, report[1][0].get("employee"))
self.assertEqual("Day Shift", report[1][1].get("shift"))
self.assertEqual(absent[0], 1)
self.assertEqual(present[1], 1)
self.assertEqual(leaves[2], 1)
Expand Down
Loading