Normalize action message
This commit is contained in:
@@ -56,7 +56,10 @@ def handle_action(args, last_action, conn):
|
||||
object_type = 'note'
|
||||
id_object = note_id
|
||||
|
||||
print('{} ({}): {} {} {}: {}'.format(formated_date, username, taction, object_type, id_object, message))
|
||||
if taction == TypeAction.DELETE.value:
|
||||
print('{} ({}): {} {} {}'.format(formated_date, username, taction, object_type, id_object))
|
||||
else:
|
||||
print('{} ({}): {} {} {}: {}'.format(formated_date, username, taction, object_type, id_object, message))
|
||||
|
||||
|
||||
# print('Sep 02, 2017 02:33 (dakota ): updated task 1: Passage à Angular 4 (status: in progress)')
|
||||
|
||||
2
note.py
2
note.py
@@ -113,7 +113,7 @@ def delete_note(note_id, conn):
|
||||
print('could not find note {}'.format(note_id))
|
||||
sys.exit(1)
|
||||
|
||||
record_action(cursor, TypeAction.DELETE, 'delete note')
|
||||
record_action(cursor, TypeAction.DELETE, '', note_id=note_id)
|
||||
|
||||
print('deleted note {}: {}'.format(note_id, 'note_name'))
|
||||
|
||||
|
||||
@@ -128,9 +128,9 @@ def edit_project(project, project_id, conn):
|
||||
|
||||
log_args = ', '.join("%s: %s" % (k, v) for k, v in update_args)
|
||||
print('updated project {}: ({})'.format(project_id, log_args))
|
||||
# TODO Bad output
|
||||
# TODO Print project name ?
|
||||
|
||||
record_action(cursor, TypeAction.UPDATE, 'update ' + str(update_args), project_id)
|
||||
record_action(cursor, TypeAction.UPDATE, '({})'.format(log_args), project_id)
|
||||
|
||||
def delete_project(project_id, conn):
|
||||
logging.info('>> Remove project')
|
||||
@@ -147,7 +147,7 @@ def delete_project(project_id, conn):
|
||||
print('could not find project {}'.format(project_id))
|
||||
|
||||
print('deleted project {}: {}'.format(project_id, 'project_name'))
|
||||
record_action(cursor, TypeAction.DELETE, 'delete', None) # TODO Message
|
||||
record_action(cursor, TypeAction.DELETE, '', project_id)
|
||||
# TODO Cascade deleting
|
||||
|
||||
def list_project(active_project_id, conn):
|
||||
|
||||
16
task.py
16
task.py
@@ -174,13 +174,12 @@ def edit_task(task, task_id, project_id, conn):
|
||||
logging.debug('Do a task update')
|
||||
cursor.execute(query, (task_id,))
|
||||
log_args = ', '.join("%s: %s" % (k, v) for k, v in update_args)
|
||||
action_message = '{} ({})'.format(task_id, ', '.join("%s: %s" % (k, v) for k, v in update_args))
|
||||
# TODO Review action message (at the end)
|
||||
# TODO Print task name ?
|
||||
print('updated task {}: ({})'.format(task_id, log_args))
|
||||
|
||||
# TODO Retrieve project id ?
|
||||
logging.debug('UPDATE TASK - ACTION MESSAGE : ' + action_message)
|
||||
record_action(cursor, TypeAction.UPDATE, action_message, project_id, task_id)
|
||||
# TODO Remove project id ?
|
||||
logging.debug('UPDATE TASK - ACTION MESSAGE : ' + log_args)
|
||||
record_action(cursor, TypeAction.UPDATE, '({})'.format(log_args), project_id, task_id)
|
||||
|
||||
def moving_task(task_id, old_project_id, project_id, conn):
|
||||
logging.info('>> Moving task')
|
||||
@@ -215,7 +214,8 @@ def delete_task(task_id, project_id, conn):
|
||||
sys.exit(1)
|
||||
|
||||
print('deleted task {}: {}'.format(task_id, 'task_name'))
|
||||
record_action(cursor, TypeAction.DELETE, '', project_id, None) # TODO Message
|
||||
record_action(cursor, TypeAction.DELETE, '', project_id, task_id) # TODO Message
|
||||
# TODO Cascade deleting
|
||||
|
||||
def list_task(active_project_id, active_task_id, conn):
|
||||
logging.info('>> No arguments')
|
||||
@@ -232,10 +232,6 @@ def list_task(active_project_id, active_task_id, conn):
|
||||
task_id, username, status, priority, name, nb_note = row
|
||||
print('{:1} {:2d}: ({:8}) | {} | {} | {} ({} notes)'.format('*' if active_task_id == task_id else '', task_id,
|
||||
username, status, priority, name, nb_note))
|
||||
# TODO Note
|
||||
|
||||
# 2: (budd) |open| |normal| test (0 notes)
|
||||
# * 3: (budd) |open| |normal| Dec 31, 2018 tet (0 notes)
|
||||
|
||||
def view_task_set_active(task_id, last_action, conn):
|
||||
# FIXME duplicate with list_task / view_project_set_active
|
||||
|
||||
Reference in New Issue
Block a user