Merge lp:~cjwatson/launchpad-work-items-tracker/by-work-item into lp:launchpad-work-items-tracker

[Colin Watson]

=== modified file 'workitems.py'
--- workitems.py	2009-11-30 15:48:18 +0000
+++ workitems.py	2009-12-03 14:25:19 +0000
@@ -349,7 +349,8 @@
 def assignee_completion(db):
     '''Determine current by-assignee completion.
 
-    Return assignee -> [todo, done, postponed] mapping.
+    Return assignee -> [todo, done, postponed] mapping. Each of
+    todo/done/postponed is a list of [blueprint, workitem].
     '''
     data = {}
 
@@ -361,11 +362,11 @@
     index = 0
     for s in valid_states:
         cur = db.cursor()
-        cur.execute('SELECT assignee, count(workitem) FROM work_items '
-                'WHERE date=? and status=? GROUP BY assignee',
+        cur.execute('SELECT assignee, blueprint, workitem FROM work_items '
+                'WHERE date=? and status=?',
                 (last_date, s))
-        for (a, num) in cur:
-            data.setdefault(a, [0, 0, 0])[index] = num
+        for (a, bp, item) in cur:
+            data.setdefault(a, [[], [], []])[index].append([bp, item])
         index += 1
 
     return data
@@ -417,6 +418,13 @@
                 entry.get('postponed', 0))
         d += datetime.timedelta(days=1)
 
+def html_format_blueprint(bp):
+    if bp.startswith('http:') or bp.startswith('https:'):
+        url = bp
+    else:
+        url = '%s/ubuntu/+spec/%s' % (blueprints_base_url, escape(bp))
+    return '<a href="%s">%s</a>' % (url, escape(bp))
+
 def html_format_priority(priority):
     prio_colors = {
             'Undefined': 'gray',
@@ -448,6 +456,7 @@
                border-width: 3px; padding-right: 10px; }
     table td { text-align: left; border-style: none none dotted none; 
                border-width: 1px; padding-right: 10px; }
+    table#byworkitem td { vertical-align: top; }
 
     a { color: blue; }
   </style>
@@ -473,12 +482,9 @@
     completion.sort(key=lambda k: k[1], reverse=True)
 
     for (bp, percent) in completion:
-        if bp.startswith('http:') or bp.startswith('https:'):
-            url = bp
-        else:
-            url = '%s/ubuntu/+spec/%s' % (blueprints_base_url, escape(bp))
-        print '  <tr><td><a href="%s">%s</a></td> <td>%i/%i/%i</td> <td>%i%%</td> <td>%s</td> <td>%s</td></tr>' % (
-                url, escape(bp), data[bp][0], data[bp][2],
+        bp_html = html_format_blueprint(bp)
+        print '  <tr><td>%s</td> <td>%i/%i/%i</td> <td>%i%%</td> <td>%s</td> <td>%s</td></tr>' % (
+                bp_html, data[bp][0], data[bp][2],
                 data[bp][1], percent,
                 html_format_priority(data[bp][-1]),
                 escape(data[bp][-2]))
@@ -494,16 +500,58 @@
 
     completion = []
     for (a, (todo, done, postponed)) in data.iteritems():
+        todo_len = len(todo)
+        postponed_len = len(postponed)
+        done_len = len(done)
         completion.append((a,
-            int(float(postponed+done)/(todo+done+postponed)*100 + 0.5)))
+            int(float(postponed_len+done_len)/
+            (todo_len+done_len+postponed_len)*100 + 0.5)))
 
     completion.sort(key=lambda k: k[0], reverse=False)
 
     for (a, percent) in completion:
         url = '%s/~%s/+specs?role=assignee' % (blueprints_base_url, a)
         print '  <tr><td><a href="%s">%s</a></td> <td>%i/%i/%i</td> <td>%i%%</td></tr>' % (
-                url, escape(a), data[a][0], data[a][2],
-                data[a][1], percent)
+                url, escape(a), len(data[a][0]), len(data[a][2]),
+                len(data[a][1]), percent)
+    print '</table>'
+
+    print '''
+<h1>Status by work item</h1>
+<table id="byworkitem">
+  <tr><th>Assignee</th> <th>Status</th> <th>Blueprint</th> <th>Work item</th></tr>
+'''
+    # data is still assignee_completion(db), from above
+    completion = data.items()
+    completion.sort(key=lambda k: k[0], reverse=False)
+
+    for (a, (todo, done, postponed)) in completion:
+        todo.sort(key=lambda k: k[0])
+        postponed.sort(key=lambda k: k[0])
+        done.sort(key=lambda k: k[0])
+        todo_len = len(todo)
+        postponed_len = len(postponed)
+        done_len = len(done)
+        url = '%s/~%s/+specs?role=assignee' % (blueprints_base_url, a)
+        rows = ['<td rowspan="%s">todo</td>' % todo_len,
+                '<td rowspan="%s">postponed</td>' % postponed_len,
+                '<td rowspan="%s">done</td>' % done_len]
+        i = 0
+        printed_assignee = False
+        for status in (todo, postponed, done):
+            printed_status = False
+            for (bp, item) in status:
+                print '  <tr>',
+                if not printed_assignee:
+                    print '<td rowspan="%s"><a href="%s">%s</a></td> ' % (
+                        todo_len+postponed_len+done_len, url, escape(a)),
+                    printed_assignee = True
+                if not printed_status:
+                    print rows[i]
+                    printed_status = True
+                print '<td>%s</td> <td>%s</td></tr>' % (
+                    html_format_blueprint(bp), item)
+            i += 1
     print '</table>'
 
     print '</body></html>'