Skip to content

Commit aa6f00c

Browse files
KanchanChauhannabinhait
authored andcommitted
Added default 'All' option to filters to differentiate all and empty filter
1 parent d681c88 commit aa6f00c

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ frappe.ui.form.on("Employee Attendance Tool", {
44
},
55

66
onload: function(frm) {
7+
frm.doc.department = frm.doc.branch = frm.doc.company = "All";
78
frm.set_value("date", get_today());
89
erpnext.employee_attendance_tool.load_employees(frm);
910
},

erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,18 @@ class EmployeeAttendanceTool(Document):
1313

1414

1515
@frappe.whitelist()
16-
def get_employees(date, department=None, branch=None, company=None):
16+
def get_employees(date, department = None, branch = None, company = None):
1717
attendance_not_marked = []
1818
attendance_marked = []
19-
employee_list = frappe.get_list("Employee", fields=["employee", "employee_name"], filters={
20-
"status": "Active", "department": department, "branch": branch, "company": company}, order_by="employee_name")
19+
filters = {"status": "Active"}
20+
if department != "All":
21+
filters["department"] = department
22+
if branch != "All":
23+
filters["branch"] = branch
24+
if company != "All":
25+
filters["company"] = company
26+
27+
employee_list = frappe.get_list("Employee", fields=["employee", "employee_name"], filters=filters, order_by="employee_name")
2128
marked_employee = {}
2229
for emp in frappe.get_list("Attendance", fields=["employee", "status"],
2330
filters={"attendance_date": date}):

0 commit comments

Comments
 (0)