maxenceg2m/ppit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve update project/task

Browse Source
This commit is contained in:
Maxence G. de Montauzan
2018-07-22 00:39:24 +02:00
parent b072259efb
commit f4c71d9427
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
project.py
View File

@@ -122,6 +122,7 @@ def create_project(project, conn):
def edit_project(project, project_id, conn): def edit_project(project, project_id, conn):
# FIXME Duplicate code with edit_task
logging.info(">> Edit project") logging.info(">> Edit project")
update_args = [item for item in project.__dict__.items() if item[1] is not None] update_args = [item for item in project.__dict__.items() if item[1] is not None]
@@ -137,6 +138,11 @@ def edit_project(project, project_id, conn):
logging.debug("Project update args: %s", update_args) logging.debug("Project update args: %s", update_args)
# Retrieve name if not updated
project_name = None
if "name" not in update_args[0]:
project_name = get_project_name(project_id, conn)
query = "UPDATE project SET {} WHERE id = ?" query = "UPDATE project SET {} WHERE id = ?"
query = query.format(", ".join("%s = '%s'" % (k, v) for k, v in update_args)) query = query.format(", ".join("%s = '%s'" % (k, v) for k, v in update_args))
logging.debug("update project query: %s", query) logging.debug("update project query: %s", query)
@@ -146,10 +152,15 @@ def edit_project(project, project_id, conn):
cursor.execute(query, (project_id,)) cursor.execute(query, (project_id,))
log_args = ", ".join("%s: %s" % (k, v) for k, v in update_args) log_args = ", ".join("%s: %s" % (k, v) for k, v in update_args)
print("updated project {}: ({})".format(project_id, log_args))
# TODO Print project name ?
record_action(cursor, TypeAction.UPDATE, "({})".format(log_args), project_id) if project_name:
log_message = "{} ({})".format(project_name, log_args)
else:
log_message = "({})".format(log_args)
print("updated project {}: {}".format(project_id, log_message))
record_action(cursor, TypeAction.UPDATE, log_message, project_id)
def delete_project(project_id, conn): def delete_project(project_id, conn):

14
task.py
View File

@@ -176,6 +176,7 @@ def create_task(task, project_id, conn):
def edit_task(task, task_id, conn): def edit_task(task, task_id, conn):
# FIXME Duplicate code with edit_project
logging.info(">> Edit task") logging.info(">> Edit task")
update_args = [item for item in task.__dict__.items() if item[1] is not None] update_args = [item for item in task.__dict__.items() if item[1] is not None]
@@ -207,17 +208,14 @@ def edit_task(task, task_id, conn):
log_args = ", ".join("%s: %s" % (k, v) for k, v in update_args) log_args = ", ".join("%s: %s" % (k, v) for k, v in update_args)
if task_name: if task_name:
print("updated task {}: {} ({})".format(task_id, task_name, log_args)) log_message = "{} ({})".format(task_name, log_args)
else: else:
print("updated task {}: ({})".format(task_id, log_args)) log_message = "({})".format(log_args)
print("updated task {}: {}".format(task_id, log_message))
logging.debug("UPDATE TASK - ACTION MESSAGE : %s", log_args) logging.debug("UPDATE TASK - ACTION MESSAGE : %s", log_args)
record_action( record_action(cursor, TypeAction.UPDATE, log_message, task_id=task_id)
cursor,
TypeAction.UPDATE,
"{}({})".format(task_name + " " if task_name else "", log_args),
task_id=task_id,
)
def moving_task(task_id, dest_project_id, conn): def moving_task(task_id, dest_project_id, conn):