Skip to content
Snippets Groups Projects
Commit 4ff5ed7c authored by Harshad Modi's avatar Harshad Modi
Browse files

[IMP] project_scrum: improve burndown chart 

bzr revid: hmo@tinyerp.com-20101015092955-0ewjltoo3agtjfh1
parent afb78caf
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
addons/project_scrum/report/_burndown.py
+ 41
− 25
View file @ 4ff5ed7c
......@@ -19,44 +19,60 @@
#
##############################################################################
from mx import DateTime
from datetime import datetime
from dateutil.relativedelta import relativedelta
import time
import pooler
from report.render import render
class external_pdf(render):
def __init__(self, pdf):
render.__init__(self)
self.pdf = pdf
self.output_type='pdf'
def _render(self):
return self.pdf
def compute_burndown(cr, uid, tasks_id, date_start, date_stop):
def compute_burndown(cr, uid, tasks_ids, date_start, date_stop):
latest = False
if len(tasks_id):
cr.execute('select id,create_date,state,planned_hours from project_task where id IN %s order by create_date',(tuple(tasks_id),))
tasks = cr.fetchall()
cr.execute('select w.date,w.hours from project_task_work w left join project_task t on (t.id=w.task_id) where t.id IN %s and t.state in (%s,%s) order by date',(tuple(tasks_id),'open','progress',))
tasks2 = cr.fetchall()
cr.execute('select date_end,planned_hours from project_task where id IN %s and state in (%s,%s) order by date_end' ,(tuple(tasks_id),'cancelled','done',))
tasks2 += cr.fetchall()
tasks2.sort()
pool = pooler.get_pool(cr.dbname)
project_task_pool = pool.get('project.task')
task_work_pool = pool.get('project.task.work')
if len(tasks_ids):
tasks_ids = project_task_pool.search(cr, uid, [('id','in',tasks_ids)], order='create_date')
tasks = project_task_pool.read(cr, uid, tasks_ids, ['create_date','planned_hours','state'])
tasks_ids = project_task_pool.search(cr, uid, [('id','in',tasks_ids),('state', 'in', ['open','progress'])], order='create_date')
work_ids = task_work_pool.search(cr, uid, [('task_id','in',tasks_ids)], order='date')
close_tasks = task_work_pool.read(cr, uid, work_ids, ['date','hours','state'])
tasks_ids = project_task_pool.search(cr, uid, [('id','in',tasks_ids),('state', 'in', ['cancelled','done'])], order='date_end')
close_tasks += project_task_pool.read(cr, uid, tasks_ids, ['date_end','planned_hours'])
else:
tasks = []
tasks2 = []
close_tasks = []
current_date = date_start
total = 0
done = 0
result = []
while current_date<=date_stop:
while len(tasks) and tasks[0][1] and tasks[0][1][:10]<=current_date:
while datetime.strptime(current_date, '%Y-%m-%d') <= datetime.strptime(date_stop, '%Y-%m-%d'):
while len(tasks) and tasks[0]['create_date'] and datetime.strptime(tasks[0]['create_date'][:10], '%Y-%m-%d')<=datetime.strptime(current_date, '%Y-%m-%d'):
latest = tasks.pop(0)
total += latest[3]
total += float(latest.get('planned_hours',0.0))
i = 0
while i<len(tasks2):
if tasks2[i][0] and tasks2[i][0][:10]<=current_date:
t = tasks2.pop(i)
done += t[1]
else:
i+=1
while i < len(close_tasks):
if close_tasks[i]:
date_end = close_tasks[i].get('date',False)
hours = float(close_tasks[i].get('hours',0.0))
if not date_end:
date_end = close_tasks[i].get('date_end',False)
hours = float(close_tasks[i].get('planned_hours',0.0))
if datetime.strptime(date_end[:10], '%Y-%m-%d')<=datetime.strptime(current_date, '%Y-%m-%d'):
t = close_tasks.pop(i)
done += hours
i+=1
result.append( (int(time.mktime(time.strptime(current_date,'%Y-%m-%d'))), total-done) )
current_date = (DateTime.strptime(current_date, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
if not len(tasks) and not len(tasks2):
current_date = (datetime.strptime(current_date, '%Y-%m-%d') + relativedelta(days=1)).strftime('%Y-%m-%d')
if not len(tasks) and not len(close_tasks):
break
result.append( (int(time.mktime(time.strptime(date_stop,'%Y-%m-%d'))), 0) )
return result
......
addons/project_scrum/report/sprint_burndown.py
+ 11
− 25
View file @ 4ff5ed7c
......@@ -25,22 +25,13 @@ import pooler
from report.render import render
from report.interface import report_int
from mx import DateTime
from datetime import datetime
import time
from pychart import *
import pychart.legend
import _burndown
class external_pdf(render):
def __init__(self, pdf):
render.__init__(self)
self.pdf = pdf
self.output_type='pdf'
def _render(self):
return self.pdf
class report_tasks(report_int):
def create(self, cr, uid, ids, datas, context=None):
if context is None:
......@@ -49,24 +40,19 @@ class report_tasks(report_int):
canv = canvas.init(fname=io, format='pdf')
canv.set_author("OpenERP")
cr.execute('select id,date_start,date_stop from project_scrum_sprint where id=%s', (datas['id'],))
for (id,date_start,date_stop) in cr.fetchall():
cr.execute('select id from project_task where product_backlog_id in(select id from project_scrum_product_backlog where sprint_id=%s)', (id,))
ids = map(lambda x: x[0], cr.fetchall())
datas = _burndown.compute_burndown(cr, uid, ids, date_start, date_stop)
pool = pooler.get_pool(cr.dbname)
sprint_pool = pool.get('project.scrum.sprint')
task_pool = pool.get('project.task')
int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
for sprint in sprint_pool.browse(cr, uid, ids, context=context):
task_ids = task_pool.search(cr, uid, [('sprint_id','=',sprint.id)], context=context)
datas = _burndown.compute_burndown(cr, uid, task_ids, sprint.date_start, sprint.date_stop)
max_hour = reduce(lambda x,y: max(y[1],x), datas, 0)
date_to_int = lambda x: int(x.ticks())
int_to_date = lambda x: '/a60{}'+DateTime.localtime(x).strftime('%d %m %Y')
def _interval_get(*args):
result = []
for i in range(20):
d = DateTime.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
res = DateTime.DateTime(d.year, d.month, d.day).ticks()
d = time.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
res = time.mktime(d)
if (not result) or result[-1]<>res:
result.append(res)
return result
......@@ -92,7 +78,7 @@ class report_tasks(report_int):
ar.draw(canv)
canv.close()
self.obj = external_pdf(io.getvalue())
self.obj = _burndown.external_pdf(io.getvalue())
self.obj.render()
return (self.obj.pdf, 'pdf')
report_tasks('report.scrum.sprint.burndown')
......
addons/project_scrum/report/task_burndown.py
+ 5
− 49
View file @ 4ff5ed7c
......@@ -20,53 +20,14 @@
##############################################################################
import StringIO
from report.render import render
from report.interface import report_int
from mx import DateTime
from datetime import datetime
import time
from pychart import *
import pychart.legend
import _burndown
class external_pdf(render):
def __init__(self, pdf):
render.__init__(self)
self.pdf = pdf
self.output_type='pdf'
def _render(self):
return self.pdf
def burndown_chart(cr, uid, tasks_id, date_start, date_stop):
latest = False
cr.execute('select id,date_start,state,planned_hours from project_task where id IN %s order by date_start'(tuple(tasks_id),))
tasks = cr.fetchall()
cr.execute('select id,date_end,state,planned_hours*progress/100 from project_task where id IN %s and state in (%s,%s) order by date_end', (tuple(tasks_id),'progress','done',))
tasks2 = cr.fetchall()
current_date = date_start
total = 0
done = 0
result = []
while current_date<=date_stop:
while len(tasks) and tasks[0][1] and tasks[0][1][:10]<=current_date:
total += tasks.pop(0)[3]
while len(tasks2) and tasks2[0][1] and tasks2[0][1][:10]<=current_date:
t2 = tasks2.pop(0)
if t2[2]<>'cancel':
done += t2[3]
else:
total -= t2[3]
result.append( (int(time.mktime(time.strptime(current_date,'%Y-%m-%d'))), total-done) )
current_date = (DateTime.strptime(current_date, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
if not len(tasks) and not len(tasks2):
break
result.append( (int(time.mktime(time.strptime(date_stop,'%Y-%m-%d'))), 0) )
return result
class report_tasks(report_int):
def create(self, cr, uid, ids, datas, context=None):
if context is None:
......@@ -87,24 +48,19 @@ class report_tasks(report_int):
if res[1] and datas['date_stop']<res[1]:
datas['date_stop'] = res[1][:10]
date_to_int = lambda x: int(x.ticks())
int_to_date = lambda x: '/a60{}'+DateTime.localtime(x).strftime('%d/%m/%Y')
datas = _burndown.compute_burndown(cr, uid, ids, datas['date_start'], datas['date_stop'])
canv = canvas.init(fname=io, format='pdf')
canv.set_author("OpenERP")
max_hour = reduce(lambda x,y: max(y[1],x), datas, 0)
date_to_int = lambda x: int(x.ticks())
int_to_date = lambda x: '/a60{}'+DateTime.localtime(x).strftime('%d %m %Y')
int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
def _interval_get(*args):
result = set()
for i in range(20):
d = DateTime.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
res = DateTime.DateTime(d.year, d.month, d.day).ticks()
d = time.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
res = time.mktime(d)
result.add(res)
return list(result)
......@@ -126,7 +82,7 @@ class report_tasks(report_int):
ar.draw(canv)
canv.close()
self.obj = external_pdf(io.getvalue())
self.obj = _burndown.external_pdf(io.getvalue())
self.obj.render()
return (self.obj.pdf,'pdf')
report_tasks('report.project.tasks.burndown')
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment