From 20491e64f776849b0be33549d2faa2bb6b1fd9ad Mon Sep 17 00:00:00 2001
From: "RCH(OpenERP)." <>
Date: Fri, 9 Apr 2010 15:43:48 +0530
Subject: [PATCH] [IMP]:Improved burdune chart button in scrum dash board.

bzr revid: apa@tinyerp.com-20100409101348-l4n2sh3ob8ymu5w6
---
 addons/board_project/board_scrum_view.xml     | 27 ++++++++++++++++++-
 addons/project/report/project_report.py       | 16 ++++++-----
 addons/project/report/project_report_view.xml |  2 ++
 addons/scrum/scrum_report.xml                 |  4 +--
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/addons/board_project/board_scrum_view.xml b/addons/board_project/board_scrum_view.xml
index 45628733ad3..daf3cb375ca 100644
--- a/addons/board_project/board_scrum_view.xml
+++ b/addons/board_project/board_scrum_view.xml
@@ -1,12 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+            <record id="view_scrum_sprint_dashboard_tree" model="ir.ui.view">
+            <field name="name">scrum.sprint.dashboard.tree</field>
+            <field name="model">scrum.sprint</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+            	 <tree string="Scrum Sprint">
+                    <field name="name"/>
+                    <field name="project_id"/>
+                    <field name="scrum_master_id"/>
+                    <field name="product_owner_id" invisible="1"/>
+                    <field name="date_start"/>
+                    <field name="progress" widget="progressbar"/>
+                    <field name="effective_hours" sum="Effective hours" widget="float_time"/>
+                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
+                    <field name="expected_hours" sum="Expected hours" widget="float_time"/>
+                    <field name="state"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
+                    <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
+                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
+                	<button name="%(scrum.report_scrum_sprint_burndown_chart)d" states="open,draft,close,cancel"
+                                	string="Burndown Chart" type="action" icon="gtk-print"/>
+             	</tree>
+            </field>
+        </record>
         <record id="action_sprint_all_dashboard_tree" model="ir.actions.act_window">
             <field name="name">Sprint's List</field>
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="scrum.view_scrum_sprint_tree"/>
+            <field name="view_id" ref="view_scrum_sprint_dashboard_tree"/>
         </record>
         <record id="board_project_scrum_form" model="ir.ui.view">
             <field name="name">board.project.form</field>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 9b482f632f8..f2baefdfaea 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -144,7 +144,8 @@ class task_by_days(osv.osv):
     _columns = {
         'day': fields.char('Day', size=128, required=True),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True),
-        'total_task': fields.float('Total tasks', readonly=True)
+        'total_task': fields.float('Total tasks', readonly=True),
+        'project_id':fields.many2one('project.project','Project')
      }
     _order = 'day desc'
     def init(self, cr):
@@ -155,11 +156,12 @@ class task_by_days(osv.osv):
                     min(pt.id) as id,
                     to_char(pt.create_date, 'YYYY-MM-DD') as day,
                     count(*) as total_task,
-                    pt.state as state
+                    pt.state as state,
+                    pt.project_id
                 from
                     project_task as pt
                 group by
-                    to_char(pt.create_date, 'YYYY-MM-DD'),pt.state
+                    to_char(pt.create_date, 'YYYY-MM-DD'),pt.state,pt.project_id
             )
         """)
 task_by_days()
@@ -170,7 +172,8 @@ class task_by_days_vs_planned_hours(osv.osv):
     _auto = False
     _columns = {
         'day': fields.char('Day', size=128, required=True),
-        'planned_hour': fields.float('Planned Hours', readonly=True)
+        'planned_hour': fields.float('Planned Hours', readonly=True),
+        'project_id':fields.many2one('project.project','Project')
      }
     _order = 'day desc'
     def init(self, cr):
@@ -180,11 +183,12 @@ class task_by_days_vs_planned_hours(osv.osv):
                 select
                     min(pt.id) as id,
                     to_char(pt.create_date, 'YYYY-MM-DD') as day,
-                    sum(planned_hours) as planned_hour
+                    sum(planned_hours) as planned_hour,
+                    pt.project_id
                 from
                     project_task as pt
                 group by
-                    to_char(pt.create_date, 'YYYY-MM-DD')
+                    to_char(pt.create_date, 'YYYY-MM-DD'),pt.project_id
             )
         """)
 task_by_days_vs_planned_hours()
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 39afad8a8df..0661741ff7d 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -148,6 +148,7 @@
              <graph string="Task By Days" type="bar">
                  <field name="day"/>
                  <field name="state" group="True"/>
+                 <field name="project_id" group="True"/>
                  <field name="total_task" operator="+"/>
              </graph>
          </field>
@@ -182,6 +183,7 @@
              <graph string="Task By Days vs Planned Hours" type="bar">
                  <field name="day"/>
                  <field name="planned_hour" operator="+"/>
+                 <field name="project_id" group="True"/>
              </graph>
          </field>
     </record>
diff --git a/addons/scrum/scrum_report.xml b/addons/scrum/scrum_report.xml
index 845a677c356..8d95d8bdc37 100644
--- a/addons/scrum/scrum_report.xml
+++ b/addons/scrum/scrum_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>        
-        <report auto="False" model="scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
+    <data>
+        <report auto="False"  id="report_scrum_sprint_burndown_chart" model="scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
     </data>
 </openerp>