feat: tasks in project template and tests

erpnext/projects/doctype/project/project.py

@@ -55,16 +55,34 @@ class Project(Document):
 
 			# create tasks from template
 			for task in template.tasks:
-				frappe.get_doc(dict(
+				template_task_details = frappe.get_doc("Task", task.task)
-					doctype = 'Task',
+				project_task = self.create_task_from_template(template_task_details)
-					subject = task.subject,
+				
-					project = self.name,
+				if template_task_details.depends_on:
-					status = 'Open',
+					for child_task in template_task_details.depends_on:
-					exp_start_date = add_days(self.expected_start_date, task.start),
+						child_task_details = frappe.get_doc("Task",child_task.task)
-					exp_end_date = add_days(self.expected_start_date, task.start + task.duration),
+						self.create_task_from_template(child_task_details, project_task)
-					description = task.description,
+
-					task_weight = task.task_weight
+	def create_task_from_template(self, task_details, project_task=None):
-				)).insert()
+		doc = frappe.get_doc(dict(
+				doctype = 'Task',
+				subject = task_details.subject,
+				project = self.name,
+				status = 'Open',
+				exp_start_date = add_days(self.expected_start_date, task_details.start),
+				exp_end_date = add_days(self.expected_start_date, task_details.start + task_details.duration),
+				description = task_details.description,
+				task_weight = task_details.task_weight,
+				type = task_details.type,
+				issue = task_details.issue,
+				is_group = task_details.is_group
+			))
+		if task_details.parent_task and project_task:
+			doc.parent_task = project_task.name
+		if not task_details.is_group:
+			doc.depends_on = task_details.depends_on
+		doc.insert()
+		return doc
 
 	def is_row_updated(self, row, existing_task_data, fields):
 		if self.get("__islocal") or not existing_task_data: return True

erpnext/projects/doctype/project/test_project.py

@@ -7,33 +7,87 @@ import frappe, unittest
 test_records = frappe.get_test_records('Project')
 test_ignore = ["Sales Order"]
 
-from erpnext.projects.doctype.project_template.test_project_template import get_project_template, make_project_template
+from erpnext.projects.doctype.project_template.test_project_template import make_project_template
 from erpnext.projects.doctype.project.project import set_project_status
-
+from erpnext.projects.doctype.task.test_task import create_task
-from frappe.utils import getdate
+from frappe.utils import getdate, nowdate, add_days
 
 class TestProject(unittest.TestCase):
-	def test_project_with_template(self):
+	def test_project_with_template_having_no_parent_and_depend_tasks(self):
-		frappe.db.sql('delete from tabTask where project = "Test Project with Template"')
+		""" 
-		frappe.delete_doc('Project', 'Test Project with Template')
+		Test Action: Basic Test of a Project created from template. The template has a single task.
+		"""
+		frappe.db.sql('delete from tabTask where project = "Test Project with Templ - no parent and dependend tasks"')
+		frappe.delete_doc('Project', 'Test Project with Templ - no parent and dependend tasks')
 
-		project = get_project('Test Project with Template')
+		if not frappe.db.exists("Task", "Test Temp Task with no parent and dependency"):
+			task1 = create_task(subject="Test Temp Task with no parent and dependency", is_template=1, begin=0, duration=3)
 
+		template = make_project_template("Test Project Template - no parent and dependend tasks", [task1])
+		project = get_project("Test Project with Templ - no parent and dependend tasks", template)
 		tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc')
 
-		task1 = tasks[0]
+		self.assertEqual(task[0].subject, 'Test Temp Task with no parent and dependency')
-		self.assertEqual(task1.subject, 'Task 1')
+		self.assertEqual(getdate(task[0].exp_end_date), add_days(nowdate() + 0 + 3))
-		self.assertEqual(task1.description, 'Task 1 description')
+		self.assertEqual(len(tasks), 1)
-		self.assertEqual(getdate(task1.exp_start_date), getdate('2019-01-01'))
-		self.assertEqual(getdate(task1.exp_end_date), getdate('2019-01-04'))
 
