odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] resource: small improvement of Stuart's time_diff function 

bzr revid: rco@openerp.com-20121207102321-3e4rp9562on0zspg
This commit is contained in:
Raphael Collet 2012-12-07 11:23:21 +01:00
parent 5c4dba40f7
commit 5f933e0188
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/resource/faces/pcalendar.py
View File

@ -893,17 +893,13 @@ class Calendar(object):
#@-node:_build_mapping
#@+node:_recalc_working_time
def _recalc_working_time(self):
def time_diff(times):
diff = times[1] - times[0]
if diff <= 0: # happens when times span across midnight
diff += 24*60
return diff
def slot_sum_time(day):
slots = self.working_times.get(day, DEFAULT_WORKING_DAYS[day])
def time_diff(times):
(start, end) = times
if end == start:
return 24*60 # 24 hours
diff = end - start
if end < start:
diff += (24*60)
return diff
return sum(map(time_diff, slots))
self.day_times = map(slot_sum_time, range(0, 7))