From: Edward Delaporte Date: Mon, 23 Mar 2026 13:32:20 +0000 (-0500) Subject: Add task list to goal print X-Git-Url: https://apps.delaporte.us/gitweb/matrix-goal-bot.git/commitdiff_plain/d9963fa251c1068be30ed1307fe8d8531e618f20?hp=3fbc817001f4e0bd0590b2bf3509e4bfc286919f Add task list to goal print --- diff --git a/goals/db.py b/goals/db.py index 0a1d16c..fa88dc5 100644 --- a/goals/db.py +++ b/goals/db.py @@ -2,7 +2,7 @@ import logging 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 @@ -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) + tasks: list["Task"] = Relationship(back_populates="goal") 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) + goal: Goal = Relationship(back_populates="tasks") + def __str__(self): + return f'{self.name} ({self.id})' class Data(): def __init__(self, db_file = DB_FILE): @@ -71,9 +75,11 @@ class Data(): 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 diff --git a/goals/tasks.py b/goals/tasks.py index 1a1fadc..21ccfd7 100644 --- a/goals/tasks.py +++ b/goals/tasks.py @@ -26,8 +26,14 @@ def list(c): @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}') +