From 712b6578067d5df3a5d557343631ff959bbc8071 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 30 May 2007 20:48:08 +0000
Subject: [PATCH] Improvements in dashboards

bzr revid: fp@tinyerp.com-a91cae8b34e9b2293d32023b18d461a0fdf6f2e0
---
 addons/board_project/__terp__.py              |  9 +++-
 .../board_project_manager_view.xml            | 48 ++++++++++++++++---
 addons/report_task/report_task_view.xml       | 37 +++++++++-----
 3 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py
index a73163fbd2e..20098b9d83f 100644
--- a/addons/board_project/__terp__.py
+++ b/addons/board_project/__terp__.py
@@ -3,7 +3,14 @@
 	"version":"1.0",
 	"author":"Tiny",
 	"category":"Board",
-	"depends":["project","report_timesheet","board","report_analytic_line"],
+	"depends":[
+		"project",
+		"report_timesheet",
+		"board",
+		"report_analytic_line",
+		"report_task",
+		"hr_timesheet_sheet"
+	],
 	"demo_xml":["board_project_demo.xml"],
 	"update_xml":["board_project_view.xml", "board_project_manager_view.xml"],
 	"description": """
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index c39865efef2..e0f71ed516e 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -26,6 +26,37 @@
 			view_id="view_account_analytic_simplified"
 			id="act_my_account"/>
 
+	<record model="ir.actions.act_window" id="action_project_pipeline_user">
+		<field name="name">Pipeline of tasks</field>
+		<field name="res_model">report.task.user.pipeline.open</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain">[('task_state','&lt;&gt;','cancelled'),('task_state','&lt;&gt;','done')]</field>
+	</record>
+
+		<record model="ir.ui.view" id="hr_timesheet_sheet_tree">
+			<field name="name">hr.timesheet.sheet.tree.simplified.board</field>
+			<field name="model">hr_timesheet_sheet.sheet</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Timesheets">
+					<field name="date_from" />
+					<field name="user_id"/>
+					<field name="name" />
+					<field name="total_attendance"/>
+					<field name="total_timesheet"/>
+					<field name="state"/>
+				</tree>
+			</field>
+		</record>
+		<record model="ir.actions.act_window" id="act_hr_timesheet_sheet">
+			<field name="name">Timesheets</field>
+			<field name="res_model">hr_timesheet_sheet.sheet</field>
+			<field name="domain">[('state','&lt;&gt;','done')]</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="hr_timesheet_sheet_tree"/>
+		</record>
+
 
 		<record model="ir.ui.view" id="board_project_manager_form">
 			<field name="name">board.project.manager.form</field>
@@ -48,13 +79,11 @@
 								height="150"
 								colspan="4"/>
 
-							<!--
 							<action
-								string="Last 20 tasks closed"
-								name="%(action_view_board_note_tree)d"
+								string="User's timesheets"
+								name="%(act_hr_timesheet_sheet)d"
 								colspan="4"
 								height="150"/>
-							-->
 
 						</child1>
 						<child2>
@@ -64,6 +93,13 @@
 								icon="gtk-ok"
 								type="action"
 								colspan="4"/>
+							<button
+								string="My tasks board"
+								name="%(open_board_project)d"
+								icon="gtk-ok"
+								type="action"
+								colspan="4"/>
+
 
 							<action
 								string="My user's work"
@@ -71,8 +107,8 @@
 								colspan="4"/>
 
 							<action
-								string="My timesheet"
-								name="%(report_timesheet.action_timesheet_user_stat_my)d"
+								string="My user's pipeline"
+								name="%(action_project_pipeline_user)d"
 								colspan="4"/>
 
 						</child2>
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index 293ec18ac0e..52da5425c38 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -14,14 +14,27 @@
 			<form string="Tasks by Projects">
 				<field name="user_id" select="1"/>
 				<field name="company_id" select="1"/>
-				<field name="task_nbr" select="1"/>
-				<field name="task_hrs" select="1"/>
-				<field name="task_progress" select="1"/>
+				<field name="task_nbr" select="2"/>
+				<field name="task_hrs" select="2"/>
+				<field name="task_progress" select="2"/>
 				<field name="task_state" select="1"/>
 			</form>
 		</field>
 	</record>
 
+	<record model="ir.ui.view" id="view_task_project_graph">
+		<field name="name">report.project.task.graph</field>
+		<field name="model">report.task.user.pipeline.open</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Tasks by Projects" type="bar">
+				<field name="user_id" groups="task_state"/>
+				<field name="task_progress"/>
+			</graph>
+		</field>
+	</record>
+
+
 
 	<record model="ir.ui.view" id="view_task_project_tree">
 		<field name="name">report.project.task.tree</field>
@@ -29,12 +42,12 @@
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
 			<tree string="Tasks by Projects">
-				<field name="user_id" select="1"/>
-				<field name="company_id" select="1"/>
-				<field name="task_nbr" select="1"/>
-				<field name="task_hrs" select="1"/>
-				<field name="task_progress" select="1"/>
-				<field name="task_state" select="1"/>
+				<field name="user_id"/>
+				<field name="company_id"/>
+				<field name="task_nbr"/>
+				<field name="task_hrs"/>
+				<field name="task_progress"/>
+				<field name="task_state"/>
 			</tree>
 		</field>
 	</record>
@@ -42,7 +55,7 @@
 	<record model="ir.actions.act_window" id="action_project_task">
 		<field name="res_model">report.task.user.pipeline.open</field>
 		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
+		<field name="view_mode">tree,graph</field>
 		<field name="domain">[]</field>
 	</record>
 	<menuitem name="Project/Reporting/All Months/Tasks by Projects" action="action_project_task" id="menu_project_task_user_tree"/>
@@ -51,7 +64,7 @@
 		<field name="name">Closed Task by Projects</field>
 		<field name="res_model">report.task.user.pipeline.open</field>
 		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
+		<field name="view_mode">tree,graph</field>
 		<field name="domain">[('task_state','=','done')]</field>
 	</record>
 	<menuitem name="Project/Reporting/All Months/Closed Task by Projects" action="action_project_task_done" id="menu_project_task_user_tree2"/>
@@ -60,7 +73,7 @@
 		<field name="name">Opened Task by Projects</field>
 		<field name="res_model">report.task.user.pipeline.open</field>
 		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
+		<field name="view_mode">tree,graph</field>
 		<field name="domain">[('task_state','=','open')]</field>
 	</record>
 	<menuitem name="Project/Reporting/All Months/Opened Task by Projects" action="action_project_task_open" id="menu_project_task_user_tree3"/>