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 @@
+
+
@@ -19,6 +21,7 @@
+
@@ -48,7 +51,7 @@
domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
+ domain="[('create_date','<=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','>=',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Evaluation done in last month"/>