Merge lp:~mabac/launchpad-work-items-tracker/linaro-roadmap-add-priority into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Mattias Backman]

Hi,

This branch adds roadmap card priority, size and some other information to the card view.

Thanks,

Mattias

[James Westby (james-w)]

review: Approve

=== modified file 'collect_roadmap'
--- collect_roadmap	2011-10-12 13:19:59 +0000
+++ collect_roadmap	2011-10-19 15:16:57 +0000
@@ -94,19 +94,29 @@
                 break
         if task_status is not None:
             card_type_id = task['task']['card_type_id']
+            card_type_name = None
             for card_type in card_types:
-                if (card_type['id'] == card_type_id and
-                    card_type['name'] in types_to_ignore):
-                    dbg("Ignoring card '%s' since it\'s type is '%s'." %  \
-                            (task['task']['name'], card_type['name']))
+                if card_type['id'] == card_type_id:
+                    card_type_name = card_type['name']
                     break
             else:
+                dbg("Cannot find type for card '%s'." % (task['task']['name']))
+            if card_type_name in types_to_ignore:
+                dbg("Ignoring card '%s' since it\'s type is '%s'." %  \
+                        (task['task']['name'], card_type['name']))
+            else:
                 lane_id = task_status['parent_id']
                 assert lane_id is not None
                 model_card = Card(unicode_or_None(task['task']['name']),
                                   task['task']['id'], lane_id,
                                   unicode_or_None(task['task']['external_id']))
                 model_card.status = unicode_or_None(task_status['name'])
+                model_card.team = unicode_or_None(card_type_name)
+                model_card.priority = u"%s" % task['task']['priority']
+                model_card.size = unicode_or_None(task['task']['size_estimate'])
+                model_card.sponsor = unicode_or_None(task['task']['custom_field_1'])
+                model_card.description = u"description"
+                model_card.acceptance_criteria = u"acceptance criteria"
                 collector.store_card(model_card)
         else:
             dbg("Task '%s' does not have a status." % task['task']['name'])

=== modified file 'html-report'
--- html-report	2011-10-03 14:51:06 +0000
+++ html-report	2011-10-19 15:16:57 +0000
@@ -502,14 +502,10 @@
         blueprints = report_tools.card_blueprints(store, card.roadmap_id)
 
         data.update(dict(page_type="roadmap_card"))
-        data.update(dict(card=title))
-        data.update(dict(status=card.status))
+        data.update(dict(card_title=title))
+        data.update(dict(card=card))
         data.update(dict(lane=lane.name))
         data.update(dict(blueprints=blueprints))
-        data.update(dict(description=""))
-        data.update(dict(acceptance_criteria=""))
-        data.update(dict(sponsor_name=""))
-        data.update(dict(contact_name=""))
 
         print report_tools.fill_template(
             "roadmap_card.html", data, theme=opts.theme)

=== modified file 'lpworkitems/database.py'
--- lpworkitems/database.py	2011-10-03 14:18:00 +0000
+++ lpworkitems/database.py	2011-10-19 15:16:57 +0000
@@ -7,7 +7,7 @@
     store.execute('''CREATE TABLE version (
         db_layout_ref INT NOT NULL
         )''')
-    store.execute('''INSERT INTO version VALUES (12)''')
+    store.execute('''INSERT INTO version VALUES (13)''')
 
     store.execute('''CREATE TABLE specs (
         name VARCHAR(255) PRIMARY KEY,
@@ -100,6 +100,13 @@
         name VARCHAR(200) NOT NULL,
         card_id NOT NULL,
         status VARCHAR(50),
+        team VARCHAR(50),
+        priority VARCHAR(50),
+        size VARCHAR(50),
+        sponsor VARCHAR(50),
+        contact VARCHAR(50),
+        description BLOB,
+        acceptance_criteria BLOB,
         roadmap_id VARCHAR(50),
         lane_id REFERENCES lane(lane_id)
         )''')
@@ -209,6 +216,16 @@
     if ver == 11:
         store.execute('ALTER TABLE card ADD COLUMN roadmap_id VARCHAR(50)')
         store.execute('UPDATE version SET db_layout_ref = 12')
+        ver = 12
+    if ver == 12:
+        store.execute('ALTER TABLE card ADD COLUMN team VARCHAR(50)')
+        store.execute('ALTER TABLE card ADD COLUMN priority VARCHAR(50)')
+        store.execute('ALTER TABLE card ADD COLUMN size VARCHAR(50)')
+        store.execute('ALTER TABLE card ADD COLUMN sponsor VARCHAR(50)')
+        store.execute('ALTER TABLE card ADD COLUMN contact VARCHAR(50)')
+        store.execute('ALTER TABLE card ADD COLUMN description BLOB')
+        store.execute('ALTER TABLE card ADD COLUMN acceptance_criteria BLOB')
+        store.execute('UPDATE version SET db_layout_ref = 13')
 
 
 def get_store(dbpath):

=== modified file 'lpworkitems/models_roadmap.py'
--- lpworkitems/models_roadmap.py	2011-10-03 14:18:00 +0000
+++ lpworkitems/models_roadmap.py	2011-10-19 15:16:57 +0000
@@ -14,6 +14,13 @@
     card_id = Int(primary=True)
     lane_id = Int()
     roadmap_id = Unicode()
+    team = Unicode()
+    priority = Unicode()
+    size = Unicode()
+    sponsor = Unicode()
+    contact = Unicode()
+    description = Unicode()
+    acceptance_criteria = Unicode()
 
     def __init__(self, name, card_id, lane_id, roadmap_id):
         self.lane_id = lane_id

=== modified file 'templates/roadmap_card.html'
--- templates/roadmap_card.html	2011-10-03 14:51:06 +0000
+++ templates/roadmap_card.html	2011-10-19 15:16:57 +0000
@@ -7,17 +7,20 @@
 %>
 
 <%def name="title()">
-${card}
+${card_title}
 </%def>
 
 <h1>${title()}</h1>
-<h2>${status} in <a href="roadmap-${lane}.html">${lane}</a></h2>
+<h2>${card.status} in <a href="roadmap-${lane}.html">${lane}</a></h2>
 <p>
 <ul>
-    <li>Description: ${description}
-    <li>Acceptance criteria: ${acceptance_criteria}
-    <li>Sponsor: ${sponsor_name}
-    <li>Contact: ${contact_name}
+    <li>Description: ${card.description}
+    <li>Acceptance criteria: ${card.acceptance_criteria}
+    <li>Sponsor: ${card.sponsor}
+    <li>Contact: ${card.contact}
+    <li>Priority: ${card.priority}
+    <li>Size: ${card.size}
+    <li>Team: ${card.team}
 </ul>
 
 <p>

=== modified file 'templates/roadmap_lane.html'
--- templates/roadmap_lane.html	2011-10-11 08:00:27 +0000
+++ templates/roadmap_lane.html	2011-10-19 15:16:57 +0000
@@ -22,9 +22,9 @@
         <a href="roadmap-card-${card.roadmap_id}.html">${card.name}</a>
     </th></tr>
 </thead>
-    <tr><td colspan=2>Description of what this requirement is all about.</td></tr>
+    <tr><td colspan=2>${card.description}</td></tr>
     <tr><td>Done: n</td><td>&nbsp</td></tr>
-    <tr><td><a href="">Team X</a></td><td align=right>Priority</td></tr>
+    <tr><td><a href="">${card.team}</a></td><td align=right>Priority ${card.priority}</td></tr>
 </table>
 <p><p>
 % endfor