Fixup

diff --git a/goals/db.py b/goals/db.py
index 84369e2788fc2cf729c8b52321ed1aac82c24032..0a1d16c51bd4047aca443476292dc20068185252 100644 (file)
--- a/goals/db.py
+++ b/goals/db.py
@@ -66,7 +66,10 @@ class Data():
 
     def list_goals(self):
         '''List all goals'''
-        pass
+        with Session(self.engine) as session:
+            cmd = select(Goal).where(Goal.complete_date == None)
+            return session.exec(cmd).all()
+
 
     def print_goal(self, id, include_finished=False):
         '''Includes tasks'''
@@ -96,10 +99,11 @@ class Data():
     def add_goal(self, name):
         return self.add_with_name(Goal, name)
 
-    def add_task(self, name, goal_id):
+    def add_task(self, goal_id, name):
         result = self.add_with_name(Task, name)
         with Session(self.engine) as session:
-            new = select(Task).where(Task.name == name).first()
+            cmd = select(Task).where(Task.name == name)
+            new = session.exec(cmd).first()
             new.goal_id = goal_id
             session.commit()
         return result
@@ -107,7 +111,8 @@ class Data():
     def assign_vision(self, goal_id, vision_id):
         '''Goals may move between visions'''
         with Session(self.engine) as session:
-            new = select(Goal).where(Goal.id == goal_id).first()
+            cmd = select(Goal).where(Goal.id == goal_id)
+            new = session.exec(cmd).first()
             new.vision_id = vision_id
             session.commit()
 

diff --git a/goals/tasks.py b/goals/tasks.py
index 7ecdcbbf48952d5135b435f3c9d60cd13cf7f27e..1a1fadc1b9136d0a05630256fee646423393487d 100644 (file)
--- a/goals/tasks.py
+++ b/goals/tasks.py
@@ -13,10 +13,17 @@ def add_goal(c, name):
     print(result)
 
 @task
-def list(c):
-    result = Data().list_goals()
+def add_task(c, goal_id, name):
+    result = Data().add_task(goal_id=goal_id, name=name)
     print(result)
 
+
+@task
+def list(c):
+    goals = Data().list_goals()
+    for goal in goals:
+        print(goal)
+
 @task
 def print_goal(c, id):
     result = Data().print_goal(id)