From 56893ed37334c8e634ec0214519c23fe7f935b49 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 27 May 2020 06:23:06 +0000
Subject: [PATCH]  refactor: project summary report  (#21953)

* feat: added more filters

* feat: show only first 30 projects in chart

* fix: status completed

* refactor: allow empty option in status filter
---
 .../report/project_summary/project_summary.js | 21 ++++++++++++++++++-
 .../report/project_summary/project_summary.py | 17 ++++++++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/erpnext/projects/report/project_summary/project_summary.js b/erpnext/projects/report/project_summary/project_summary.js
index c12a83ee9e..414b7b206a 100644
--- a/erpnext/projects/report/project_summary/project_summary.js
+++ b/erpnext/projects/report/project_summary/project_summary.js
@@ -12,12 +12,31 @@ frappe.query_reports["Project Summary"] = {
 			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
+		{
+			"fieldname": "is_active",
+			"label": __("Is Active"),
+			"fieldtype": "Select",
+			"options": "\nYes\nNo",
+			"default": "Yes",
+		},
 		{
 			"fieldname": "status",
 			"label": __("Status"),
 			"fieldtype": "Select",
-			"options": "Open\nCompleted\nCancelled",
+			"options": "\nOpen\nCompleted\nCancelled",
 			"default": "Open"
+		},
+		{
+			"fieldname": "project_type",
+			"label": __("Project Type"),
+			"fieldtype": "Link",
+			"options": "Project Type"
+		},
+		{
+			"fieldname": "priority",
+			"label": __("Priority"),
+			"fieldtype": "Select",
+			"options": "\nLow\nMedium\nHigh"
 		}
 	]
 };
diff --git a/erpnext/projects/report/project_summary/project_summary.py b/erpnext/projects/report/project_summary/project_summary.py
index a20d7f25a3..ea7f1ab2e7 100644
--- a/erpnext/projects/report/project_summary/project_summary.py
+++ b/erpnext/projects/report/project_summary/project_summary.py
@@ -9,7 +9,7 @@ def execute(filters=None):
 	columns = get_columns()
 	data = []
 
-	data = frappe.db.get_all("Project", filters=filters, fields=["name", 'status', "percent_complete", "expected_start_date", "expected_end_date"], order_by="expected_end_date")
+	data = frappe.db.get_all("Project", filters=filters, fields=["name", 'status', "percent_complete", "expected_start_date", "expected_end_date", "project_type"], order_by="expected_end_date")
 
 	for project in data:
 		project["total_tasks"] = frappe.db.count("Task", filters={"project": project.name})
@@ -30,6 +30,13 @@ def get_columns():
 			"options": "Project",
 			"width": 200
 		},
+		{
+			"fieldname": "project_type",
+			"label": _("Type"),
+			"fieldtype": "Link",
+			"options": "Project Type",
+			"width": 120
+		},
 		{
 			"fieldname": "status",
 			"label": _("Status"),
@@ -88,19 +95,19 @@ def get_chart_data(data):
 
 	return {
 		"data": {
-			'labels': labels,
+			'labels': labels[:30],
 			'datasets': [
 				{
 					"name": "Overdue",
-					"values": overdue
+					"values": overdue[:30]
 				},
 				{
 					"name": "Completed",
-					"values": completed
+					"values": completed[:30]
 				},
 				{
 					"name": "Total Tasks",
-					"values": total
+					"values": total[:30]
 				},
 			]
 		},