diff --git a/terka/domain/entities/project.py b/terka/domain/entities/project.py index 3ef5892..9abe23d 100644 --- a/terka/domain/entities/project.py +++ b/terka/domain/entities/project.py @@ -10,6 +10,7 @@ from terka.domain.entities.task import Task + class ProjectStatus(Enum): DELETED = 0 ACTIVE = 1 @@ -109,6 +110,7 @@ def deleted(self) -> int: @property def backlog_tasks(self) -> list[Task]: +<<<<<<< HEAD return self._get_tasks_by_statuses(('BACKLOG')) @property @@ -118,11 +120,26 @@ def open_tasks(self) -> list[Task]: @property def completed_tasks(self) -> list[Task]: return self._get_tasks_by_statuses(('DONE', 'DELETED')) +======= + return self._get_tasks_by_statuses(("BACKLOG")) + + @property + def open_tasks(self) -> list[Task]: + return self._get_tasks_by_statuses(("TODO", "IN_PROGRESS", "REVIEW")) + + @property + def completed_tasks(self) -> list[Task]: + return self._get_tasks_by_statuses(("DONE", "DELETED")) +>>>>>>> 3f01c2b (Add incomplete_tasks and improve printing of projects) @property def incompleted_tasks(self) -> list[Task]: return self._get_tasks_by_statuses( +<<<<<<< HEAD ('BACKLOG', 'TODO', 'IN_PROGRESS', 'REVIEW')) +======= + ("BACKLOG", "TODO", "IN_PROGRESS", "REVIEW")) +>>>>>>> 3f01c2b (Add incomplete_tasks and improve printing of projects) def _get_tasks_by_statuses(self, statuses: tuple[str]) -> list[Task]: return [task for task in self.tasks if task.status.name in statuses]