From 465f91053ed59622c68fbb96bbc057f4ab3ca2d5 Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Thu, 14 Oct 2010 14:30:09 +0530
Subject: [PATCH] [IMP]: HR Dashboard.

bzr revid: rch@rch-desktop-20101014090009-x8m0g12mwacuiz45
---
 addons/hr_holidays/board_hr_holidays_view.xml | 38 +++++++++++++------
 .../report/available_holidays_view.xml        | 11 ++----
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 00412073532..aa654f1aa4c 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_user"/>
         <menuitem
             action="hr.open_board_hr"
@@ -9,6 +9,20 @@
             id="base.menu_hr_project"
             parent="base.menu_hr_dasboard"
             sequence="4"/>
+
+      <record model="ir.ui.view" id="view_holiday_allocation_leave_tree">
+            <field name="name">hr.holidays.allocation.leave.tree</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Leaves" >
+                    <field name="name"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="holiday_status_id"/>
+                </tree>
+            </field>
+        </record>
         <record id="action_view_holiday_status_board" model="ir.actions.act_window">
             <field name="name">My Leaves</field>
             <field name="type">ir.actions.act_window</field>
@@ -16,21 +30,21 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','in',('confirm', 'validate')),('user_id','=',uid)]</field>
-            <field name="view_id" ref="hr_holidays.open_allocation_holidays"/>
+            <field name="view_id" ref="view_holiday_allocation_leave_tree"/>
         </record>
-        
+
         <record id="board_hr_holidays_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.form</field>
             <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child1" position="inside"> 
+                <xpath expr="/form/hpaned/child1" position="inside">
                     <action colspan="4" height="220" name="%(action_view_holiday_status_board)d" string="My Leaves"/>
                 </xpath>
             </field>
         </record>
-        
+
             <!-- Need to merge in above view -->
 
         <record id="action_hr_holidays_leaves_by_month" model="ir.actions.act_window">
@@ -40,18 +54,18 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('user_id','=',uid)]</field>
-            <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
+            <field name="context">{'group_by_no_leaf':1}</field>
             <field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/>
         </record>
         <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.leave.month.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>            
-            <field name="inherit_id" ref="hr.board_hr_form"/>           
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child2" position="inside">            
-                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves by Month" />
-                </xpath>  
+                <xpath expr="/form/hpaned/child2" position="inside">
+                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="My Leaves by Type" />
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index b4cb2a99b7a..8eea65b94a1 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -32,13 +32,10 @@
             <field name="model">available.holidays.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Available Holidays" type="bar">
-                    <field name="employee_id"/>
-                    <field name="max_leave" operator="+"/>
-                    <field name="taken_leaves" operator="+"/>
-                    <field name="remaining_leave" operator="+"/>
-               		<field name="month" group = "True" operator="+" invisible="1"/>
-                    <field group="True" name="holiday_status_id"/>
+                <graph string="Available Holidays" type="bar">
+                    <field name="holiday_status_id"/>
+                    <field name="taken_leaves" string="Leave Days" operator="+"/>
+                    <field name="remaining_leave" string="Remaining Days" operator="+"/>
                 </graph>
             </field>
         </record>