From 90e6bd7133ac505344d029e604dc70c05cfff8ce Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Tue, 8 Apr 2014 16:31:35 +0200 Subject: [PATCH] ERP5/PresencePeriod : rename _getDatePeriodList to _getDatePeriodDataList Not only returns start and stop dates, but also quantity defined on presence periods. This make it possible to set 3 hours availability in a time range of 10 hours. --- product/ERP5/Document/PresencePeriod.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/product/ERP5/Document/PresencePeriod.py b/product/ERP5/Document/PresencePeriod.py index d19d134706..a3fdf18b78 100644 --- a/product/ERP5/Document/PresencePeriod.py +++ b/product/ERP5/Document/PresencePeriod.py @@ -107,7 +107,7 @@ class PresencePeriod(Movement, PeriodicityMixin): stop_date=from_date)) return result - def _getDatePeriodList(self): + def _getDatePeriodDataList(self): """ Get all periods between periodicity start date and periodicity stop date @@ -159,8 +159,9 @@ class PresencePeriod(Movement, PeriodicityMixin): else: # SQL method don't like iterator # yield (next_start_date, next_start_date+duration) - result.append([next_start_date, - addToDate(next_start_date, second=second_duration)]) + result.append({'start_date': next_start_date, + 'stop_date': addToDate(next_start_date, second=second_duration), + 'quantity': self.getQuantity()}) next_start_date = self.getNextPeriodicalDate(next_start_date) return result -- 2.30.9