WIP Work on action

Very restrictive - use a 'current' table

task.py

@@ -7,7 +7,8 @@ import datetime
 import logging
 import sys
 
-import action
+from action import record_action
+from action import TypeAction
 from args import get_string_arg
 from args import arg_number
 
@@ -28,7 +29,7 @@ def handle_task(args, last_action, conn):
         sys.exit(0)
 
     if args[0].isdigit():
-        view_task_set_active(arg_number(args[0]), last_action.note_id, last_action.project_id, conn)
+        view_task_set_active(arg_number(args[0]), last_action, conn)
     elif args[0] == '-c':
         if len(args) == 1:
             print('missing task name')
@@ -49,7 +50,7 @@ def handle_task(args, last_action, conn):
             task_id = int(args[1])
             parse_task_args(task, args[2:])
         else:
-            task_id = last_action.task_id
+            task_id = last_action.task_id # FIXME If no active tast - use incremental args_i
             parse_task_args(task, args[1:])
         logging.debug('Task: ({}) {}'.format(task_id, task))
 
@@ -58,9 +59,9 @@ def handle_task(args, last_action, conn):
     elif args[0] == '-d':
         # FIXME Duplicate code
         if len(args) > 1:
-            delete_task(arg_number(args[1]), conn)
+            delete_task(arg_number(args[1]),last_action.project_id, conn)
         else:
-            delete_task(last_action.task_id, conn)
+            delete_task(last_action.task_id,last_action.project_id, conn)
     elif args[0] == '-m':
         # Try another logic
         args_i = 1
@@ -88,7 +89,7 @@ def handle_task(args, last_action, conn):
 
         moving_task(task_id, last_action.project_id, arg_number(args[args_i]), conn)
     else:
-        print(f'Invalid project option: {args[0]}')
+        print(f'Invalid task option: {args[0]}')
 
         # TODO Cascade deleting
 
@@ -148,7 +149,7 @@ def create_task(task, project_id, conn):
 
     action_message = '{} ({}, project: {})'.format(task.name, log_args, project_id)
 
-    action.create_action(cursor, project_id=project_id, task_id=task_id, message=action_message)
+    record_action(cursor, TypeAction.CREATE, action_message, project_id, task_id)
     print('created task {}: {}'.format(task_id, action_message))
 
 def edit_task(task, task_id, project_id, conn):
@@ -178,7 +179,7 @@ def edit_task(task, task_id, project_id, conn):
 
     # TODO Retrieve project id ?
     logging.debug('UPDATE TASK - ACTION MESSAGE : ' + action_message)
-    action.create_action(cursor, project_id=project_id, task_id=task_id, action=action.TypeAction.UPDATE, message = action_message)
+    record_action(cursor, TypeAction.UPDATE, action_message, project_id, task_id)
 
 def moving_task(task_id, old_project_id, project_id, conn):
     logging.info('>> Moving task')
@@ -195,9 +196,9 @@ def moving_task(task_id, old_project_id, project_id, conn):
         sys.exit(1)
 
     print('moved task {}: from project {} to project {}'.format(task_id, old_project_id, project_id))
-    action.create_action(cursor, project_id=project_id, task_id=task_id) # TODO Message
+    record_action(cursor, TypeAction.MOVE, '', project_id=project_id, task_id=task_id) # TODO Message
 
-def delete_task(task_id, conn):
+def delete_task(task_id, project_id, conn):
     logging.info('>> Remove task')
 
     query = """
@@ -213,6 +214,7 @@ def delete_task(task_id, conn):
         sys.exit(1)
 
     print('deleted task {}: {}'.format(task_id, 'task_name'))
+    record_action(cursor, TypeAction.DELETE, '', project_id, None) # TODO Message
 
 def list_task(active_project_id, active_task_id, conn):
     logging.info('>> No arguments')
@@ -234,7 +236,7 @@ def list_task(active_project_id, active_task_id, conn):
         #   2: (budd) |open| |normal|              test (0 notes)
         # * 3: (budd) |open| |normal| Dec 31, 2018 tet  (0 notes)
 
-def view_task_set_active(task_id, act_note_id, project_id, conn):
+def view_task_set_active(task_id, last_action, conn):
     # FIXME duplicate with list_task / view_project_set_active
     query = """
     SELECT id, username, status, priority, name,
@@ -259,9 +261,10 @@ def view_task_set_active(task_id, act_note_id, project_id, conn):
     for row in cursor.fetchall():
         logging.debug('Note row: {}'.format(row))
         note_id, username, message = row
-        print('   {} {:d}: ({}) {}'.format('*' if act_note_id == row[0] else ' ',
+        print('   {} {:d}: ({}) {}'.format('*' if last_action.note_id == row[0] else ' ',
             note_id, username, message))
-    action.create_action(cursor, project_id=project_id, task_id=task_id)
+    record_action(cursor, TypeAction.ACTIVE, 'set active task ' + str(task_id),
+        last_action.project_id, last_action.task_id, last_action.note_id)
 
 # $ pit t 11
 # * 11: (budd) a task (project: 1, status: in progress, priority: high, date: Apr 26, 2018, time: 5:00, 2 notes)