From 2bc3199535c7ed4eb742c2b36c857fd7927e3fa1 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 23 Sep 2010 18:51:27 +0530
Subject: [PATCH] [IMP] hr_evaluation : improvements in evaluation analysis
 report

bzr revid: vir@tinyerp.com-20100923132127-df4g3wr7kyhintnn
---
 addons/hr_evaluation/hr_evaluation_demo.xml           |  1 +
 addons/hr_evaluation/report/hr_evaluation_report.py   |  8 ++++----
 .../report/hr_evaluation_report_view.xml              | 11 ++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index de32747c2a9..0a03ec0e0b6 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -9,6 +9,7 @@
             <field name="type" ref="survey.survey_type1"/>
             <field name="responsible_id" ref="base.user_demo"/>
             <field name="response_user">5</field>
+            <field name="state">open</field>
         </record>
     </data>
 
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index ff3d902766b..bd9e5874d10 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -30,8 +30,8 @@ class hr_evaluation_report(osv.osv):
     _columns = {
         'create_date': fields.date('Create Date', readonly=True),
         'delay_date':fields.float('Delay to Start', digits=(16,2),readonly=True),
-        'overpass_delay':fields.float('OverpassedDeadline', digits=(16,2),readonly=True),
-        'progress_bar' : fields.float("Progress"),        
+        'overpass_delay':fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
+        'progress_bar' : fields.float("Progress"),
         'day': fields.char('Day', size=128, readonly=True),
         'deadline': fields.date("Deadline", readonly=True),
         'request_id': fields.many2one('survey.request', 'Request_id', readonly=True),
@@ -78,8 +78,8 @@ class hr_evaluation_report(osv.osv):
                      count(l.*) as nbr,
                      s.state,
                      s.progress as progress_bar,
-                     avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(24)/(-3600) as  delay_date,
-                     avg(extract('epoch' from age(s.date,CURRENT_DATE)))/(24)/(-3600) as overpass_delay                     
+                     avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(3600*24) as  delay_date,
+                     avg(extract('epoch' from age(s.date,CURRENT_DATE)))/(3600*24) as overpass_delay
                      from
                  hr_evaluation_interview l
                 LEFT JOIN
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 2b4e6870897..a8aaeb2ec93 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -10,10 +10,8 @@
             <tree colors="blue:state in ('draft');black:state in ('wait','progress');gray:state in('done','cancel')"
              string="Evaluations Analysis">
                 <field name="create_date" invisible="1"/>
-                <field name="delay_date"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="deadline" invisible="1"/>
-                <field name="overpass_delay"/>
                 <field name="closed" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="plan_id" invisible="1"/>
@@ -22,6 +20,8 @@
                 <field name="rating" invisible="1"/>
                 <field name="nbr" sum="# of Requests"/>
                 <field name="progress_bar" widget="progressbar"/>
+                <field name="delay_date"/>
+                <field name="overpass_delay"/>
                 <field name="state" invisible="1"/>
             </tree>
         </field>
@@ -50,7 +50,7 @@
             		<filter icon="terp-go-year" string=" Year "
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
                     <filter icon="terp-go-month" string=" Month " name="month" domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Evaluation done in current month"/>
-	                <filter icon="terp-go-week" string="    Month-1    " separator="1"
+	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
                         domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Evaluation done in last month"/>
                     <separator orientation="vertical"/>
 	                <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
@@ -73,15 +73,16 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                    <filter string="Appreciation" icon="terp-rating-rated" context="{'group_by':'rating'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
+                    <filter string="Appreciation" icon="terp-rating-rated" context="{'group_by':'rating'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by create Date"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Group by month of create Date"/>
                     <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Group by year of create Date"/>
-                </group> 
+                </group>
             </search>
         </field>
     </record>