Merge lp:~agilebg/hr-timesheet/imp_hr_attendance_analysis_roundings into lp:~hr-core-editors/hr-timesheet/7.0

[Lorenzo Battistini]

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM, thanks !

review: Approve (code review, no tests)

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Lorenzo,

Please use correct indentation in if sentence for PEP8 compliance (higher than nested block).

Functionally speaking, it seems good, but maybe you can do:

if (float_end_time - float_start_time) < 0.0000001:

and simplify the condition.

Regards.

review: Needs Fixing (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Hello,

I think you can even use float_compare instead of float_is_zero. That way you can do the whole teste in one if.

http://bazaar.launchpad.net/~openerp/openobject-server/7.0/view/head:/openerp/tools/float_utils.py#L99

if float_compare(float_end_time, float_start_time, precision_rounding=0.0000001) == -1:

Cheers.

review: Needs Fixing

[lp:~agilebg/hr-timesheet/imp_hr_attendance_analysis_roundings]

63. By Lorenzo Battistini on 2014-05-21

[IMP] PEP8

[Lorenzo Battistini (elbati)]

Hello Pedro and Yannick,
I made the changes.
Thanks

[lp:~agilebg/hr-timesheet/imp_hr_attendance_analysis_roundings]

64. By Lorenzo Battistini on 2014-05-21

[IMP] using float_compare

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

thanks!

review: Approve (code review, no test)

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the changes.

Regards.

review: Approve (code review)

=== modified file 'hr_attendance_analysis/hr_attendance.py'
--- hr_attendance_analysis/hr_attendance.py	2013-11-25 08:21:41 +0000
+++ hr_attendance_analysis/hr_attendance.py	2014-05-21 17:38:28 +0000
@@ -26,6 +26,7 @@
 import time
 from datetime import *
 import math
+from openerp.tools import float_compare
 
 import pytz
 
@@ -75,10 +76,18 @@
         return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
 
     def time_difference(self, float_start_time, float_end_time):
-        if float_end_time < float_start_time:
-            raise orm.except_orm(_('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(
+        if float_compare(
+            float_end_time, float_start_time, precision_rounding=0.0000001
+        ) == -1:
+            # that means a difference smaller than 0.36 milliseconds
+            raise orm.except_orm(
+                _('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 self.total_seconds(delta) / 60.0 / 60.0