Fix mapping of weekday recurrence rule with FREQ=DAILY;BYDAY=MO,TU,WE…

…,TH,FR ticket #847.
aluxnimm · Mar 23, 2018 · 4c7bbc4 · 4c7bbc4
1 parent f222760
commit 4c7bbc4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/CalDavSynchronizer/Implementation/Events/EventEntityMapper.cs b/CalDavSynchronizer/Implementation/Events/EventEntityMapper.cs
@@ -945,7 +945,15 @@ private void MapRecurrance2To1 (IEvent source, IReadOnlyCollection<IEvent> excep
           switch (sourceRecurrencePattern.Frequency)
           {
             case FrequencyType.Daily:
-              targetRecurrencePattern.RecurrenceType = OlRecurrenceType.olRecursDaily;
+              if (sourceRecurrencePattern.ByDay.Count > 0)
+              {
+                targetRecurrencePattern.RecurrenceType = OlRecurrenceType.olRecursWeekly;
+                targetRecurrencePattern.DayOfWeekMask = CommonEntityMapper.MapDayOfWeek2To1 (sourceRecurrencePattern.ByDay);
+              }
+              else
+              {
+                targetRecurrencePattern.RecurrenceType = OlRecurrenceType.olRecursDaily;
+              }
               break;
             case FrequencyType.Weekly:
               if (sourceRecurrencePattern.ByDay.Count > 0)

diff --git a/CalDavSynchronizer/Implementation/Tasks/TaskMapper.cs b/CalDavSynchronizer/Implementation/Tasks/TaskMapper.cs
@@ -521,7 +521,15 @@ private void MapRecurrance2To1 (ITodo source, ITaskItemWrapper targetWrapper, IE
           switch (sourceRecurrencePattern.Frequency)
           {
             case FrequencyType.Daily:
-              targetRecurrencePattern.RecurrenceType = OlRecurrenceType.olRecursDaily;
+              if (sourceRecurrencePattern.ByDay.Count > 0)
+              {
+                targetRecurrencePattern.RecurrenceType = OlRecurrenceType.olRecursWeekly;
+                targetRecurrencePattern.DayOfWeekMask = CommonEntityMapper.MapDayOfWeek2To1 (sourceRecurrencePattern.ByDay);
+              }
+              else
+              {
+                targetRecurrencePattern.RecurrenceType = OlRecurrenceType.olRecursDaily;
+              }
               break;
             case FrequencyType.Weekly:
               if (sourceRecurrencePattern.ByDay.Count > 0)