Merge lp:~agilebg/hr-timesheet/fix-hr_attendance_analysis-report-timezone into lp:~hr-core-editors/hr-timesheet/7.0

[Lorenzo Battistini]

[FIX] hr_attendance_analysis
using correct timezone to print the sign in/out time

[lp:~agilebg/hr-timesheet/fix-hr_attendance_analysis-report-timezone]

69. By Lorenzo Battistini on 2014-05-29

[FIX] hour and minutes

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Lorenzo,

I think your fix has a problem with times that after been converted to correct timezone change its date. For example: 29/05/2014 00:12 GMT+2 >> 28/05/2014 22:12 UTC.

Regards.

review: Needs Information (code review)

[lp:~agilebg/hr-timesheet/fix-hr_attendance_analysis-report-timezone]

70. By Lorenzo Battistini on 2014-05-30

[FIX] problem with times that after been converted to correct timezone change its date.
For example: 29/05/2014 00:12 GMT+2 >> 28/05/2014 22:12 UTC

[Lorenzo Battistini (elbati)]

Pedro, right, thanks.

I added the conversion to UTC while searching for attendances within the current_date.
This way, if selected current_date is 29/05/2014 (for a user in GMT+2), the sign in at 28/05/2014 22:12 UTC will be included in current_date.
So, every datetime is always expressed in the timezone of the user.

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/hr-timesheet. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

[Alex Comba - Agile BG (tafaru)]

Moved to https://github.com/OCA/hr-timesheet/pull/7
I prefer do not delete the proposal to keep all the associated comments that have been made.

review: Disapprove

Unmerged revisions

70. By Lorenzo Battistini on 2014-05-30

[FIX] problem with times that after been converted to correct timezone change its date.
For example: 29/05/2014 00:12 GMT+2 >> 28/05/2014 22:12 UTC

69. By Lorenzo Battistini on 2014-05-29

[FIX] hour and minutes

68. By Lorenzo Battistini on 2014-05-29

[FIX] hr_attendance_analysis
using correct timezone to print the sign in/out time

=== modified file 'hr_attendance_analysis/wizard/print_calendar_report.py'
--- hr_attendance_analysis/wizard/print_calendar_report.py	2013-11-19 13:32:00 +0000
+++ hr_attendance_analysis/wizard/print_calendar_report.py	2014-05-30 08:09:58 +0000
@@ -25,6 +25,7 @@
 from datetime import *
 import math
 import calendar
+import pytz
 
 class wizard_calendar_report(orm.TransientModel):
     
@@ -86,6 +87,8 @@
         employee_ids=form['employee_ids']
         delta = to_date - from_date
         max_number_of_attendances_per_day = 0
+        active_tz = pytz.timezone(
+            context.get("tz","UTC") if context else "UTC")
 
         for employee_id in employee_ids:
             employee_id = str(employee_id)
@@ -110,10 +113,16 @@
                     'signout_4': '',
                     }
                 current_date_beginning = datetime.combine(current_date, time())
-                str_current_date_beginning = current_date_beginning.strftime(
-                    '%Y-%m-%d %H:%M:%S')
-                current_date_end = datetime.combine(current_date, time())+ timedelta(1)
-                str_current_date_end = current_date_end.strftime('%Y-%m-%d %H:%M:%S')
+                current_date_beginning_utc = current_date_beginning.replace(
+                    tzinfo=active_tz).astimezone(pytz.utc)
+                str_current_date_beginning = (
+                    current_date_beginning_utc.strftime('%Y-%m-%d %H:%M:%S'))
+                current_date_end = datetime.combine(
+                    current_date, time()) + timedelta(1)
+                current_date_end_utc = current_date_end.replace(
+                    tzinfo=active_tz).astimezone(pytz.utc)
+                str_current_date_end = (
+                    current_date_end_utc.strftime('%Y-%m-%d %H:%M:%S'))
                 
                 attendance_ids = attendance_pool.search(cr, uid, [
                     ('employee_id','=',int(employee_id)),
@@ -136,14 +145,24 @@
                     count = 1
                     for attendance in sorted(attendance_pool.browse(cr, uid, attendance_ids, context=context),
                         key=lambda x: x['name']):
-                        days_by_employee[employee_id][str_current_date][
-                            'signin_'+str(count)] = attendance.name[11:16]
-                        days_by_employee[employee_id][str_current_date][
-                            'signout_'+str(count)] = attendance.end_datetime[11:16]
+
+                        attendance_start = datetime.strptime(
+                            attendance.name, '%Y-%m-%d %H:%M:%S'
+                            ).replace(tzinfo=pytz.utc).astimezone(active_tz)
+                        attendance_end = datetime.strptime(
+                            attendance.end_datetime, '%Y-%m-%d %H:%M:%S'
+                            ).replace(tzinfo=pytz.utc).astimezone(active_tz)
+
+                        days_by_employee[employee_id][str_current_date][
+                            'signin_'+str(count)] = '%02d:%02d' % (
+                            attendance_start.hour, attendance_start.minute)
+                        days_by_employee[employee_id][str_current_date][
+                            'signout_'+str(count)] = '%02d:%02d' % (
+                            attendance_end.hour, attendance_end.minute)
                         count += 1
                     if len(attendance_ids) > max_number_of_attendances_per_day:
                         max_number_of_attendances_per_day = len(attendance_ids)
-                    
+
                 days_by_employee[employee_id][str_current_date][
                     'attendances'
                     ] = current_total_attendances