Merge branch 'master' into search

ui.py

@@ -10,6 +10,7 @@ palette = [
     ('selected', 'standout', ''),
     ('selected workspace', 'standout,bold', ''),
     ('header', 'bold,light green', ''),
+    ('secondary', 'light gray', ''),
     ('task', 'light green', ''),
     ('section', 'white', 'dark green'),
     ('workspace', 'white', 'dark blue'),
@@ -48,6 +49,11 @@ class PagerButton(urwid.Button):
         super(PagerButton, self).__init__(('pager', 'load more'))
         urwid.connect_signal(self, 'click', loadPage)
 
+class TypeAheadButton(urwid.Button):
+    def __init__(self, item, onClick):
+        super(TypeAheadButton, self).__init__(item['name'])
+        urwid.connect_signal(self, 'click', onClick, item)
+
 class ProjectIcon(urwid.SelectableIcon):
     def __init__(self, project, onClick):
         self.project = project
@@ -210,13 +216,71 @@ class TaskEdit(urwid.Edit):
 class CommentEdit(urwid.Edit):
     def __init__(self, task):
         self.task = task
-        super(CommentEdit, self).__init__('Add a comment:\n')
+        super(CommentEdit, self).__init__(('secondary', u'Add a comment:\n'))
 
     def keypress(self, size, key):
         if key != 'enter':
             return super(CommentEdit, self).keypress(size, key)
         urwid.emit_signal(self, 'comment', self.task['id'], self.edit_text)
 
+class TaskNameEdit(urwid.Edit):
+    def __init__(self, task):
+        self.task = task
+        super(TaskNameEdit, self).__init__(('secondary',
+                                            u'#' + str(task['id']) + ' '),
+                                           task['name'])
+
+    def keypress(self, size, key):
+        if key in ('enter', 'esc', 'up', 'down'):
+            if (self.edit_text != self.task['name']):
+                urwid.emit_signal(self, 'updatetask', self.task['id'],
+                                  self.edit_text)
+        return super(TaskNameEdit, self).keypress(size, key)
+
+class DescriptionEdit(urwid.Edit):
+    def __init__(self, task):
+        self.task = task
+        super(DescriptionEdit, self).__init__(('secondary', u'Description:\n'),
+                                              task['notes'],
+                                              multiline=True)
+
+    def keypress(self, size, key):
+        if key != 'esc':
+            return super(DescriptionEdit, self).keypress(size, key)
+        urwid.emit_signal(self, 'updatedescription', self.task['id'],
+                          self.edit_text)
+
+class AssigneeTypeAhead(urwid.Pile):
+    def __init__(self, task):
+        self.task = task
+
+        if task['assignee'] != None:
+            assignee = task['assignee']['name']
+        else:
+            assignee = ""
+
+        self.edit = urwid.Edit('Assignee: ', assignee)
+        urwid.connect_signal(self.edit, 'change', self.typeAhead)
+
+        body = [('pack', self.edit)]
+
+        super(AssigneeTypeAhead, self).__init__(body)
+
+    def typeAhead(self, widget, text):
+        urwid.emit_signal(self, 'usertypeahead', text, self.updateTypeAhead)
+
+    def updateTypeAhead(self, users):
+        users = [(TypeAheadButton(u, self.assign), ('pack', None)) for u in users]
+
+        users.insert(0, self.contents[0])
+
+        self.contents = users
+
+    def assign(self, widget, user):
+        urwid.emit_signal(self, 'assigntask', self.task['id'], user['id'])
+        self.contents = [self.contents[0]]
+        self.edit.set_edit_text(user['name'])
+
 class TaskDetails(urwid.Pile):
     def __init__(self, task, stories):
         self.task = task
@@ -225,23 +289,29 @@ class TaskDetails(urwid.Pile):
         comment_edit = CommentEdit(task)
         urwid.connect_signal(comment_edit, 'comment', self.comment)
 
+        self.description_edit = DescriptionEdit(task)
+        urwid.connect_signal(self.description_edit, 'updatedescription',
+                             self.updateDescription)
+        
+        task_name_edit = TaskNameEdit(task)
+        urwid.connect_signal(task_name_edit, 'updatetask', self.updateTask)
+
+        assignee_type_ahead = AssigneeTypeAhead(task)
+        urwid.connect_signal(assignee_type_ahead, 'usertypeahead',
+                             self.userTypeAhead)
+        urwid.connect_signal(assignee_type_ahead, 'assigntask', self.assignTask)
+
         projects = [('pack', ProjectIcon(project, self.loadProject))
                     for project in task['projects']]
 
-        if task['assignee']:
-            assignee = urwid.Text('Assigned to: ' + task['assignee']['name'])
-        else:
-            assignee = urwid.Text('(not assigned)')
-
-
         body = projects + \
             [
                 ('pack', urwid.Divider('=')),
-                ('pack', urwid.Text(('header', task['name'] + \
-                                     " #" + str(task['id'])))),
-                ('pack', assignee),
+                ('pack', task_name_edit),
+                ('pack', assignee_type_ahead),
+                ('pack', urwid.Divider('-')),
+                ('pack', self.description_edit),
                 ('pack', urwid.Divider('-')),
-                ('pack', urwid.Text(task['notes'])),
             ] + \
             [('pack', urwid.Text('[' + story['created_by']['name'] + '] ' + \
                         story['text'])) for story in stories] + \
@@ -251,8 +321,30 @@ class TaskDetails(urwid.Pile):
 
         super(TaskDetails, self).__init__(body)
 
+    def keypress(self, size, key):
+        key = super(TaskDetails, self).keypress(size, key)
+
+        if self.focus != self.description_edit and \
+           self.description_edit.edit_text != self.task['notes']:
+            self.updateDescription(self.task['id'],
+                                   self.description_edit.edit_text)
+
+        return key
+
     def comment(self, task_id, comment):
         urwid.emit_signal(self, 'comment', task_id, comment)
 
+    def updateDescription(self, task_id, description):
+        urwid.emit_signal(self, 'updatedescription', task_id, description)
+
+    def updateTask(self, task_id, name):
+        urwid.emit_signal(self, 'updatetask', task_id, name)
+
     def loadProject(self, project_id):
         urwid.emit_signal(self, 'loadproject', project_id)
+
+    def userTypeAhead(self, text, callback):
+        urwid.emit_signal(self, 'usertypeahead', text, callback)
+
+    def assignTask(self, task_id, user_id):
+        urwid.emit_signal(self, 'assigntask', task_id, user_id)