Merge lp:~elbati/domsense-agilebg-addons/6.1_hr_attendance_analysis_ref into lp:domsense-agilebg-addons/6.1

[Lorenzo Battistini]

Fixes:
 - time_difference: allow small (< precision) time differences
 - if no next_attendance_ids found, avoid useless computations
 - consider attendances of type 'action' while searching for previous sign in

[lp:~elbati/domsense-agilebg-addons/6.1_hr_attendance_analysis_ref]

269. By Lorenzo Battistini on 2013-07-16

[add] from __future__ import division

Unmerged revisions

269. By Lorenzo Battistini on 2013-07-16

[add] from __future__ import division

268. By Lorenzo Battistini on 2013-07-15

[REF]

=== modified file 'hr_attendance_analysis/hr_attendance.py'
--- hr_attendance_analysis/hr_attendance.py	2013-01-04 14:00:01 +0000
+++ hr_attendance_analysis/hr_attendance.py	2013-07-16 07:07:29 +0000
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from __future__ import division
 from osv import fields, osv
 from tools.translate import _
 import time
@@ -69,10 +70,11 @@
         str_time = self.float_time_convert(float_val)
         return timedelta(0, int(str_time.split(':')[0]) * 60.0*60.0 + int(str_time.split(':')[1]) * 60.0)
 
-    def time_difference(self, float_start_time, float_end_time):
+    def time_difference(self, float_start_time, float_end_time, precision=(1.0/60)):
         if float_end_time < float_start_time:
-            raise osv.except_osv(_('Error'), _('End time %s < start time %s')
-                % (str(float_end_time),str(float_start_time)))
+            if float_start_time - float_end_time > precision:
+                raise osv.except_osv(_('Error'), _('End time %s < start time %s')
+                    % (str(float_end_time),str(float_start_time)))
         delta = self.float_to_datetime(float_end_time) - self.float_to_datetime(float_start_time)
         return delta.total_seconds() / 60.0 / 60.0
 
@@ -170,6 +172,7 @@
             # 2012.10.16 LF FIX : Attendance in context timezone
             attendance_start = datetime.strptime(attendance.name, '%Y-%m-%d %H:%M:%S').replace(tzinfo=pytz.utc).astimezone(active_tz)
             next_attendance_date = str_now
