[IMP]:improved tasks report.(Not Finished Yet).

bzr revid: apa@tinyerp.com-20100317065613-c09v68zwcvyx1s28
This commit is contained in:
apa-tiny 2010-03-17 12:26:13 +05:30
parent 8f60dfdeed
commit ce1563420f
7 changed files with 182 additions and 258 deletions

View File

@ -40,6 +40,7 @@ works done on tasks, eso. It is able to render planning, order tasks, eso.
"project_report.xml",
"process/task_process.xml",
"project_installer.xml",
"report/project_report_view.xml"
],
'demo_xml': [
'project_demo.xml'

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@ -15,9 +15,9 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import project_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -29,14 +29,23 @@ class report_project_task_user(osv.osv):
_columns = {
'name': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'date_start': fields.datetime('Starting Date'),
'date_end': fields.datetime('Ending Date'),
'date_deadline': fields.date('Deadline'),
'project_id':fields.many2one('project.project', 'Project', readonly=True),
'hours_planned': fields.float('Planned Hours', readonly=True),
'hours_effective': fields.float('Effective Hours', readonly=True),
'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
'task_closed': fields.integer('Task Closed', readonly=True),
'nbr': fields.integer('#Number of tasks', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'state': fields.selection([('draft', 'Draft'),
('open', 'In Progress'),
('pending', 'Pending'),
('cancelled', 'Cancelled'),
('done', 'Done')],
'State', readonly=True),
}
_order = 'name desc, project_id'
@ -46,70 +55,30 @@ class report_project_task_user(osv.osv):
create or replace view report_project_task_user as (
select
min(t.id) as id,
to_char(date_end, 'YYYY') as name,
to_char(date_end, 'MM') as month,
count(distinct t.id) as task_closed,
to_char(date_start, 'YYYY') as name,
to_char(date_start, 'MM') as month,
count(distinct t.id) as nbr,
date_trunc('day',t.date_start) as date_start,
date_trunc('day',t.date_end) as date_end,
date_trunc('day',t.date_deadline) as date_deadline,
t.user_id,
t.project_id,
t.state,
sum(planned_hours) as hours_planned,
to_char(avg(date_end::abstime-t.create_date::timestamp), 'DD"d" HH24:MI:SS') as closing_days,
sum(w.hours) as hours_effective,
((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
from project_task t
left join project_task_work w on (t.id=w.task_id)
where
t.state='done'
group by
to_char(date_end, 'YYYY'),to_char(date_end, 'MM'),t.user_id,project_id
to_char(date_start, 'YYYY'),
to_char(date_start, 'MM'),
t.user_id,t.state,t.date_end,
t.date_deadline,t.date_start,
t.project_id
)
""")
report_project_task_user()
class report_project_task(osv.osv):
_name = "report.project.task"
_description = "Tasks by project"
_auto = False
_columns = {
'name': fields.char('Year',size=64,required=False, readonly=True),
'project_id':fields.many2one('project.project', 'Project', readonly=True),
'hours_planned': fields.float('Planned Hours', readonly=True),
'hours_effective': fields.float('Effective Hours', readonly=True),
'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
'task_closed': fields.integer('Task Closed', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc, project_id'
def init(self, cr):
tools.sql.drop_view_if_exists(cr, 'report_project_task')
cr.execute("""
create or replace view report_project_task as (
select
min(t.id) as id,
to_char(date_end, 'YYYY') as name,
to_char(date_end, 'MM') as month,
count(distinct t.id) as task_closed,
t.project_id,
sum(planned_hours) as hours_planned,
to_char(avg(date_end::abstime-t.create_date::timestamp), 'DD"d" HH12:MI:SS') as closing_days,
sum(w.hours) as hours_effective,
((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
from project_task t
left join project_task_work w on (t.id=w.task_id)
where
t.state='done'
group by
to_char(date_end, 'YYYY'),to_char(date_end, 'MM'),project_id
)
""")
report_project_task()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
<record id="view_task_project_user_tree" model="ir.ui.view">
<field name="name">report.project.task.user.tree</field>
<field name="model">report.project.task.user</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Tasks">
<field name="name" invisible="1"/>
<field name="month" invisible="1"/>
<field name="user_id"/>
<field name="project_id"/>
<field name="nbr"/>
<field name="date_start" invisible="1"/>
<field name="date_end" invisible="1"/>
<field name="date_deadline" invisible="1"/>
<field name="hours_planned"/>
<field name="hours_effective"/>
<field name="hours_delay"/>
<field name="closing_days"/>
<field name="state"/>
</tree>
</field>
</record>
<record id="view_task_project_user_search" model="ir.ui.view">
<field name="name">report.project.task.user.search</field>
<field name="model">report.project.task.user</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Tasks">
<group col="10" colspan="4">
<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
<separator orientation="vertical"/>
<filter string="Start" icon="terp-project" domain="[('date_start','=',time.strftime('%%Y/%%m/%%d'))]"/>
<filter string="End" icon="terp-project" domain="[('date_end','=',time.strftime('%%Y/%%m/%%d'))]"/>
<filter string="Deadline" icon="terp-project" domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
<filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="project_id" select="1"/>
<field name="user_id" select="1" widget="selection">
<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
</field>
<!--newline/>
<group expand="1" string="Extended options..." colspan="10" col="12">
<filter icon="terp-project"
string="Very urgent"
domain="[('priority','=','0')]"/>
<filter icon="terp-project"
string="Urgent"
domain="[('priority','=','1')]"/>
<filter icon="terp-project"
string="Medium"
domain="[('priority','=','2')]"/>
<filter icon="terp-project"
string="Low"
domain="[('priority','=','3')]"/>
<filter icon="terp-project"
string="Very Low"
domain="[('priority','=','4')]"/>
</group-->
<newline/>
<group expand="1" string="Group By..." colspan="10" col="11">
<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
<!--filter string="Company" icon="terp-project" context="{'group_by':'company_id'}" /-->
<separator orientation="vertical"/>
<filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
<!--filter string="Stage" icon="terp-project" context="{'group_by':'type'}"/-->
<separator orientation="vertical"/>
<filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-project" context="{'group_by':'name'}"/>
</group>
</group>
</search>
</field>
</record>
<record id="action_project_task_user_tree" model="ir.actions.act_window">
<field name="name">Tasks</field>
<field name="res_model">report.project.task.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="search_view_id" ref="view_task_project_user_search"/>
</record>
<menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
</data>
</openerp>

View File

@ -23,67 +23,67 @@ from osv import fields,osv
import mx.DateTime
import tools
class task_report(osv.osv):
_name = "task.report"
_description = "Project task report"
_auto = False
_columns = {
'name': fields.char('Task',size=64,required=False, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'task_nbr': fields.float('Task Number', readonly=True),
'task_hrs': fields.float('Task Hours', readonly=True),
'task_progress': fields.float('Task Progress', readonly=True),
'company_id' : fields.many2one('res.company', 'Company'),
'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done'),('no','No Task')], 'Status', readonly=True),
'project_id':fields.many2one('project.project', 'Project'),
'year': fields.char('Year',size=64,required=False, readonly=True),
'date_start': fields.datetime('Starting Date',readonly=True),
'date_end': fields.datetime('Ending Date',readonly=True),
'date_deadline': fields.date('Deadline',readonly=True),
'type': fields.many2one('project.task.type', 'Stage'),
'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
'assign_to': fields.many2one('res.users', 'Assigned to', readonly=True),
'remaining_hrs': fields.float('Remaining Hours', readonly=True),
}
def init(self, cr):
tools.sql.drop_view_if_exists(cr, 'task_report')
cr.execute('''
create or replace view task_report as (
select
min(t.id) as id,
to_char(t.create_date, 'YYYY') as year,
to_char(t.create_date,'MM') as month,
u.id as user_id,
u.company_id as company_id,
t.name as name,
t.project_id as project_id,
to_char(t.date_start,'YYYY/mm/dd') as date_start,
to_char(t.date_end,'YYYY/mm/dd') as date_end,
to_char(t.date_deadline,'YYYY/mm/dd') as date_deadline,
t.type as type,
t.priority as priority,
t.user_id as assign_to,
t.remaining_hours as remaining_hrs,
count(t.*) as task_nbr,
sum(t.planned_hours) as task_hrs,
sum(t.planned_hours * (100 - t.progress) / 100) as task_progress,
case when t.state is null then 'no' else t.state end as task_state
from
res_users u
left join
project_task t on (u.id = t.user_id)
where
u.active
group by
to_char(t.create_date, 'YYYY'),to_char(t.create_date,'MM'),u.id, u.company_id, t.state
,t.name,t.project_id,t.type,t.priority,
t.user_id,t.remaining_hours,to_char(t.date_start,'YYYY/mm/dd'),to_char(t.date_end,'YYYY/mm/dd'),to_char(t.date_deadline,'YYYY/mm/dd')
)
''')
task_report()
#class task_report(osv.osv):
# _name = "task.report"
# _description = "Project task report"
# _auto = False
# _columns = {
# 'name': fields.char('Task',size=64,required=False, readonly=True),
# 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
# ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
# 'user_id':fields.many2one('res.users', 'User', readonly=True),
# 'task_nbr': fields.float('Task Number', readonly=True),
# 'task_hrs': fields.float('Task Hours', readonly=True),
# 'task_progress': fields.float('Task Progress', readonly=True),
# 'company_id' : fields.many2one('res.company', 'Company'),
# 'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done'),('no','No Task')], 'Status', readonly=True),
# 'project_id':fields.many2one('project.project', 'Project'),
# 'year': fields.char('Year',size=64,required=False, readonly=True),
# 'date_start': fields.datetime('Starting Date',readonly=True),
# 'date_end': fields.datetime('Ending Date',readonly=True),
# 'date_deadline': fields.date('Deadline',readonly=True),
# 'type': fields.many2one('project.task.type', 'Stage'),
# 'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
# 'assign_to': fields.many2one('res.users', 'Assigned to', readonly=True),
# 'remaining_hrs': fields.float('Remaining Hours', readonly=True),
# }
#
# def init(self, cr):
# tools.sql.drop_view_if_exists(cr, 'task_report')
# cr.execute('''
# create or replace view task_report as (
# select
# min(t.id) as id,
# to_char(t.create_date, 'YYYY') as year,
# to_char(t.create_date,'MM') as month,
# u.id as user_id,
# u.company_id as company_id,
# t.name as name,
# t.project_id as project_id,
# to_char(t.date_start,'YYYY/mm/dd') as date_start,
# to_char(t.date_end,'YYYY/mm/dd') as date_end,
# to_char(t.date_deadline,'YYYY/mm/dd') as date_deadline,
# t.type as type,
# t.priority as priority,
# t.user_id as assign_to,
# t.remaining_hours as remaining_hrs,
# count(t.*) as task_nbr,
# sum(t.planned_hours) as task_hrs,
# sum(t.planned_hours * (100 - t.progress) / 100) as task_progress,
# case when t.state is null then 'no' else t.state end as task_state
# from
# res_users u
# left join
# project_task t on (u.id = t.user_id)
# where
# u.active
# group by
# to_char(t.create_date, 'YYYY'),to_char(t.create_date,'MM'),u.id, u.company_id, t.state
# ,t.name,t.project_id,t.type,t.priority,
# t.user_id,t.remaining_hours,to_char(t.date_start,'YYYY/mm/dd'),to_char(t.date_end,'YYYY/mm/dd'),to_char(t.date_deadline,'YYYY/mm/dd')
# )
# ''')
#task_report()
class report_timesheet_task_user(osv.osv):
_name = "report.timesheet.task.user"

View File

@ -7,7 +7,7 @@
parent="hr.menu_hr_root"
sequence="40" />
<!-- Tasks by projects and users -->
<!-- Tasks by projects and users
<record id="view_task_project_form" model="ir.ui.view">
@ -128,7 +128,7 @@
</record>
<menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
<menuitem action="action_project_task" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
-->
<!-- Report for Users' Timesheet and Task Hours per Month -->
<record id="view_report_timesheet_task_user_tree" model="ir.ui.view">

View File

@ -1,139 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Tasks by projects and users -->
<record id="view_task_project_user_form" model="ir.ui.view">
<field name="name">report.project.task.user.form</field>
<field name="model">report.project.task.user</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Tasks by Project and User">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="project_id" select="1" default="context.get('project_id', False)"/>
<field name="task_closed" select="1"/>
<field name="hours_planned" select="1"/>
<field name="hours_effective" select="1"/>
<field name="hours_delay" select="1"/>
<field name="closing_days"/>
</form>
</field>
</record>
<record id="view_task_project_user_tree" model="ir.ui.view">
<field name="name">report.project.task.user.tree</field>
<field name="model">report.project.task.user</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Tasks by projects and users">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="project_id" select="1"/>
<field name="task_closed" select="1"/>
<field name="hours_planned" select="1"/>
<field name="hours_effective" select="1"/>
<field name="hours_delay" select="1"/>
<field name="closing_days"/>
</tree>
</field>
</record>
<record id="view_task_project_user_search" model="ir.ui.view">
<field name="name">report.project.task.user.search</field>
<field name="model">report.project.task.user</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Tasks by projects and users">
<group col="8" colspan="4">
<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="project_id" select="1" default="context.get('project_id', False)"/>
</group>
</search>
</field>
</record>
<record id="action_project_task_user_tree" model="ir.actions.act_window">
<field name="name">Tasks Closed by Project and User</field>
<field name="res_model">report.project.task.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="search_view_id" ref="view_task_project_user_search"/>
</record>
<menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
<!-- Tasks by projects -->
<record id="view_task_project_form" model="ir.ui.view">
<field name="name">report.project.task.form</field>
<field name="model">report.project.task</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Tasks by Project">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="project_id" select="1"/>
<field name="task_closed" select="1"/>
<field name="hours_planned" select="1"/>
<field name="hours_effective" select="1"/>
<field name="hours_delay" select="1"/>
<field name="closing_days"/>
</form>
</field>
</record>
<record id="view_task_project_tree" model="ir.ui.view">
<field name="name">report.project.task.tree</field>
<field name="model">report.project.task</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Tasks by project">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="project_id" select="1"/>
<field name="task_closed" select="1"/>
<field name="hours_planned" select="1"/>
<field name="hours_effective" select="1"/>
<field name="hours_delay" select="1"/>
<field name="closing_days"/>
</tree>
</field>
</record>
<record id="view_task_project_search" model="ir.ui.view">
<field name="name">report.project.task.search</field>
<field name="model">report.project.task</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Tasks by projects">
<group col="8" colspan="4">
<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="project_id" select="1" default="context.get('project_id', False)"/>
<field name="task_closed" select="1"/>
</group>
</search>
</field>
</record>
<record id="action_project_task_tree" model="ir.actions.act_window">
<field name="name">Tasks Closed by Project</field>
<field name="res_model">report.project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="search_view_id" ref="view_task_project_search"/>
</record>
<menuitem action="action_project_task_tree" id="menu_project_task_tree" parent="base.menu_project_report"/>
</data>
</openerp>