Announcement: Allow add event when editing announcement - refs BT#18898

main/announcements/announcements.php

@@ -725,16 +725,14 @@ switch ($action) {
             </script>');
         }
 
-        if (empty($id)) {
         $form->addButtonAdvancedSettings(
             'add_event',
             get_lang('AddEventInCourseCalendar')
         );
         $form->addHtml('<div id="add_event_options" style="display:none;">');
-            $form->addDateTimePicker('event_date_start', get_lang('Date start'));
+        $form->addDateTimePicker('event_date_start', get_lang('DateStart'));
-            $form->addDateTimePicker('event_date_end', get_lang('Date end'));
+        $form->addDateTimePicker('event_date_end', get_lang('DateEnd'));
         $form->addHtml('</div>');
-        }
 
         if ($showSubmitButton) {
             $form->addLabel('',
@@ -776,6 +774,15 @@ switch ($action) {
                         $sendToUsersInSession
                     );
 
+                    if (!empty($data['event_date_start']) && !empty($data['event_date_end'])) {
+                        AnnouncementManager::createEvent(
+                            $id,
+                            $data['event_date_start'],
+                            $data['event_date_end'],
+                            empty($data['users']) ? ['everyone'] : $data['users']
+                        );
+                    }
+
                     // Send mail
                     $messageSentTo = [];