X-Git-Url: https://apps.delaporte.us/gitweb/matrix-goal-bot.git/blobdiff_plain/e6f3ab3452c43a5956a4ae54eb1ff3f39a27a337..63ac7fdf6c0d6dc54d2631d9eee2151db1265660:/matrix_goal_bot/db.py?ds=sidebyside diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py index 4c2d477..a478533 100644 --- a/matrix_goal_bot/db.py +++ b/matrix_goal_bot/db.py @@ -33,7 +33,11 @@ class Goal(SQLModel, table=True): tasks: list["Task"] = Relationship(back_populates="goal") vision: Vision = Relationship(back_populates="goals") def __str__(self): - return f'{self.name} (Goal {self.id})' + if not self.complete_date: + return f'{self.name} (Goal {self.id})' + else: + completed = self.complete_date.strftime(DATE_FORMAT) + return f'(Done {completed}) {self.name} (Goal {self.id})' class Task(SQLModel, table=True): id: int | None = Field(default=None, primary_key=True) @@ -92,7 +96,7 @@ class Data(): def get_done_goals(self): - '''List all goals''' + '''List completed goals''' with Session(self.engine) as session: cmd = select(Goal).where(Goal.complete_date != None) return session.exec(cmd).all() @@ -179,15 +183,3 @@ class Data(): # Someday: Notes on each - def list(self): - results = [] - with Session(self.engine) as session: - cmd = select(Chore) - chores = session.exec(cmd).all() - if(not chores): - retuls.append('None Found') - - for chore in chores: - results.append(Data.check_chore(session, chore.id)) - return results -