Merge lp:~mabac/launchpad-work-items-tracker/linaro-cards-to-blueprints into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Mattias Backman]

Hi,

This branch adds roadmap Cards pages that display a list of blueprints linked to that card.

The link consists of entering
    Meta:
    Roadmap id: id123
in the blueprint whiteboard and entering the same id in the external_link field of the Kanbantool card.

Thanks,

Mattias

[James Westby (james-w)]

Very nice.

Thanks,

James

review: Approve

=== modified file 'collect_roadmap'
--- collect_roadmap	2011-09-29 08:09:22 +0000
+++ collect_roadmap	2011-10-07 14:09:14 +0000
@@ -92,7 +92,9 @@
             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)
+                              task['task']['id'], lane_id,
+#                              unicode_or_None(task['task']['external_id']))
+                              unicode_or_None(task['task']['external_link']))
             model_card.status = unicode_or_None(task_status['name'])
             collector.store_card(model_card)
         else:
@@ -103,6 +105,7 @@
     '''Collect roadmap items from KanbanTool into DB.'''
     board_url = get_kanban_url('boards/%s.json' % board_id, api_token)
     board = get_kanban_data(board_url)
+    assert board is not None, "Could not access board %s." % board_id
     status_list = kanban_import_lanes(collector,
                                       board['board']['workflow_stages'])
 

=== modified file 'generate-all'
--- generate-all	2011-09-19 06:47:13 +0000
+++ generate-all	2011-10-07 14:09:14 +0000
@@ -160,6 +160,10 @@
     basename = os.path.join(opts.output_dir, 'roadmap-' + lane.name)
     report_tools.roadmap_pages(my_path, opts.database, basename, opts.config, lane, root=opts.root)
 
+# roadmap cards
+for card in report_tools.cards(store):
+    basename = os.path.join(opts.output_dir, 'roadmap-card-%s' % card.card_id)
+    report_tools.roadmap_cards(my_path, opts.database, basename, opts.config, card, root=opts.root)
 
 def copy_files(source_dir):
     for filename in os.listdir(source_dir):

=== modified file 'html-report'
--- html-report	2011-09-19 06:47:13 +0000
+++ html-report	2011-10-07 14:09:14 +0000
@@ -486,6 +486,35 @@
             "roadmap_lane.html", data, theme=opts.theme)
 
 
+    def roadmap_card(self, store, opts):
+        if opts.card is None:
+            print "<h1>Error, no card specified.</h1>"
+
+        data = self.template_data(store, opts)
+        card = report_tools.card(store, int(opts.card)).one()
+        lane = report_tools.lane(store, None, id=card.lane_id).one()
+
+        if not opts.title:
+            title = card.name
+        else:
+            title = opts.title
+
+        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(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)
+
+
 class WorkitemsOnDate(object):
 
     def __init__(self, date, done, delta_done, todo, delta_todo):
@@ -565,6 +594,8 @@
             help="The theme to use.", default="linaro")
     optparser.add_option('--lane',
         help='Roadmap lane', dest='lane')
+    optparser.add_option('--card',
+        help='Roadmap card', dest='card')
 
     (opts, args) = optparser.parse_args()
     if not opts.database:

=== modified file 'lpworkitems/database.py'
--- lpworkitems/database.py	2011-09-07 14:04:38 +0000
+++ lpworkitems/database.py	2011-10-07 14:09:14 +0000
@@ -7,7 +7,7 @@
     store.execute('''CREATE TABLE version (
         db_layout_ref INT NOT NULL
         )''')
-    store.execute('''INSERT INTO version VALUES (11)''')
+    store.execute('''INSERT INTO version VALUES (12)''')
 
     store.execute('''CREATE TABLE specs (
         name VARCHAR(255) PRIMARY KEY,
@@ -100,6 +100,7 @@
         name VARCHAR(200) NOT NULL,
         card_id NOT NULL,
         status VARCHAR(50),
+        roadmap_id VARCHAR(50),
         lane_id REFERENCES lane(lane_id)
         )''')
 
