Merge lp:~clint-fewbar/launchpad-work-items-tracker/server-team-mods into lp:launchpad-work-items-tracker

Proposed by Clint Byrum
Status: Merged
Merged at revision: 222
Proposed branch: lp:~clint-fewbar/launchpad-work-items-tracker/server-team-mods
Merge into: lp:launchpad-work-items-tracker
Diff against target: 46 lines (+6/-6)
2 files modified
burndown-chart (+3/-3)
report_tools.py (+3/-3)
To merge this branch: bzr merge lp:~clint-fewbar/launchpad-work-items-tracker/server-team-mods
Reviewer Review Type Date Requested Status
Developers of work-items-tracker Pending
Review via email: mp+35303@code.launchpad.net

Description of the change

Fixed the issues with milestone-only generation and with postponed missing from burndown charts.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'burndown-chart'
--- burndown-chart 2010-09-13 06:50:12 +0000
+++ burndown-chart 2010-09-13 16:35:55 +0000
@@ -156,14 +156,14 @@
156 plot10.line_style = None156 plot10.line_style = None
157157
158 plot11 = bar_plot.T(label='total', hcol=9)158 plot11 = bar_plot.T(label='total', hcol=9)
159 plot10.fill_style = None159 plot11.fill_style = None
160 plot10.line_style = line_style.gray30160 plot11.line_style = line_style.gray30
161161
162 # create the canvas with the specified filename and file format162 # create the canvas with the specified filename and file format
163 can = canvas.init(filename,format)163 can = canvas.init(filename,format)
164164
165 # add the data to the area and draw it165 # add the data to the area and draw it
166 ar.add_plot(plot2, plot1, plot4, plot3, plot6, plot5, plot7)166 ar.add_plot(plot2, plot1, plot4, plot3, plot6, plot5, plot8, plot7, plot10, plot9)
167 ar.draw()167 ar.draw()
168168
169 # create and arrow for the trend line169 # create and arrow for the trend line
170170
=== modified file 'report_tools.py'
--- report_tools.py 2010-09-03 05:55:34 +0000
+++ report_tools.py 2010-09-13 16:35:55 +0000
@@ -189,7 +189,7 @@
189 cur.execute('SELECT status, date, count(*) FROM work_items w '189 cur.execute('SELECT status, date, count(*) FROM work_items w '
190 'WHERE 1=1 %s GROUP BY status, date' % ms_sql)190 'WHERE 1=1 %s GROUP BY status, date' % ms_sql)
191191
192 for (date, num) in cur:192 for (s, date, num) in cur:
193 data.setdefault(date, {})[s] = num193 data.setdefault(date, {})[s] = num
194 return data194 return data
195195
@@ -235,9 +235,9 @@
235 cur.execute('SELECT w.status, s.name, COUNT(DISTINCT w.description), s.status, s.priority, s.implementation, s.url, s.roadmap_notes '235 cur.execute('SELECT w.status, s.name, COUNT(DISTINCT w.description), s.status, s.priority, s.implementation, s.url, s.roadmap_notes '
236 'FROM work_items w, specs s '236 'FROM work_items w, specs s '
237 'ON w.spec = s.name '237 'ON w.spec = s.name '
238 'WHERE w.status = ? AND w.date = ? %s '238 'WHERE w.date = ? %s '
239 'GROUP BY w.status, w.spec' % ms_sql,239 'GROUP BY w.status, w.spec' % ms_sql,
240 (last_date))240 (last_date,))
241241
242 for (s, bp, num, status, priority, impl, url, roadmap_notes) in cur:242 for (s, bp, num, status, priority, impl, url, roadmap_notes) in cur:
243 info = data.setdefault(bp, {'todo': 0, 'blocked': 0, 'done': 0, 'postponed': 0, 'inprogress': 0})243 info = data.setdefault(bp, {'todo': 0, 'blocked': 0, 'done': 0, 'postponed': 0, 'inprogress': 0})

Subscribers

People subscribed via source and target branches

to all changes: