chore: make status filter MultiSelectList

frappe · Dec 3, 2024 · 320ab82 · 320ab82
1 parent 218fc4e
commit 320ab82
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/mail_client/mail_client/report/mail_tracker/mail_tracker.js b/mail_client/mail_client/report/mail_tracker/mail_tracker.js
@@ -31,18 +31,20 @@ frappe.query_reports["Mail Tracker"] = {
 		{
 			fieldname: "status",
 			label: __("Status"),
-			fieldtype: "Select",
-			options: [
-				"",
-				"Pending",
-				"Failed",
-				"Queued",
-				"Blocked",
-				"Deferred",
-				"Bounced",
-				"Partially Sent",
-				"Sent",
-			],
+			fieldtype: "MultiSelectList",
+			get_data: (txt) => {
+				return [
+					"",
+					"Pending",
+					"Failed",
+					"Queued",
+					"Blocked",
+					"Deferred",
+					"Bounced",
+					"Partially Sent",
+					"Sent",
+				];
+			},
 		},
 		{
 			fieldname: "domain_name",

diff --git a/mail_client/mail_client/report/mail_tracker/mail_tracker.py b/mail_client/mail_client/report/mail_tracker/mail_tracker.py
@@ -122,14 +122,14 @@ def get_data(filters: dict | None = None) -> list[dict]:
 
 	for field in [
 		"name",
-		"status",
 		"message_id",
 		"tracking_id",
 	]:
 		if filters.get(field):
 			query = query.where(OM[field] == filters.get(field))
 
 	for field in [
+		"status",
 		"domain_name",
 		"sender",
 	]:

diff --git a/mail_client/mail_client/report/outbound_delay/outbound_delay.js b/mail_client/mail_client/report/outbound_delay/outbound_delay.js
@@ -31,8 +31,10 @@ frappe.query_reports["Outbound Delay"] = {
 		{
 			fieldname: "status",
 			label: __("Status"),
-			fieldtype: "Select",
-			options: ["", "Blocked", "Deferred", "Bounced", "Sent"],
+			fieldtype: "MultiSelectList",
+			get_data: (txt) => {
+				return ["", "Blocked", "Deferred", "Bounced", "Sent"];
+			},
 		},
 		{
 			fieldname: "domain_name",

diff --git a/mail_client/mail_client/report/outbound_delay/outbound_delay.py b/mail_client/mail_client/report/outbound_delay/outbound_delay.py
@@ -182,9 +182,10 @@ def get_data(filters: dict | None = None) -> list[dict]:
 		if filters.get(field):
 			query = query.where(OM[field].isin(filters.get(field)))
 
-	for field in ["status", "email"]:
-		if filters.get(field):
-			query = query.where(MR[field] == filters.get(field))
+	if filters.get("email"):
+		query = query.where(MR["email"] == filters.get("email"))
+	if filters.get("status"):
+		query = query.where(MR["status"].isin(filters.get("status")))
 
 	user = frappe.session.user
 	if not is_system_manager(user):

diff --git a/mail_client/mail_client/report/outgoing_mail_summary/outgoing_mail_summary.js b/mail_client/mail_client/report/outgoing_mail_summary/outgoing_mail_summary.js
@@ -31,8 +31,10 @@ frappe.query_reports["Outgoing Mail Summary"] = {
 		{
 			fieldname: "status",
 			label: __("Status"),
-			fieldtype: "Select",
-			options: ["", "Blocked", "Deferred", "Bounced", "Sent"],
+			fieldtype: "MultiSelectList",
+			get_data: (txt) => {
+				return ["", "Blocked", "Deferred", "Bounced", "Sent"];
+			},
 		},
 		{
 			fieldname: "domain_name",

diff --git a/mail_client/mail_client/report/outgoing_mail_summary/outgoing_mail_summary.py b/mail_client/mail_client/report/outgoing_mail_summary/outgoing_mail_summary.py
@@ -169,9 +169,10 @@ def get_data(filters: dict | None = None) -> list[dict]:
 		if filters.get(field):
 			query = query.where(OM[field].isin(filters.get(field)))
 
-	for field in ["status", "email"]:
-		if filters.get(field):
-			query = query.where(MR[field] == filters.get(field))
+	if filters.get("email"):
+		query = query.where(MR["email"] == filters.get("email"))
+	if filters.get("status"):
+		query = query.where(MR["status"].isin(filters.get("status")))
 
 	user = frappe.session.user
 	if not is_system_manager(user):