Merge lp:~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message into lp:~hr-core-editors/hr-timesheet/7.0

[Lorenzo Battistini]

This allows, when time diff errors are raised, to identify the raising attendance

[lp:~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message]

71. By Lorenzo Battistini on 2014-07-02

[FIX] syntax error

72. By Lorenzo Battistini on 2014-07-02

[imp] wizard error messages

73. By Lorenzo Battistini on 2014-07-02

[IMP] wizard error message

[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

73. By Lorenzo Battistini on 2014-07-02

[IMP] wizard error message

72. By Lorenzo Battistini on 2014-07-02

[imp] wizard error messages

71. By Lorenzo Battistini on 2014-07-02

[FIX] syntax error

70. By Lorenzo Battistini on 2014-07-02

[IMP] time_difference error msg
This allows, when time diff errors are raised, to identify the raising attendance

=== modified file 'hr_attendance_analysis/hr_attendance.py'
--- hr_attendance_analysis/hr_attendance.py	2014-05-21 22:04:08 +0000
+++ hr_attendance_analysis/hr_attendance.py	2014-07-02 12:01:10 +0000
@@ -75,16 +75,21 @@
     def total_seconds(self, td):
         return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
 
-    def time_difference(self, float_start_time, float_end_time):
+    def time_difference(
+        self, float_start_time, float_end_time, help_message=False
+    ):
         if float_compare(
             float_end_time, float_start_time, precision_rounding=0.0000001
         ) == -1:
             # that means a difference smaller than 0.36 milliseconds
+            message = _('End time %s < start time %s %s') % (
+                str(float_end_time),
+                str(float_start_time),
+                help_message and '(' + help_message + ')' or ''
+                )
             raise orm.except_orm(
                 _('Error'),
-                _('End time %s < start time %s') % (
-                    str(float_end_time), str(float_start_time)
-                )
+                message
             )
         delta = self.float_to_datetime(
             float_end_time) - self.float_to_datetime(
@@ -329,9 +334,12 @@
                     res[attendance.id]['inside_calendar_duration'] = intervals_within * precision
                     # make difference using time in order to avoid rounding errors
                     # inside_calendar_duration can't be > duration
-                    res[attendance.id]['outside_calendar_duration'] = self.time_difference(
+                    res[attendance.id][
+                        'outside_calendar_duration'
+                        ] = self.time_difference(
                         res[attendance.id]['inside_calendar_duration'],
-                        res[attendance.id]['duration'])
+                        res[attendance.id]['duration'],
+                        help_message='Attendance ID %s' % attendance.id)
 
                     if reference_calendar.overtime_rounding:
                         if res[attendance.id]['outside_calendar_duration']:
 
=== 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-07-02 12:01:10 +0000
@@ -167,8 +167,14 @@
                                 datetime.strptime(calendar_attendance.date_from,'%Y-%m-%d')
                                 <= current_date
                                 )):
-                                calendar_attendance_duration = attendance_pool.time_difference(
-                                    calendar_attendance.hour_from, calendar_attendance.hour_to)
+                                calendar_attendance_duration = (
+                                    attendance_pool.time_difference(
+                                        calendar_attendance.hour_from,
+                                        calendar_attendance.hour_to,
+                                        help_message=(
+                                            'Calendar attendance ID %s'
+                                            % calendar_attendance.id))
+                                    )
                                 if calendar_attendance_duration < 0:
                                     raise orm.except_orm(_('Error'),
                                         _("%s: 'Work to' is < 'Work from'")
@@ -219,14 +225,18 @@
                         'leaves'
                         ] = days_by_employee[employee_id][str_current_date]['due']
                 due_minus_leaves = attendance_pool.time_difference(
-                    current_total_leaves, current_total_due)
+                    current_total_leaves, current_total_due,
+                    help_message='Employee ID %s. Date %s' % (
+                        employee_id, str_current_date))
                 if due_minus_leaves < current_total_inside_calendar:
                     days_by_employee[employee_id][str_current_date]['negative'] = 0.0
                 else:
                     days_by_employee[employee_id][str_current_date][
                         'negative'
                         ] = attendance_pool.time_difference(
-                        current_total_inside_calendar, due_minus_leaves)
+                        current_total_inside_calendar, due_minus_leaves,
+                        help_message='Employee ID %s. Date %s' % (
+                            employee_id, str_current_date))
 
                 if reference_calendar:
                     if reference_calendar.leave_rounding: