X-Git-Url: https://apps.delaporte.us/gitweb/matrix-goal-bot.git/blobdiff_plain/b1558c1522430ae420563c31cb67f9f65f7a375b..63ac7fdf6c0d6dc54d2631d9eee2151db1265660:/matrix_goal_bot/db.py

diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py
index e232cd9..a478533 100644
--- a/matrix_goal_bot/db.py
+++ b/matrix_goal_bot/db.py
@@ -4,9 +4,6 @@ from datetime import datetime as dt
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 
-## Todo List
-# - [ ] goal / vision / task
-
 
 DATE_FORMAT = '%Y-%m-%d'
 
@@ -15,7 +12,7 @@ def today():
 
 
 logger = logging.getLogger(__name__)
-logging.basicConfig(filename='chore.log', encoding='utf-8', level=logging.DEBUG)
+logging.basicConfig(filename='goals.log', encoding='utf-8', level=logging.DEBUG)
 
 
 class Vision(SQLModel, table=True):
@@ -36,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)
@@ -65,7 +66,7 @@ def pretty_print(goal, tasks):
 class Data():
     def __init__(self, db_file=None):
         if not db_file:
-            db_file = os.path.join(os.environ.get('MATRIX_DATA_DIR'), 'goals.db')
+            db_file = os.path.join(os.environ.get('MATRIX_DATA_DIR', ''), 'goals.db')
 
         self.file = db_file
         self.engine = self.get_engine()
@@ -95,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()
@@ -182,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
-