calendar: fix calendar exception when calendar does not repeat

backport nexedi/erp5!630

There was conflicts, because we have already backported
nexedi/erp5!137/

/reviewed-on https://lab.nexedi.com/nexedi/erp5-capago/merge_requests/19

product/ERP5/Document/PresencePeriod.py

@@ -171,7 +171,9 @@ class PresencePeriod(Movement, PeriodicityMixin):
              (current_exception_date < next_start_date.Date()):
             # SQL method don't like iterator
   #             yield (next_start_date, next_start_date+duration)
-            result.append([next_start_date, next_start_date + duration])
+            result.append({'start_date': next_start_date,
+                           'stop_date': next_start_date + duration,
+                           'quantity': self.getQuantity()})
             # Update the next exception date
             if len(exception_date_list) != 0:
               current_exception_date = exception_date_list.pop(0).Date()

product/ERP5/tests/testCalendar.py

@@ -1665,6 +1665,105 @@ class TestCalendar(ERP5ReportTestCase):
 
     self.assertEqual([], assignment.asMovementList())
 
+  def test_GroupCalendarPeriodExceptionWhenNoAvailability(self):
+    # #20171205-E91759 reproduction
+    group_calendar = self.portal.group_calendar_module.newContent(
+        portal_type='Group Calendar')
+    group_calendar_period = group_calendar.newContent(
+        portal_type='Group Presence Period')
+    group_calendar_period.setStartDate('2016/01/01 09:00')
+    group_calendar_period.setStopDate('2016/01/01 16:00')
+    group_calendar_period.setPeriodicityStopDate('2016/02/01')
+    group_calendar_period.setResourceValue(
+        self.portal.portal_categories.calendar_period_type.type1)
+    group_calendar_period.setPeriodicityWeekDayList(
+        ('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', ))
+    group_calendar.confirm()
+
+
+    # Add exception on 2016/01/02 which is a Saturday - day where the calendar
+    # does not repeat.
+    #
+    #     January 2016
+    #  Su Mo Tu We Th Fr Sa
+    #                  1  2
+    #   3  4  5  6  7  8  9
+    #  10 11 12 13 14 15 16
+    #  17 18 19 20 21 22 23
+    #  24 25 26 27 28 29 30
+    #  31
+    group_calendar_period.newContent(
+        portal_type="Calendar Exception",
+        exception_date=DateTime(2016, 1, 2))
+
+    person = self.portal.person_module.newContent(portal_type='Person')
+    assignment = self.portal.group_calendar_assignment_module.newContent(
+        specialise_value=group_calendar,
+        resource_value=self.portal.service_module.consulting_service,
+        start_date=DateTime(2016, 1, 1).earliestTime(),
+        stop_date=DateTime(2016, 1, 31).latestTime(),
+        destination_value=person)
+    assignment.confirm()
+    self.tic()
+    self.assertTrue(assignment.asMovementList())
+    self.assertEqual(
+        7 * 60 * 60 * 21, # 7 hours per day, 21 "business days"
+        self.portal.portal_simulation.getInventory(
+            portal_type=self.portal.getPortalCalendarPeriodTypeList(),
+            from_date=DateTime(2016, 1, 1).earliestTime(),
+            to_date=DateTime(2016, 1, 31).latestTime(),
+            node_uid=person.getUid()))
+
+  def test_GroupCalendarPeriodExceptionTwoExceptionsOnSameDay(self):
+    # #20171205-E91759 reproduction
+    group_calendar = self.portal.group_calendar_module.newContent(
+        portal_type='Group Calendar')
+    group_calendar_period = group_calendar.newContent(
+        portal_type='Group Presence Period')
+    group_calendar_period.setStartDate('2016/01/01 09:00')
+    group_calendar_period.setStopDate('2016/01/01 16:00')
+    group_calendar_period.setPeriodicityStopDate('2016/02/01')
+    group_calendar_period.setResourceValue(
+        self.portal.portal_categories.calendar_period_type.type1)
+    group_calendar_period.setPeriodicityWeekDayList(
+        ('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', ))
+    group_calendar.confirm()
+
+
+    # Add two exceptions on 2016/01/01
+    #
+    #     January 2016
+    #  Su Mo Tu We Th Fr Sa
+    #                  1  2
+    #   3  4  5  6  7  8  9
+    #  10 11 12 13 14 15 16
+    #  17 18 19 20 21 22 23
+    #  24 25 26 27 28 29 30
+    #  31
+    group_calendar_period.newContent(
+        portal_type="Calendar Exception",
+        exception_date=DateTime(2016, 1, 1))
+    group_calendar_period.newContent(
+        portal_type="Calendar Exception",
+        exception_date=DateTime(2016, 1, 1))
+
+    person = self.portal.person_module.newContent(portal_type='Person')
+    assignment = self.portal.group_calendar_assignment_module.newContent(
+        specialise_value=group_calendar,
+        resource_value=self.portal.service_module.consulting_service,
+        start_date=DateTime(2016, 1, 1).earliestTime(),
+        stop_date=DateTime(2016, 1, 31).latestTime(),
+        destination_value=person)
+    assignment.confirm()
+    self.tic()
+    self.assertTrue(assignment.asMovementList())
+    self.assertEqual(
+        7 * 60 * 60 * 20, # 7 hours per day, 20 "business days" ( because 01/01 is not counted)
+        self.portal.portal_simulation.getInventory(
+            portal_type=self.portal.getPortalCalendarPeriodTypeList(),
+            from_date=DateTime(2016, 1, 1).earliestTime(),
+            to_date=DateTime(2016, 1, 31).latestTime(),
+            node_uid=person.getUid()))
 
   def test_PersonModule_viewLeaveRequestReport(self):
     # in this test, type1 is the type for presences, type2 & type3 are types