fix(Leave Application): misleading draft state indicator (#1085) (#1088)

* fix: misleading drafted state indicator * fix: standard draft indicator color --------- Co-authored-by: Rucha Mahabal <[email protected]> (cherry picked from commit 79d5504) Co-authored-by: Akash Tom <[email protected]>
frappe · Nov 21, 2023 · 72406ae · 72406ae
1 parent ec5c6ee
commit 72406ae
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/hrms/hr/doctype/leave_application/leave_application_list.js b/hrms/hr/doctype/leave_application/leave_application_list.js
@@ -1,14 +1,26 @@
 frappe.listview_settings["Leave Application"] = {
-	add_fields: ["leave_type", "employee", "employee_name", "total_leave_days", "from_date", "to_date"],
+	add_fields: [
+		"leave_type",
+		"employee",
+		"employee_name",
+		"total_leave_days",
+		"from_date",
+		"to_date",
+	],
 	has_indicator_for_draft: 1,
 	get_indicator: function (doc) {
-		let status_color = {
-			"Approved": "green",
-			"Rejected": "red",
-			"Open": "orange",
-			"Cancelled": "red",
-			"Submitted": "blue"
+		const status_color = {
+			Approved: "green",
+			Rejected: "red",
+			Open: "orange",
+			Draft: "red",
+			Cancelled: "red",
+			Submitted: "blue",
 		};
-		return [__(doc.status), status_color[doc.status], "status,=," + doc.status];
-	}
+		const status =
+			!doc.docstatus && ["Approved", "Rejected"].includes(doc.status)
+				? "Draft"
+				: doc.status;
+		return [__(status), status_color[status], "status,=," + doc.status];
+	},
 };