Add task list to goal print

diff --git a/goals/db.py b/goals/db.py
index 0a1d16c51bd4047aca443476292dc20068185252..fa88dc59c27ee1aa070f179e3b6d54a1899a4721 100644 (file)
--- a/goals/db.py
+++ b/goals/db.py
@@ -2,7 +2,7 @@ import logging
 import os
 from datetime import datetime as dt
 
 import os
 from datetime import datetime as dt
 

-from sqlmodel import Field, Session, SQLModel, create_engine, select, text
+from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship

 
 ## Todo List
 # - [ ] goal / vision / task
 
 ## Todo List
 # - [ ] goal / vision / task


@@ -33,6 +33,7 @@ class Goal(SQLModel, table=True):
     complete_date: dt | None = Field(default=None)
     vision_id: int | None = Field(default=None, foreign_key="vision.id")
     notes: str | None = Field(default=None)
     complete_date: dt | None = Field(default=None)
     vision_id: int | None = Field(default=None, foreign_key="vision.id")
     notes: str | None = Field(default=None)

+    tasks: list["Task"] = Relationship(back_populates="goal")

     def __str__(self):
         return f'{self.name} ({self.id})'
 
     def __str__(self):
         return f'{self.name} ({self.id})'
 


@@ -41,6 +42,9 @@ class Task(SQLModel, table=True):
     name: str = Field(default=None, unique=True)
     goal_id: int | None = Field(default=None, foreign_key="goal.id")
     complete_date: dt | None = Field(default=None)
     name: str = Field(default=None, unique=True)
     goal_id: int | None = Field(default=None, foreign_key="goal.id")
     complete_date: dt | None = Field(default=None)

+    goal: Goal = Relationship(back_populates="tasks")
+    def __str__(self):
+        return f'{self.name} ({self.id})'

 
 class Data():
     def __init__(self, db_file = DB_FILE):
 
 class Data():
     def __init__(self, db_file = DB_FILE):


@@ -71,9 +75,11 @@ class Data():
             return session.exec(cmd).all()
 
 
             return session.exec(cmd).all()
 
 

-    def print_goal(self, id, include_finished=False):
-        '''Includes tasks'''
-        pass
+    def get_goal(self, id):
+        with Session(self.engine) as session:
+            cmd = select(Goal).where(Goal.id == id)
+            goal = session.exec(cmd).first()
+            return (goal, goal.tasks)

 
     def complete_vision(self, id):
         pass
 
     def complete_vision(self, id):
         pass

diff --git a/goals/tasks.py b/goals/tasks.py
index 1a1fadc1b9136d0a05630256fee646423393487d..21ccfd785671169f30f977690055a44216cea318 100644 (file)
--- a/goals/tasks.py
+++ b/goals/tasks.py
@@ -26,8 +26,14 @@ def list(c):
 
 @task
 def print_goal(c, id):
 
 @task
 def print_goal(c, id):

-    result = Data().print_goal(id)
-    print(result)
+    goal,tasks = Data().get_goal(id)
+    print(f' ## {goal}')
+    for task in tasks:
+        if(task.complete_date):
+            print(f' - [x] {task}')
+        else:
+            print(f' - [ ] {task}')
+