Merge lp:~mabac/launchpad-work-items-tracker/reorder-roadmap-graphs into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Mattias Backman]

Hi,

This branch changes the roadmap charts so that they use the same order for the Card statuses:
    Completed, In Progress, Blocked, Planned.

The chart is just inverted using the --inverted option. For sorting the inline bars, we just use a list specifying the required order (it has to be hard coded somewhere, right?) ;)

Thanks,

Mattias

[Mattias Backman (mabac)]

Oh, and it's on staging so in ~15 minutes you can see what this does.

[lp:~mabac/launchpad-work-items-tracker/reorder-roadmap-graphs]

322. By Mattias Backman on 2011-12-20

Also sort the mouse over text.

323. By Mattias Backman on 2011-12-20

Sort blueprints in card view; first by status in reversed order, then by milestone.

[Данило Шеган (danilo)]

It would be nice to make use of this ordering list in roadmap-bp-chart (where "if inverted:...else:..." is used to plot the graphs), so it's hard-coded in only a single place. Definitely not for this branch though, it can be cleaned up as a separate step, imo.

Thanks for this fix, it's more reasonable like this.

review: Approve

=== modified file 'html-report'
--- html-report	2011-12-16 13:53:49 +0000
+++ html-report	2011-12-20 11:10:33 +0000
@@ -15,6 +15,7 @@
 )
 from lpworkitems.models import (
     ROADMAP_STATUSES_MAP,
+    ROADMAP_ORDERED_STATUSES,
 )
 
 
@@ -506,6 +507,7 @@
             statuses.append(dict(name=status, cards=cards_with_bps))
 
         data.update(dict(statuses=statuses))
+        data.update(dict(status_order=ROADMAP_ORDERED_STATUSES))
         data.update(dict(page_type="roadmap_lane"))
         data.update(dict(lane_title=title))
         data.update(dict(lanes=lanes))
@@ -541,11 +543,15 @@
                                blueprint_status_count.postponed +
                                blueprint_status_count.done) > 0
 
+        status_order = ROADMAP_ORDERED_STATUSES[:]
+        status_order.reverse()
+
         data.update(dict(page_type="roadmap_card"))
         data.update(dict(card_title=title))
         data.update(dict(card=card))
         data.update(dict(health_checks=health_checks))
         data.update(dict(lane=lane.name))
+        data.update(dict(status_order=status_order))
         data.update(dict(blueprints=blueprints))
         data.update(dict(blueprint_status_count=blueprint_status_count))
         data.update(dict(card_has_blueprints=card_has_blueprints))

=== modified file 'lpworkitems/models.py'
--- lpworkitems/models.py	2011-12-14 20:22:50 +0000
+++ lpworkitems/models.py	2011-12-20 11:10:33 +0000
@@ -12,6 +12,10 @@
                      u'Slow progress', u'Started'],
     u'Planned': [u'Unknown', u'Not started', u'Informational']}
 
+ROADMAP_ORDERED_STATUSES = ['Completed', 'In Progress', 'Blocked', 'Planned']
+assert set(ROADMAP_ORDERED_STATUSES) == set(ROADMAP_STATUSES_MAP.keys()), (
+    'The roadmap statuses are incorrect: %s' % ROADMAP_ORDERED_STATUSES)
+
 
 def fill_blueprint_info_from_launchpad(model_bp, lp_bp):
     model_bp.name = unicode_or_None(lp_bp.name)

=== modified file 'report_tools.py'
--- report_tools.py	2011-12-16 15:11:04 +0000
+++ report_tools.py	2011-12-20 11:10:33 +0000
@@ -228,6 +228,7 @@
     if lane.is_current:
         args = [os.path.join(my_path, 'roadmap-bp-chart'), '-d', database,
                 '-o', chart_name]
+        args += ['--inverted']
         proc = Popen(args)
         print chart_name
         proc.wait()

=== modified file 'templates/roadmap_card.html'
--- templates/roadmap_card.html	2011-12-14 12:34:43 +0000
+++ templates/roadmap_card.html	2011-12-20 11:10:33 +0000
@@ -53,8 +53,8 @@
     <th>Health check</th>
     </tr>
 </thead>
-% for status in blueprints.keys():
-% for bp in blueprints[status]:
+% for status in status_order:
+% for bp in sorted(blueprints[status], key=lambda bp: bp.milestone_name):
     <tr><td><a href="${bp.url}">${bp.name}</a></td>
     <td>${bp.assignee_name}</td>
     <td>${bp.priority}</td>

=== modified file 'templates/roadmap_lane.html'
--- templates/roadmap_lane.html	2011-12-16 13:42:02 +0000
+++ templates/roadmap_lane.html	2011-12-20 11:10:33 +0000
@@ -33,11 +33,11 @@
     <td>${card_dict['card'].team}</td><td align=right>${card_dict['card'].priority}</td>
     <td>
       <div class="roadmap_wrap" title="
-% for bp_status in card_dict['bp_statuses'].keys():
+% for bp_status in status_order:
 ${bp_status}: ${card_dict['bp_statuses'][bp_status]}&nbsp;
 % endfor
 ">
-% for bp_status in card_dict['bp_percentages'].keys():
+% for bp_status in status_order:
 	<div class="roadmap_value" style="width:${card_dict['bp_percentages'][bp_status]}%">
           <div class="${bp_status.replace(' ', '')}">&nbsp;</div>
         </div>