Merge pull request #4096 from frappe/mergify/bp/version-16-hotfix/pr-4068

fix(attendance): use valuewrapper for doctype in calendar view (backport #4068)

Author: asmitahase

hrms/hr/doctype/attendance/attendance.py

@@ -2,9 +2,12 @@
 # License: GNU General Public License v3. See license.txt
 
 
+from datetime import date
+
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from frappe.query_builder.terms import ValueWrapper
 from frappe.utils import (
 	add_days,
 	cint,
@@ -249,10 +252,11 @@ def publish_update(self):
 
 
 @frappe.whitelist()
-def get_events(start, end, filters=None):
+def get_events(start: date | str, end: date | str, filters: str | list | None = None) -> list[dict]:
 	employee = frappe.db.get_value("Employee", {"user_id": frappe.session.user})
 	if not employee:
 		return []
+
 	if isinstance(filters, str):
 		import json
 
@@ -270,7 +274,7 @@ def add_attendance(filters):
 		"Attendance",
 		fields=[
 			"name",
-			"'Attendance' as doctype",
+			ValueWrapper("Attendance").as_("doctype"),
 			"attendance_date",
 			"employee_name",
 			"status",
@@ -279,7 +283,7 @@ def add_attendance(filters):
 		filters=filters,
 	)
 	for record in attendance:
-		record["title"] = f"{record.employee_name} : {record.status}"
+		record["title"] = f"{record['employee_name']} : {record['status']}"
 	return attendance
 
 
@@ -338,7 +342,7 @@ def mark_attendance(
 
 
 @frappe.whitelist()
-def mark_bulk_attendance(data):
+def mark_bulk_attendance(data: str | dict):
 	import json
 
 	if isinstance(data, str):
@@ -348,11 +352,11 @@ def mark_bulk_attendance(data):
 		frappe.throw(_("Please select a date."))
 		return
 
-	for date in data.unmarked_days:
+	for attendance_date in data.unmarked_days:
 		doc_dict = {
 			"doctype": "Attendance",
 			"employee": data.employee,
-			"attendance_date": get_datetime(date),
+			"attendance_date": get_datetime(attendance_date),
 			"status": data.status,
 			"half_day_status": "Absent" if data.status == "Half Day" else None,
 			"shift": data.shift,

hrms/hr/doctype/attendance/test_attendance.py

@@ -22,6 +22,7 @@
 from hrms.hr.doctype.attendance.attendance import (
 	DuplicateAttendanceError,
 	OverlappingShiftAttendanceError,
+	get_events,
 	get_unmarked_days,
 	mark_attendance,
 )
@@ -268,5 +269,29 @@ def test_duplicate_attendance_when_created_from_checkins_and_tool(self):
 		)
 		self.assertEqual(len(attendances), 1)
 
+	def test_get_events_returns_attendance(self):
+		employee = make_employee("calendar.user@example.com", company="_Test Company")
+
+		attendance_name = mark_attendance(employee, getdate(), status="Present")
+		attendance = frappe.get_value("Attendance", attendance_name, "status")
+
+		self.assertEqual(attendance, "Present")
+
+		frappe.set_user("calendar.user@example.com")
+		try:
+			events = get_events(start=getdate(), end=getdate())
+		finally:
+			frappe.set_user("Administrator")
+
+		self.assertTrue(events)
+		attendance_events = [e for e in events if e.get("doctype") == "Attendance"]
+		self.assertTrue(attendance_events)
+		self.assertEqual(attendance_events[0].get("status"), "Present")
+		self.assertEqual(
+			attendance_events[0].get("employee_name"),
+			frappe.db.get_value("Employee", employee, "employee_name"),
+		)
+		self.assertEqual(attendance_events[0].get("attendance_date"), getdate())
+
 	def tearDown(self):
 		frappe.db.rollback()