@@ -205,6 +206,9 @@
             )''')
         store.execute('UPDATE version SET db_layout_ref = 11')
         ver = 11
+    if ver == 11:
+        store.execute('ALTER TABLE card ADD COLUMN roadmap_id VARCHAR(50)')
+        store.execute('UPDATE version SET db_layout_ref = 12')
 
 
 def get_store(dbpath):

=== modified file 'lpworkitems/models_roadmap.py'
--- lpworkitems/models_roadmap.py	2011-09-12 14:41:07 +0000
+++ lpworkitems/models_roadmap.py	2011-10-07 14:09:14 +0000
@@ -13,11 +13,13 @@
     status = Unicode()
     card_id = Int(primary=True)
     lane_id = Int()
+    roadmap_id = Unicode()
 
-    def __init__(self, name, card_id, lane_id):
+    def __init__(self, name, card_id, lane_id, roadmap_id):
         self.lane_id = lane_id
         self.card_id = card_id
         self.name = name
+        self.roadmap_id = roadmap_id
 
 
 class Lane(object):

=== modified file 'report_tools.py'
--- report_tools.py	2011-09-19 06:47:13 +0000
+++ report_tools.py	2011-10-07 14:09:14 +0000
@@ -13,6 +13,9 @@
     Lane,
     Card,
 )
+from lpworkitems.models import (
+    Meta,
+)
 
 valid_states = [u'inprogress', u'blocked', u'todo', u'done', u'postponed']
 state_labels = [u'In Progress', u'Blocked', u'Todo', u'Done', u'Postponed']
@@ -217,6 +220,23 @@
         fh.close()
 
 
+def roadmap_cards(my_path, database, basename, config, card, root=None):
+    cfg = load_config(config)
+    fh = open(basename + '.html', 'w')
+    try:
+        args = [os.path.join(my_path, 'html-report'), '-d', database]
+        args += ['--report-type', 'roadmap_card']
+        args += ['--card', '%s' % card.card_id]
+        if root:
+            args += ['--root', root]
+        report_args(args, theme=get_theme(cfg))
+        proc = Popen(args, stdout=fh)
+        print basename + '.html'
+        proc.wait()
+    finally:
+        fh.close()
+
+
 def run_reports(my_path, database, basename, config, milestone=None, team=None,
         user=None, trend_starts=None, trend_override=None, burnup=False, root=None, date=None):
 
@@ -920,13 +940,15 @@
     return store.find(Lane)
 
 
-def lane(store, lane):
-    return store.find(Lane, Lane.name == unicode(lane))
+def lane(store, name, id=None):
+    if id is None:
+        return store.find(Lane, Lane.name == unicode(name))
+    else:
+        return store.find(Lane, Lane.lane_id == id)
 
 
 def lane_cards(store, lane):
-    return store.find(Card, Card.lane_id == lane.lane_id)
-
+    return lane.cards
 
 def statuses(store, lane):
     result = []
@@ -938,6 +960,20 @@
     return result
 
 
+def cards(store):
+    return store.find(Card)
+
+
+def card(store, card_id):
+    return store.find(Card, Card.card_id == card_id)
+
+
+def card_blueprints(store, roadmap_id):
+    metas = store.find(Meta,
+                       Meta.key == u'Roadmap id',
+                       Meta.value == roadmap_id)
+    return [meta.blueprint for meta in metas]
+
 def subteams(store, team):
     result = store.execute('SELECT name from team_structure where team = ?', (unicode(team),))
     return [i[0] for i in result]

=== added file 'templates/roadmap_card.html'
--- templates/roadmap_card.html	1970-01-01 00:00:00 +0000
+++ templates/roadmap_card.html	2011-10-07 14:09:14 +0000
@@ -0,0 +1,78 @@
+<%inherit file="body.html"/>
+<%namespace name="util" file="util.html"/>
+<%namespace name="terminology" file="terminology.html"/>
+
+<%!
+import report_tools
+%>
+
+<%def name="title()">
+${card}
+</%def>
+
+<h1>${title()}</h1>
+<h2>${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}
+</ul>
+
+<p>
+% if blueprints == []:
+There are no blueprints registered to implement this requirement.
+% else:
+<table>
+<thead>
+    <tr><th>Title</th>
+    <th>Assignee</th>
+    <th>Priority</th>
+    <th>Status</th>
+    <th>Expected milestone</th>
+    <th>Health check</th>
+    </tr>
+</thead>
+% for bp in blueprints:
+    <tr><td><a href="${bp.url}">${bp.name}</a></td>
+    <td>${bp.assignee_name}</td>
+    <td>${bp.priority}</td>
+    <td>${bp.implementation}</td>
+    <td>${bp.milestone_name}</td>
+    <td>xxx</td>
+    </tr>
+% endfor
+</table>
+% endif
+<h3>Health check</h3>
+<table>
+    <tr><td>Has Description</td>
+    <td>
+% if description == "":
+        No
+% else:
+        Yes
+% endif
+    </td></tr>
+    <tr><td>Has Acceptance Criteria</td>
+    <td>
+% if acceptance_criteria == "":
+        No
+% else:
+        Yes
+% endif
+    </td></tr>
+    <tr><td>Has Blueprints</td>
+    <td>
+% if blueprints == []:
+        No
+% else:
+        Yes
+% endif
+    </td></tr>
+    <tr><td>Is Ready</td>
+    <td>
+        TODO
+    </td></tr>
+</table>

=== modified file 'templates/roadmap_lane.html'
--- templates/roadmap_lane.html	2011-09-29 08:09:22 +0000
+++ templates/roadmap_lane.html	2011-10-07 14:09:14 +0000
@@ -16,14 +16,16 @@
 <p><b>${status['name']}</b>
 % for card in status['cards']:
 
-<table><tr><td>
-<a href="">${card.name}</a><br>
-    <table>
-        <tr><td colspan=2>Description of what this requirement is all about.</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>
-    </table>
-</td></tr></table>
+<table>
+<thead>
+    <tr><th>
+        <a href="roadmap-card-${card.card_id}.html">${card.name}</a>
+    </th></tr>
+</thead>
+    <tr><td colspan=2>Description of what this requirement is all about.</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>
+</table>
 <p><p>
 % endfor
 % endfor