Tasks can be created and edited from the task list

This commit is contained in:
2015-07-20 00:53:32 -07:00
parent c4c2970a04
commit 54c0d3016d
2 changed files with 68 additions and 17 deletions

View File

@@ -1,3 +1,5 @@
#!/usr/bin/env python
# -*- coding: latin-1 -*-
import os import os
import json import json
@@ -16,7 +18,6 @@ class CmdAsana:
def myWorkspaces(self): def myWorkspaces(self):
return self.me['workspaces'] return self.me['workspaces']
def allMyTasks(self, workspace_id): def allMyTasks(self, workspace_id):
return self.client.tasks.find_all(params={ return self.client.tasks.find_all(params={
'assignee': self.me['id'], 'assignee': self.me['id'],
@@ -26,21 +27,27 @@ class CmdAsana:
def completeTask(self, task_id): def completeTask(self, task_id):
self.client.tasks.update(task_id, completed=True) self.client.tasks.update(task_id, completed=True)
self.refreshTaskList()
def newTask(self): pass def newTask(self):
task = self.client.tasks.create_in_workspace(self.workspace_id,
def deleteTask(self): pass assignee=self.me['id'])
task_list,_ = self.frame.contents[1]
task_list.insertNewTask(task)
def updateTask(self, task_id, name):
self.client.tasks.update(task_id, name=name)
def showDetails(self, task_id): pass def showDetails(self, task_id): pass
def replaceBody(self, widget): def replaceBody(self, widget):
self.frame.contents.pop() old_widget,_ = self.frame.contents.pop()
if old_widget != None:
self.clearSignals(old_widget)
self.frame.contents.append((widget, self.frame.options())) self.frame.contents.append((widget, self.frame.options()))
def showWorkspace(self, workspace_id): def showWorkspace(self, workspace_id):
task_list = ui.TaskList(self.allMyTasks(workspace_id)) task_list = ui.TaskList(self.allMyTasks(workspace_id))
urwid.connect_signal(task_list, 'complete', self.completeTask) self.connectTaskListSignals(task_list)
self.replaceBody(task_list) self.replaceBody(task_list)
self.workspace_id = workspace_id self.workspace_id = workspace_id
@@ -48,15 +55,32 @@ class CmdAsana:
self.showWorkspace(self.workspace_id) self.showWorkspace(self.workspace_id)
def registerSignals(self): def registerSignals(self):
urwid.register_signal(ui.TaskList, 'complete') urwid.register_signal(ui.TaskList,
urwid.register_signal(ui.TaskEdit, 'complete') ['complete',
'newtask',
'updatetask'])
urwid.register_signal(ui.TaskEdit,
['complete',
'newtask',
'updatetask'])
urwid.register_signal(ui.WorkspaceMenu, 'click') urwid.register_signal(ui.WorkspaceMenu, 'click')
def clearSignals(self, widget):
urwid.disconnect_signal(widget, 'complete', self.completeTask)
urwid.disconnect_signal(widget, 'newtask', self.newTask)
urwid.disconnect_signal(widget, 'updatetask', self.updateTask)
def connectTaskListSignals(self, task_list):
urwid.connect_signal(task_list, 'complete', self.completeTask)
urwid.connect_signal(task_list, 'newtask', self.newTask)
urwid.connect_signal(task_list, 'updatetask', self.updateTask)
def handleInput(self, key): def handleInput(self, key):
if key in ('q', 'Q'): if key in ('q', 'Q'):
raise urwid.ExitMainLoop() raise urwid.ExitMainLoop()
def render(self): def render(self):
urwid.set_encoding("UTF-8")
self.registerSignals() self.registerSignals()
workspace_menu = ui.WorkspaceMenu(self.myWorkspaces()) workspace_menu = ui.WorkspaceMenu(self.myWorkspaces())

41
ui.py
View File

@@ -1,3 +1,4 @@
# -*- coding: latin-1 -*-
import urwid import urwid
# TaskEdit modes # TaskEdit modes
@@ -47,13 +48,32 @@ class TaskList(urwid.ListBox):
body = urwid.SimpleFocusListWalker([]) body = urwid.SimpleFocusListWalker([])
for task_widget,_ in task_widgets.contents: for task_widget,_ in task_widgets.contents:
urwid.connect_signal(task_widget, 'complete', self.completeTask) urwid.connect_signal(task_widget, 'complete', self.completeTask)
urwid.connect_signal(task_widget, 'newtask', self.newTask)
urwid.connect_signal(task_widget, 'updatetask', self.updateTask)
body.append(urwid.AttrMap(task_widget, None, focus_map='selected')) body.append(urwid.AttrMap(task_widget, None, focus_map='selected'))
super(TaskList, self).__init__(body) super(TaskList, self).__init__(body)
def insertNewTask(self, task):
task_widget = TaskEdit(task, mode=EDIT)
urwid.connect_signal(task_widget, 'complete', self.completeTask)
urwid.connect_signal(task_widget, 'newtask', self.newTask)
urwid.connect_signal(task_widget, 'updatetask', self.updateTask)
index = self.focus_position + 1
self.body.insert(index,
urwid.AttrMap(task_widget, None, focus_map='selected'))
self.focus_position += 1
def completeTask(self, task_id): def completeTask(self, task_id):
urwid.emit_signal(self, 'complete', task_id) urwid.emit_signal(self, 'complete', task_id)
def newTask(self):
urwid.emit_signal(self, 'newtask')
def updateTask(self, task_id, name):
urwid.emit_signal(self, 'updatetask', task_id, name)
def keypress(self, size, key): def keypress(self, size, key):
# The ListBox will handle scrolling for us, so we trick it into thinking # The ListBox will handle scrolling for us, so we trick it into thinking
# it's being passed arrow keys # it's being passed arrow keys
@@ -70,11 +90,11 @@ class TaskList(urwid.ListBox):
return key return key
class TaskEdit(urwid.Edit): class TaskEdit(urwid.Edit):
mode = LIST completed = False
def __init__(self, task): def __init__(self, task, mode=LIST):
self.task = task self.task = task
self.mode = mode
super(TaskEdit, self).__init__(task["name"]) super(TaskEdit, self).__init__(task["name"])
def keypress(self, size, key): def keypress(self, size, key):
if self.mode == EDIT: if self.mode == EDIT:
@@ -84,18 +104,25 @@ class TaskEdit(urwid.Edit):
self.mode = LIST self.mode = LIST
self.set_caption(self.edit_text) self.set_caption(self.edit_text)
self.set_edit_text('') self.set_edit_text('')
urwid.emit_signal(self, 'updatetask', self.task['id'],
self.caption)
if key != 'esc': if key != 'esc':
return key return key
else:
return key
else: else:
if key == 'i': if key == 'i':
if self.completed:
return
self.mode = EDIT self.mode = EDIT
self.set_edit_text(self.caption) self.set_edit_text(self.caption)
self.set_caption('') self.set_caption('')
elif key == 'tab':
if not self.completed:
urwid.emit_signal(self, 'complete', self.task['id'])
self.set_caption(u'[done] ' + self.caption)
self.completed = True
elif key == 'enter': elif key == 'enter':
urwid.emit_signal(self, 'complete', self.task['id']) urwid.emit_signal(self, 'newtask')
elif key in ('l', 'tab'): elif key == 'l':
pass pass
else: else:
return key return key