Merge lp:~james-w/launchpad-work-items-tracker/spec-group-completion-by-priority into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[James Westby]

Hi,

This branch changes the meaning of the by-priority progress bars
at the top of the front page of status.linaro.org.

Currently they indicate the priority of the blueprint. This makes
them reflect the priority of the TR that they contribute to.

Thanks,

James

[Michael Hudson-Doyle (mwhudson)]

This branch now conflicts with trunk. It also hurts my head :/

review: Needs Fixing

[James Westby (james-w)]

Further discussion has concluded that we don't want this change after all. Sorry to have
you review something that wasn't desired.

Thanks,

James

Unmerged revisions

260. By James Westby on 2011-02-10

Use the workitems by TR in the by_importance workitem progress bars.

259. By James Westby on 2011-02-08

Add a link to the about page at the top of the overview page.

258. By James Westby on 2011-02-08

Drop TR percentage completion graph.

257. By James Westby on 2011-02-07

Add improved images for the about page.

256. By James Westby on 2011-02-07

Disable adding of orphan people.

255. By James Westby on 2011-02-07

Correctly ignore informational blueprints.

254. By James Westby on 2011-02-07

Merge status-overview work.

253. By James Westby on 2010-12-17

Merge multi-project.

252. By James Westby on 2010-12-17

Merge blueprints-api.

251. By James Westby on 2010-12-17

Handle "Unknown" status of bug tasks.

=== modified file 'html-report'
--- html-report	2011-02-08 17:53:44 +0000
+++ html-report	2011-02-10 20:27:43 +0000
@@ -93,6 +93,11 @@
         return dict(areas=[], group_completion_series=[], groups=[])
     groups = []
     by_area = {}
+    all_workitems = WorkitemTarget()
+    high_workitems = WorkitemTarget()
+    medium_workitems = WorkitemTarget()
+    low_workitems = WorkitemTarget()
+    unknown_workitems = WorkitemTarget()
     for bp_name, i in data.items():
         area_name = i['area']
         if area_name == "ad":
@@ -109,21 +114,37 @@
                 postponed=i['postponed'], done=i['done'],
                 implementation=i['implementation'],
                 priority=i['priority'], status=i['status'])
+        def add_totals(container):
+            container.todo += group.todo
+            container.blocked += group.blocked
+            container.inprogress += group.inprogress
+            container.postponed += group.postponed
+            container.done += group.done
+        add_totals(all_workitems)
+        by_importance_workitems = unknown_workitems
+        if i['priority'] in ("Essential", "High"):
+            by_importance_workitems = high_workitems
+        elif i['priority'] == "Medium":
+            by_importance_workitems = medium_workitems
+        elif i['priority'] == "Low":
+            by_importance_workitems = low_workitems
+        add_totals(by_importance_workitems)
         groups.append(group)
         area.groups.append(group)
     return dict(areas=sorted(by_area.values(), key=lambda x: x.name),
-                groups=sorted(groups, key=lambda x: report_tools.priority_value(x.priority), reverse=True))
+                groups=sorted(groups, key=lambda x: report_tools.priority_value(x.priority), reverse=True),
+                all_workitems=all_workitems,
+                high_workitems=high_workitems,
+                medium_workitems=medium_workitems,
+                low_workitems=low_workitems,
+                unknown_workitems=unknown_workitems,
+                )
 
 
 def spec_completion(db, team, milestone):
     data = report_tools.blueprint_completion(db, team, milestone)
 
     blueprints = []
-    all_workitems = WorkitemTarget()
-    high_workitems = WorkitemTarget()
-    medium_workitems = WorkitemTarget()
-    low_workitems = WorkitemTarget()
-    unknown_workitems = WorkitemTarget()
     for bp_name, i in data.items():
         bp = Blueprint(bp_name, i['url'], complexity=i['complexity'],
                       todo=i['todo'], blocked=i['blocked'],
@@ -131,21 +152,6 @@
                       postponed=i['postponed'], done=i['done'],
                       implementation=i['implementation'],
                       priority=i['priority'], status=i['status'])
-        def add_totals(container):
-            container.todo += bp.todo
-            container.blocked += bp.blocked
-            container.inprogress += bp.inprogress
-            container.postponed += bp.postponed
-            container.done += bp.done
-        add_totals(all_workitems)
-        by_importance_workitems = unknown_workitems
-        if i['priority'] in ("Essential", "High"):
-            by_importance_workitems = high_workitems
-        elif i['priority'] == "Medium":
-            by_importance_workitems = medium_workitems
-        elif i['priority'] == "Low":
-            by_importance_workitems = low_workitems
-        add_totals(by_importance_workitems)
         blueprints.append(bp)
 
     # avoid showing empty columns
@@ -160,11 +166,6 @@
         specs_have_status=specs_have_status,
         specs_have_complexity=specs_have_complexity,
         blueprints=blueprints,
-        all_workitems=all_workitems,
-        high_workitems=high_workitems,
-        medium_workitems=medium_workitems,
-        low_workitems=low_workitems,
-        unknown_workitems=unknown_workitems,
         )
 
 def get_assignee_completion(db, team=None, milestone=None, group=None):