+            next_attendance_ids = False
             # should we compute for sign out too?
             if attendance.action == 'sign_in':
                 next_attendance_ids = self.search(cr, uid, [
@@ -181,121 +184,121 @@
                          # 2012.10.16 LF FIX : Attendance in context timezone
                          raise osv.except_osv(_('Error'), _('Incongruent data: sign-in %s is followed by another sign-in') % attendance_start)
                     next_attendance_date = next_attendance.name
-                # 2012.10.16 LF FIX : Attendance in context timezone
-                attendance_stop = datetime.strptime(next_attendance_date, '%Y-%m-%d %H:%M:%S').replace(tzinfo=pytz.utc).astimezone(active_tz)
-                duration_delta = attendance_stop - attendance_start
-                duration = duration_delta.total_seconds() / 60.0 / 60.0
-                duration = round(duration / precision) * precision
+                    # 2012.10.16 LF FIX : Attendance in context timezone
+                    attendance_stop = datetime.strptime(next_attendance_date, '%Y-%m-%d %H:%M:%S').replace(tzinfo=pytz.utc).astimezone(active_tz)
+                    duration_delta = attendance_stop - attendance_start
+                    duration = duration_delta.total_seconds() / 60.0 / 60.0
+                    duration = round(duration / precision) * precision
             res[attendance.id]['duration'] = duration
             res[attendance.id]['end_datetime'] = next_attendance_date
             # If contract is not specified: working days = 24/7
             res[attendance.id]['inside_calendar_duration'] = duration
             res[attendance.id]['outside_calendar_duration'] = 0.0
 
-            active_contract_ids = self.get_active_contracts(cr, uid, attendance.employee_id.id, date=str_now[:10])
+            if next_attendance_ids:
+                active_contract_ids = self.get_active_contracts(cr, uid, attendance.employee_id.id, date=str_now[:10])
 
-            if active_contract_ids:
-                contract = contract_pool.browse(cr, uid, active_contract_ids[0])
-                if contract.working_hours:
-                    # TODO applicare prima arrotondamento o tolleranza?
-                    if contract.working_hours.attendance_rounding:
-                        float_attendance_rounding = float(contract.working_hours.attendance_rounding)
-                        rounded_start_hour = self._ceil_rounding(float_attendance_rounding, attendance_start)
-                        rounded_stop_hour = self._floor_rounding(float_attendance_rounding, attendance_stop)
-                            
-                        if abs(1- rounded_start_hour) < 0.01: # if shift == 1 hour
-                            attendance_start = datetime(attendance_start.year, attendance_start.month,
-                                attendance_start.day, attendance_start.hour + 1)
-                        else:
-                            attendance_start = datetime(attendance_start.year, attendance_start.month,
-                                attendance_start.day, attendance_start.hour, int(round(rounded_start_hour * 60.0)))
+                if active_contract_ids:
+                    contract = contract_pool.browse(cr, uid, active_contract_ids[0])
+                    if contract.working_hours:
+                        # TODO applicare prima arrotondamento o tolleranza?
+                        if contract.working_hours.attendance_rounding:
+                            float_attendance_rounding = float(contract.working_hours.attendance_rounding)
+                            rounded_start_hour = self._ceil_rounding(float_attendance_rounding, attendance_start)
+                            rounded_stop_hour = self._floor_rounding(float_attendance_rounding, attendance_stop)
                                 
-                        attendance_stop = datetime(attendance_stop.year, attendance_stop.month,
-                            attendance_stop.day, attendance_stop.hour, int(round(rounded_stop_hour * 60.0)))
-                        
-                        # again
-                        duration_delta = attendance_stop - attendance_start
-                        duration = duration_delta.total_seconds() / 60.0 / 60.0
-                        duration = round(duration / precision) * precision
-                        res[attendance.id]['duration'] = duration
-                        
-                    res[attendance.id]['inside_calendar_duration'] = 0.0
-                    res[attendance.id]['outside_calendar_duration'] = 0.0
-                    calendar_id = contract.working_hours.id
-                    intervals_within = 0
-
-                    # split attendance in intervals = precision
-                    # 2012.10.16 LF FIX : no recursion in split attendance
-                    splitted_attendances = self._split_norecurse_attendance(attendance_start, duration, precision)
-                    counter = 0
-                    for atomic_attendance in splitted_attendances:
-                        counter += 1
-                        centered_attendance = atomic_attendance[0] + timedelta(0,0,0,0,0, atomic_attendance[1] / 2.0)
-                        centered_attendance_hour = centered_attendance.hour + centered_attendance.minute / 60.0 \
-                            + centered_attendance.second / 60.0 / 60.0
-                        # check if centered_attendance is within a working schedule                        
-                        # 2012.10.16 LF FIX : weekday must be single character not int
-                        weekday_char = str(unichr(centered_attendance.weekday() + 48))
-                        matched_schedule_ids = attendance_pool.search(cr, uid, [
-                            '&',
-                            '|',
-                            ('date_from', '=', False),
-                            ('date_from','<=',centered_attendance.date()),
-                            '|',
-                            ('dayofweek', '=', False),
-                            ('dayofweek','=',weekday_char),
-                            ('calendar_id','=',calendar_id),
-                            ('hour_to','>=',centered_attendance_hour),
-                            ('hour_from','<=',centered_attendance_hour),
-                            ])
-                        if len(matched_schedule_ids) > 1:
-                            raise osv.except_osv(_('Error'),
-                                _('Wrongly configured working schedule with id %s') % str(calendar_id))
-                        if matched_schedule_ids:
-                            intervals_within += 1
-                            # sign in tolerance
-                            if intervals_within == 1:
-                                calendar_attendance = attendance_pool.browse(cr, uid, matched_schedule_ids[0])
-                                attendance_start_hour = attendance_start.hour + attendance_start.minute / 60.0 \
-                                    + attendance_start.second / 60.0 / 60.0
-                                if attendance_start_hour >= calendar_attendance.hour_from and \
-                                    (attendance_start_hour - (calendar_attendance.hour_from +
-                                    calendar_attendance.tolerance_to)) < 0.01: # handling float roundings (<=)
-                                    additional_intervals = round(
-                                        (attendance_start_hour - calendar_attendance.hour_from) / precision)
-                                    intervals_within += additional_intervals
-                                    res[attendance.id]['duration'] = self.time_sum(
-                                        res[attendance.id]['duration'], additional_intervals * precision)
-                            # sign out tolerance
-                            if len(splitted_attendances) == counter:
-                                attendance_stop_hour = attendance_stop.hour + attendance_stop.minute / 60.0 \
-                                    + attendance_stop.second / 60.0 / 60.0
-                                calendar_attendance = attendance_pool.browse(cr, uid, matched_schedule_ids[0])
-                                if attendance_stop_hour <= calendar_attendance.hour_to and \
-                                    (attendance_stop_hour - (calendar_attendance.hour_to -
-                                    calendar_attendance.tolerance_from)) > -0.01: # handling float roundings (>=)
-                                    additional_intervals = round(
-                                        (calendar_attendance.hour_to - attendance_stop_hour) / precision)
-                                    intervals_within += additional_intervals
-                                    res[attendance.id]['duration'] = self.time_sum(
-                                        res[attendance.id]['duration'], additional_intervals * precision)
-
-                    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]['inside_calendar_duration'], res[attendance.id]['duration'])
-
-                    if contract.working_hours.overtime_rounding:
-                        if res[attendance.id]['outside_calendar_duration']:
-                            overtime = res[attendance.id]['outside_calendar_duration']
-                            if contract.working_hours.overtime_rounding_tolerance:
-                                overtime = self.time_sum(overtime,
-                                    contract.working_hours.overtime_rounding_tolerance)
-                            float_overtime_rounding = float(contract.working_hours.overtime_rounding)
-                            res[attendance.id]['outside_calendar_duration'] = math.floor(
-                                overtime * float_overtime_rounding) / float_overtime_rounding
-
+                            if abs(1- rounded_start_hour) < 0.01: # if shift == 1 hour
+                                attendance_start = datetime(attendance_start.year, attendance_start.month,
+                                    attendance_start.day, attendance_start.hour + 1)
+                            else:
+                                attendance_start = datetime(attendance_start.year, attendance_start.month,
+                                    attendance_start.day, attendance_start.hour, int(round(rounded_start_hour * 60.0)))
+                                    
+                            attendance_stop = datetime(attendance_stop.year, attendance_stop.month,
+                                attendance_stop.day, attendance_stop.hour, int(round(rounded_stop_hour * 60.0)))
+                            
+                            # again
+                            duration_delta = attendance_stop - attendance_start
+                            duration = duration_delta.total_seconds() / 60.0 / 60.0
+                            duration = round(duration / precision) * precision
+                            res[attendance.id]['duration'] = duration
+                            
+                        res[attendance.id]['inside_calendar_duration'] = 0.0
+                        res[attendance.id]['outside_calendar_duration'] = 0.0
+                        calendar_id = contract.working_hours.id
+                        intervals_within = 0
+
+                        # split attendance in intervals = precision
+                        # 2012.10.16 LF FIX : no recursion in split attendance
+                        splitted_attendances = self._split_norecurse_attendance(attendance_start, duration, precision)
+                        counter = 0
+                        for atomic_attendance in splitted_attendances:
+                            counter += 1
+                            centered_attendance = atomic_attendance[0] + timedelta(0,0,0,0,0, atomic_attendance[1] / 2.0)
+                            centered_attendance_hour = centered_attendance.hour + centered_attendance.minute / 60.0 \
+                                + centered_attendance.second / 60.0 / 60.0
+                            # check if centered_attendance is within a working schedule                        
+                            # 2012.10.16 LF FIX : weekday must be single character not int
+                            weekday_char = str(unichr(centered_attendance.weekday() + 48))
+                            matched_schedule_ids = attendance_pool.search(cr, uid, [
+                                '&',
+                                '|',
+                                ('date_from', '=', False),
+                                ('date_from','<=',centered_attendance.date()),
+                                '|',
+                                ('dayofweek', '=', False),
+                                ('dayofweek','=',weekday_char),
+                                ('calendar_id','=',calendar_id),
+                                ('hour_to','>=',centered_attendance_hour),
+                                ('hour_from','<=',centered_attendance_hour),
+                                ])
+                            if len(matched_schedule_ids) > 1:
+                                raise osv.except_osv(_('Error'),
+                                    _('Wrongly configured working schedule with id %s') % str(calendar_id))
+                            if matched_schedule_ids:
+                                intervals_within += 1
+                                # sign in tolerance
+                                if intervals_within == 1:
+                                    calendar_attendance = attendance_pool.browse(cr, uid, matched_schedule_ids[0])
+                                    attendance_start_hour = attendance_start.hour + attendance_start.minute / 60.0 \
+                                        + attendance_start.second / 60.0 / 60.0
+                                    if attendance_start_hour >= calendar_attendance.hour_from and \
+                                        (attendance_start_hour - (calendar_attendance.hour_from +
+                                        calendar_attendance.tolerance_to)) < 0.01: # handling float roundings (<=)
+                                        additional_intervals = round(
+                                            (attendance_start_hour - calendar_attendance.hour_from) / precision)
+                                        intervals_within += additional_intervals
+                                        res[attendance.id]['duration'] = self.time_sum(
+                                            res[attendance.id]['duration'], additional_intervals * precision)
+                                # sign out tolerance
+                                if len(splitted_attendances) == counter:
+                                    attendance_stop_hour = attendance_stop.hour + attendance_stop.minute / 60.0 \
+                                        + attendance_stop.second / 60.0 / 60.0
+                                    calendar_attendance = attendance_pool.browse(cr, uid, matched_schedule_ids[0])
+                                    if attendance_stop_hour <= calendar_attendance.hour_to and \
+                                        (attendance_stop_hour - (calendar_attendance.hour_to -
+                                        calendar_attendance.tolerance_from)) > -0.01: # handling float roundings (>=)
+                                        additional_intervals = round(
+                                            (calendar_attendance.hour_to - attendance_stop_hour) / precision)
+                                        intervals_within += additional_intervals
+                                        res[attendance.id]['duration'] = self.time_sum(
+                                            res[attendance.id]['duration'], additional_intervals * precision)
+
+                        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]['inside_calendar_duration'], res[attendance.id]['duration'], precision=precision)
+
+                        if contract.working_hours.overtime_rounding:
+                            if res[attendance.id]['outside_calendar_duration']:
+                                overtime = res[attendance.id]['outside_calendar_duration']
+                                if contract.working_hours.overtime_rounding_tolerance:
+                                    overtime = self.time_sum(overtime,
+                                        contract.working_hours.overtime_rounding_tolerance)
+                                float_overtime_rounding = float(contract.working_hours.overtime_rounding)
+                                res[attendance.id]['outside_calendar_duration'] = math.floor(
+                                    overtime * float_overtime_rounding) / float_overtime_rounding
         return res
 
     def _get_by_contracts(self, cr, uid, ids, context=None):
@@ -338,7 +341,9 @@
             elif attendance.action == 'sign_out':
                 previous_attendance_ids = self.search(cr, uid, [
                     ('employee_id', '=', attendance.employee_id.id),
-                    ('name', '<', attendance.name)], order='name')
+                    ('name', '<', attendance.name),
+                    ('action', '=', 'sign_in'),
+                    ], order='name')
                 if previous_attendance_ids and previous_attendance_ids[len(previous_attendance_ids) - 1] not in attendance_ids:
                     attendance_ids.append(previous_attendance_ids[len(previous_attendance_ids) - 1])    
         return attendance_ids