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

WIP Work on action

Browse Source 
Very restrictive - use a 'current' table
This commit is contained in:
Maxence G. de Montauzan
2018-07-11 01:14:11 +02:00
parent d74656d9fa
commit c0ece7a11c
4 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
project.py
View File

@@ -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
@@ -29,7 +30,7 @@ def handle_project(args, last_action, conn):
sys.exit(0)
if args[0].isdigit():
view_project_set_active(int(args[0]), last_action.task_id, conn)
view_project_set_active(int(args[0]), last_action, conn)
elif args[0] == '-c':
if len(args) == 1:
print('missing project name')
@@ -97,7 +98,8 @@ def create_project(project, conn):
cursor.execute(query, (getpass.getuser(), project.name, project.status, datetime.datetime.now(),))
project_id = cursor.lastrowid
action_message = '{} (status: {})'.format(project.name, project.status)
action.create_action(cursor, project_id=project_id, message=action_message)
record_action(cursor, TypeAction.CREATE, action_message, project_id=project_id)
logging.debug(action_message)
print('created project {}: {} (status: {})'.format(project_id, project.name, project.status))
@@ -127,7 +129,7 @@ def edit_project(project, project_id, conn):
print('updated project {}: ({})'.format(project_id, log_args))
# TODO Bad output
action.create_action(cursor, project_id, message = 'update ' + str(update_args))
record_action(cursor, TypeAction.UPDATE, 'update ' + str(update_args), project_id)
def delete_project(project_id, conn):
logging.info('>> Remove project')
@@ -144,6 +146,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
# TODO Cascade deleting
def list_project(active_project_id, conn):
@@ -162,7 +165,7 @@ def list_project(active_project_id, conn):
print('{:1} {:2d}: ({:8}) | {} | {} ({} tasks)'.format('*' if active_project_id == project_id else '',
project_id, username, status, name, nb_task))
def view_project_set_active(project_id, act_task_id, conn):
def view_project_set_active(project_id, last_action, conn):
# FIXME duplicate with list_project
query = """
SELECT id, username, name, status,
@@ -190,8 +193,9 @@ def view_project_set_active(project_id, act_task_id, conn):
logging.debug('Task row: {}'.format(row))
task_id, username, name, status, priority, date, time, nb_note = row
message = date + time + name
print(' {} {:d}: ({}) [{}] [{}] {} ({} tasks)'.format('*' if act_task_id == row[0] else ' ',
print(' {} {:d}: ({}) [{}] [{}] {} ({} tasks)'.format('*' if last_action.task_id == row[0] else ' ',
task_id, username, status, priority, message, nb_note))
action.create_action(cursor, project_id=project_id)
record_action(cursor, TypeAction.ACTIVE, 'set active project ' + str(project_id),
project_id, last_action.task_id, last_action.note_id)
# TODO Add a -v option to see notes?