Merge pull request #2004 from phili67/phili67-recurrence-id-bug-res

Phili67 recurrence id bug res
phili67 · Jan 16, 2022 · 28b8e52 · 28b8e52
2 parents 153299a + 6b91581
commit 28b8e52
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/src/EcclesiaCRM/APIControllers/CalendarEventV2Controller.php b/src/EcclesiaCRM/APIControllers/CalendarEventV2Controller.php
@@ -736,7 +736,7 @@ public function manageEvent(ServerRequestInterface $request, ResponseInterface $
 
             return $response->withJson( $calendarService->modifyEventFromCalendar($input->calendarID, $input->eventID, $input->reccurenceID, $input->start,
                 $input->end, $input->EventTitle, $input->EventDesc, $input->location, $input->addGroupAttendees, $input->alarm, $input->eventTypeID, $input->eventNotes,
-                $input->eventInActive, $input->Fields, $input->EventCountNotes, $input->endrecurrence) );
+                $input->eventInActive, $input->Fields, $input->EventCountNotes, $input->recurrenceValid, $input->recurrenceType, $input->endrecurrence) );
         }
 
         return $response->withJson(["status" => "failed"]);

diff --git a/src/EcclesiaCRM/Service/CalendarService.php b/src/EcclesiaCRM/Service/CalendarService.php
@@ -575,7 +575,7 @@ public function removeEventFromCalendar($calendarID, $eventID, $reccurenceID = n
 
     public function modifyEventFromCalendar($calendarID, $eventID, $reccurenceID, $start, $end, $EventTitle,
                                             $EventDesc, $location, $addGroupAttendees, $alarm, $eventTypeID,
-                                            $eventNotes, $eventInActive, $Fields, $EventCountNotes, $endrecurrence)
+                                            $eventNotes, $eventInActive, $Fields, $EventCountNotes, $recurrenceValid, $recurrenceType, $endrecurrence)
     {
         $old_event = EventQuery::Create()->findOneById($eventID);
 
@@ -599,9 +599,7 @@ public function modifyEventFromCalendar($calendarID, $eventID, $reccurenceID, $s
             $freqEventsCount = count($eventFullInfos['freqEvents']);
         }
 
-        $calendarService = new CalendarService();
-
-        if (isset($reccurenceID) && $reccurenceID != '') {// we're in a recursive event
+        if ( isset($reccurenceID) && $reccurenceID != '' ) {// we're in a recursive event
 
             try {
                 // we have to delete the old event from the reccurence event
@@ -616,7 +614,7 @@ public function modifyEventFromCalendar($calendarID, $eventID, $reccurenceID, $s
                     $calendarBackend->updateCalendarObject($oldCalendarID, $event['uri'], $vcalendar->serialize());
 
                     // now we add the new event
-                    $calendarService->createEventForCalendar(
+                    $this->createEventForCalendar(
                         $calendarID, $start, $end,
                         "", "", $EventDesc, $EventTitle, $location,
                         false, $addGroupAttendees, $alarm, $eventTypeID, $eventNotes,
@@ -626,11 +624,12 @@ public function modifyEventFromCalendar($calendarID, $eventID, $reccurenceID, $s
                     return ["status" => "success"];
                 } else {
                     $calendarBackend->deleteCalendarObject($oldCalendarID, $event['uri']);
+
                     // now we add the new event
-                    $calendarService->createEventForCalendar(
+                    $this->createEventForCalendar(
                         $calendarID, $start, $end,
-                        "", "", $EventDesc, $EventTitle, $location,
-                        false, $addGroupAttendees, $alarm, $eventTypeID, $eventNotes,
+                        $recurrenceType, $endrecurrence, $EventDesc, $EventTitle, $location,
+                        $recurrenceValid, $addGroupAttendees, $alarm, $eventTypeID, $eventNotes,
                         $eventInActive, $Fields, $EventCountNotes
                     );
                     return ["status" => "success"];
@@ -642,18 +641,29 @@ public function modifyEventFromCalendar($calendarID, $eventID, $reccurenceID, $s
                 $calendarBackend->updateCalendarObject($oldCalendarID, $event['uri'], $vcalendar->serialize());
 
                 // now we add the new event
-                $calendarService->createEventForCalendar(
+                $this->createEventForCalendar(
                     $calendarID, $start, $end,
                     "", "", $EventDesc, $EventTitle, $location,
                     false, $addGroupAttendees, $alarm, $eventTypeID, $eventNotes,
                     $eventInActive, $Fields, $EventCountNotes
                 );
             }
-        } /*else {
+        } else {
             // We have to use the sabre way to ensure the event is reflected in external connection : CalDav
             $calendarBackend->deleteCalendarObject($oldCalendarID, $event['uri']);
-        }*/
 
+            // now we add the new event
+            $this->createEventForCalendar(
+                $calendarID, $start, $end,
+                $recurrenceType, $endrecurrence, $EventDesc, $EventTitle, $location,
+                $recurrenceValid, $addGroupAttendees, $alarm, $eventTypeID, $eventNotes,
+                $eventInActive, $Fields, $EventCountNotes
+            );
+
+            return ["status" => "success"];
+        }
+
+        // this code is normally dead !!!!
 
         // Now we start to work with the new calendar
         if (is_array($calendarID)) {