From a1bfb7d6df3e560997bd2b7c5c4c4da678d80be5 Mon Sep 17 00:00:00 2001
From: dbr <tiny@tiny-desktop>
Date: Thu, 23 Sep 2010 17:05:58 +0530
Subject: [PATCH] [MOD/IMP]hr_evaluation: Usability Improvement

bzr revid: tiny@tiny-desktop-20100923113558-zsgu4dlt1g72k3n5
---
 addons/hr_evaluation/report/hr_evaluation_report.py      | 9 ++++++++-
 .../hr_evaluation/report/hr_evaluation_report_view.xml   | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index 56af08e4598..30fd9acdb58 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -29,6 +29,9 @@ class hr_evaluation_report(osv.osv):
     _rec_name = 'date'
     _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"),        
         'day': fields.char('Day', size=128, readonly=True),
         'deadline': fields.date("Deadline", readonly=True),
         'request_id': fields.many2one('survey.request', 'Request_id', readonly=True),
@@ -73,7 +76,10 @@ class hr_evaluation_report(osv.osv):
                      to_char(s.create_date, 'YYYY') as year,
                      to_char(s.create_date, 'MM') as month,
                      count(l.*) as nbr,
-                     s.state
+                     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_dela                     
                      from
                  hr_evaluation_interview l
                 LEFT JOIN
@@ -90,6 +96,7 @@ class hr_evaluation_report(osv.osv):
                      s.date_close,
                      l.request_id,
                      s.rating,
+                     s.progress,
                      s.plan_id
             )
         """)
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 7748d0e3aaf..883fd55294c 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -10,8 +10,10 @@
             <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"/>
@@ -19,6 +21,7 @@
                 <field name="month" invisible="1"/>
                 <field name="rating" invisible="1"/>
                 <field name="nbr" sum="# of Requests"/>
+                <field name="progress_bar" widget="progressbar"/>
                 <field name="state" invisible="1"/>
             </tree>
         </field>
@@ -48,7 +51,7 @@
                     	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"
-                       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"/>
+                        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')]"
 	                	help = "In progress Evaluations"/>