-		self.assertEqual(len(tasks), 4)
+	def test_project_template_having_parent_child_tasks(self):
-		task4 = tasks[3]
-		self.assertEqual(task4.subject, 'Task 4')
-		self.assertEqual(getdate(task4.exp_end_date), getdate('2019-01-06'))
 
-def get_project(name):
+		frappe.db.sql('delete from tabTask where project = "Test Project with Templ - tasks with parent-child"')
-	template = get_project_template()
+		frappe.delete_doc('Project', 'Test Project with Templ - tasks with parent-child')
+
+		if not frappe.db.exists("Task", "Test Temp Task parent"):
+			task1 = create_task(subject="Test Temp Task parent", is_group=1, is_template=1, begin=1, duration=1)
+
+		if not frappe.db.exists("Task", "Test Temp Task child 1"):
+			task2 = create_task(subject="Test Temp Task child 1", parent_task=task1.name, is_template=1, begin=1, duration=3)
+		
+		if not frappe.db.exists("Task", "Test Temp Task child 2"):
+			task3 = create_task(subject="Test Temp Task child 2", parent_task=task1.name, is_template=1, begin=2, duration=3)
+
+		template = make_project_template("Test Project Template  - tasks with parent-child", [task1, task2, task3])
+		project = get_project("Test Project with Templ - tasks with parent-child", template)
+		tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc')
+
+		self.assertEqual(task[0].subject, 'Test Temp Task parent')
+		self.assertEqual(getdate(task[0].exp_end_date), add_days(nowdate()+ 1 + 1))
+		print(task[0].depends_on)
+
+		self.assertEqual(task[1].subject, 'Test Temp Task child 1')
+		self.assertEqual(getdate(task[1].exp_end_date), add_days(nowdate()+ 1 + 3))
+		self.assertEqual(task[1].parent_task, task[0].name)
+
+		self.assertEqual(task[2].subject, 'Test Temp Task child 2')
+		self.assertEqual(getdate(task[2].exp_end_date), add_days(nowdate()+ 2 + 3))
+		self.assertEqual(task[2].parent_task, task[0].name)
+
+		self.assertEqual(len(tasks), 3)
+
+	def test_project_template_having_dependent_tasks(self):
+
+		frappe.db.sql('delete from tabTask where project = "Test Project with Templ - dependent tasks"')
+		frappe.delete_doc('Project', 'Test Project with Templ - dependent tasks')
+
+		if not frappe.db.exists("Task", "Test Temp Task for dependency"):
+			task1 = create_task(subject="Test Temp Task for dependency", is_template=1, begin=3, duration=1)
+
+		if not frappe.db.exists("Task", "Test Temp Task with dependency"):
+			task2 = create_task(subject="Test Temp Task with dependency", depends_on=task1.name, is_template=1, begin=2, duration=2)
+		
+		template = make_project_template("Test Project Template  - tasks with parent-child", [task1, task2])
+		project = get_project("Test Project with Templ - tasks with parent-child", template)
+		tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc')
+
+		self.assertEqual(task[0].subject, 'Test Temp Task for dependency')
+		self.assertEqual(getdate(task[0].exp_end_date), add_days(nowdate()+ 3 + 1))
+
+		self.assertEqual(task[1].subject, 'Test Temp Task with dependency')
+		self.assertEqual(getdate(task[1].exp_end_date), add_days(nowdate()+ 2 + 2))
+		self.assertEqual(task[1].depends_on, task[0].name)
+
+		self.assertEqual(len(tasks), 2)
+
+def get_project(name, template):
 
 	project = frappe.get_doc(dict(
 		doctype = 'Project',
@@ -49,8 +103,6 @@ def make_project(args):
 	args = frappe._dict(args)
 	if args.project_template_name:
 		template = make_project_template(args.project_template_name)
-	else:
-		template = get_project_template()
 
 	project = frappe.get_doc(dict(
 		doctype = 'Project',

erpnext/projects/doctype/project_template/test_project_template.py

@@ -5,44 +5,37 @@ from __future__ import unicode_literals
 
 import frappe
 import unittest
+from erpnext.projects.doctype.task.test_task import create_task
 
 class TestProjectTemplate(unittest.TestCase):
 	pass
 
-def get_project_template():
+def get_project_template(project_template_name="Test Project Template", project_tasks=[]):
-	if not frappe.db.exists('Project Template', 'Test Project Template'):
-		frappe.get_doc(dict(
-			doctype = 'Project Template',
-			name = 'Test Project Template',
-			tasks = [
-				dict(subject='Task 1', description='Task 1 description',
-					start=0, duration=3),
-				dict(subject='Task 2', description='Task 2 description',
-					start=0, duration=2),
-				dict(subject='Task 3', description='Task 3 description',
-					start=2, duration=4),
-				dict(subject='Task 4', description='Task 4 description',
-					start=3, duration=2),
-			]
-		)).insert()
-
-	return frappe.get_doc('Project Template', 'Test Project Template')
-
-def make_project_template(project_template_name, project_tasks=[]):
 	if not frappe.db.exists('Project Template', project_template_name):
 		frappe.get_doc(dict(
 			doctype = 'Project Template',
 			name = project_template_name,
 			tasks = project_tasks or [
-				dict(subject='Task 1', description='Task 1 description',
+				create_task(subject="_Test Template Task 1", is_template=1, begin=0, duration=3),
-					start=0, duration=3),
+				create_task(subject="_Test Template Task 2", is_template=1, begin=0, duration=2),
-				dict(subject='Task 2', description='Task 2 description',
+				create_task(subject="_Test Template Task 3", is_template=1, begin=2, duration=4),
-					start=0, duration=2),
+				create_task(subject="_Test Template Task 4", is_template=1, begin=3, duration=2),
-				dict(subject='Task 3', description='Task 3 description',
-					start=2, duration=4),
-				dict(subject='Task 4', description='Task 4 description',
-					start=3, duration=2),
 			]
 		)).insert()
 
+	return frappe.get_doc('Project Template', project_template_name)
+
+def make_project_template(project_template_name, project_tasks=[]):
+	if not frappe.db.exists('Project Template', project_template_name):
+		doc = frappe.get_doc(dict(
+			doctype = 'Project Template',
+			name = project_template_name,
+			tasks = project_tasks or [
+				create_task(subject="_Test Template Task 1", is_template=1, begin=0, duration=3),
+				create_task(subject="_Test Template Task 2", is_template=1, begin=0, duration=2),
+			]
+		))
+		print("doc",doc.tasks)
+		doc.insert()
+
 	return frappe.get_doc('Project Template', project_template_name)

erpnext/projects/doctype/task/test_task.py

@@ -97,7 +97,7 @@ class TestTask(unittest.TestCase):
 
 		self.assertEqual(frappe.db.get_value("Task", task.name, "status"), "Overdue")
 
-def create_task(subject, start=None, end=None, depends_on=None, project=None, save=True):
+def create_task(subject, start=None, end=None, depends_on=None, project=None, parent_task=None, is_group=0, is_template=0, begin=0, duration=0, save=True):
 	if not frappe.db.exists("Task", subject):
 		task = frappe.new_doc('Task')
 		task.status = "Open"
@@ -105,6 +105,10 @@ def create_task(subject, start=None, end=None, depends_on=None, project=None, sa
 		task.exp_start_date = start or nowdate()
 		task.exp_end_date = end or nowdate()
 		task.project = project or "_Test Project"
+		task.is_template = is_template,
+		task.start = begin
+		task.duration = duration,
+		task.is_group = is_group
 		if save:
 			task.save()
 	else: