Emails and ics file contains recurrence if exists

Selected date on calendar is the same in "until" field by default
Added documentation (needs update)
Added RecurrenceAppointment object in admin.py
Removed the JS for recurring appointment in HTML file (added in its own
js file)

Author: adamspd

README.md

@@ -29,7 +29,7 @@ task scheduling. It also allows clients to reschedule appointments if it is allo
 Django-Appointment is a Django app engineered for managing appointment scheduling with ease and flexibility. It enables
 users to define custom configurations for time slots, lead time, and finish time, or use the default values
 provided. This app proficiently manages conflicts and availability for appointments, ensuring a seamless user
-experience.
+experience. It now also includes the capability to schedule recurring appointments.
 
 For a detailed walkthrough and live example of the system, please refer to
 [this tutorial](https://github.com/adamspd/django-appointment/tree/main/docs/explanation.md).
@@ -52,6 +52,7 @@ and [here](https://github.com/adamspd/django-appointment/tree/main/docs/release_
    - Automated email reminders sent 24 hours before the appointment (requires Django Q).
    - ICS file attachment for calendar synchronization.
 7. Integration with Django Q for efficient task scheduling and email sending.
+8. Recurring Appointments: Schedule appointments that repeat daily, weekly, or monthly, with a 3-month default end date.
 
 ## Key features introduced in previous versions.
 

appointment/admin.py

@@ -11,7 +11,7 @@
 
 from .models import (
     Appointment, AppointmentRequest, AppointmentRescheduleHistory, Config, DayOff, EmailVerificationCode,
-    PasswordResetToken, Service, StaffMember, WorkingHours
+    PasswordResetToken, RecurringAppointment, Service, StaffMember, WorkingHours
 )
 
 
@@ -36,6 +36,15 @@ class AppointmentAdmin(admin.ModelAdmin):
     list_filter = ('client', 'appointment_request__service',)
 
 
+@admin.register(RecurringAppointment)
+class RecurringAppointmentAdmin(admin.ModelAdmin):
+    list_display = ('appointment_request', 'recurrence_rule', 'end_date', 'is_active', 'created_at',)
+    search_fields = ('appointment_request__service__name',)
+    list_filter = ('end_date', 'recurrence_rule')
+    date_hierarchy = 'created_at'
+    ordering = ('-created_at',)
+
+
 @admin.register(EmailVerificationCode)
 class EmailVerificationCodeAdmin(admin.ModelAdmin):
     list_display = ('user', 'code')

appointment/models.py

@@ -364,6 +364,17 @@ def increment_reschedule_attempts(self):
     def get_reschedule_history(self):
         return self.reschedule_histories.all().order_by('-created_at')
 
+    def is_recurring(self):
+        """Check if this appointment request is recurring."""
+        return hasattr(self, 'recurring_info') and self.recurring_info is not None
+
+    @property
+    def recurrence_description(self):
+        """Get the recurrence description if this is a recurring appointment."""
+        if self.is_recurring():
+            return self.recurring_info.get_recurrence_description()
+        return None
+
 
 class AppointmentRescheduleHistory(models.Model):
     appointment_request = models.ForeignKey(
@@ -668,6 +679,81 @@ def occurs_on_date(self, target_date):
             logger.error(f"Error checking recurrence for {self}: {e}")
             return False
 
+    def get_recurrence_description(self):
+        """Get a human-readable description of the recurrence pattern."""
+        from django.utils.translation import gettext as _
+
+        if not self.recurrence_rule or not self.recurrence_rule.rrules:
+            return None
+
+        rrule = self.recurrence_rule.rrules[0]
+        description_parts = []
+
+        # Handle weekly with specific days
+        if rrule.freq == 2:  # Weekly
+            weekday_map = {
+                0: _('Monday'), 1: _('Tuesday'), 2: _('Wednesday'), 3: _('Thursday'),
+                4: _('Friday'), 5: _('Saturday'), 6: _('Sunday')
+            }
+
+            days = []
+            if hasattr(rrule, 'byday') and rrule.byday:
+                for weekday in rrule.byday:
+                    if isinstance(weekday, int) and weekday in weekday_map:
+                        days.append(str(weekday_map[weekday]))
+
+            if days:
+                if len(days) == 1:
+                    description_parts.append(str(_('Every week on {day}').format(day=days[0])))
+                elif len(days) == 7:
+                    description_parts.append(str(_('Every day')))
+                else:
+                    description_parts.append(str(_('Every week on {days}').format(days=', '.join(days))))
+            else:
+                # If no specific days are set, fall back to using the appointment start date
+                appointment_date = self.appointment_request.date
+                weekday_num = appointment_date.weekday()  # 0=Monday, 6=Sunday
+                day_name = str(weekday_map[weekday_num])
+                description_parts.append(str(_('Every week on {day}').format(day=day_name)))
+
+        elif rrule.freq == 1:  # Monthly
+            # Get the day of the month from the original appointment date
+            appointment_date = self.appointment_request.date
+            day_of_month = appointment_date.day
+
+            # Format with ordinal (1st, 2nd, 3rd, etc.)
+            if 10 <= day_of_month % 100 <= 20:
+                suffix = 'th'
+            else:
+                suffix = {1: 'st', 2: 'nd', 3: 'rd'}.get(day_of_month % 10, 'th')
+
+            description_parts.append(str(_('Every month on the {day}').format(day=f"{day_of_month}{suffix}")))
+
+        elif rrule.freq == 3:  # Daily
+            description_parts.append(str(_('Every day')))
+        elif rrule.freq == 0:  # Yearly
+            # Get the date from the original appointment
+            appointment_date = self.appointment_request.date
+            date_str = appointment_date.strftime('%B %d')  # e.g., "July 15"
+            description_parts.append(str(_('Every year on {date}').format(date=date_str)))
+        else:
+            # Other frequencies
+            freq_map = {
+                4: _('Every hour'),
+                5: _('Every minute'),
+                6: _('Every second')
+            }
+            frequency = freq_map.get(rrule.freq, _('Unknown frequency'))
+            description_parts.append(str(frequency))
+
+        # Add end date if present
+        if self.end_date:
+            description_parts.append(str(_('until {date}').format(date=self.end_date.strftime('%B %d, %Y'))))
+        elif hasattr(rrule, 'until') and rrule.until:
+            description_parts.append(str(_('until {date}').format(date=rrule.until.strftime('%B %d, %Y'))))
+
+        return ' '.join(description_parts)
+
 
 class Config(models.Model):
     """

appointment/static/js/appointments.js

@@ -93,83 +93,90 @@ body.on('click', '.djangoAppt_btn-request-next-slot', function () {
 })
 
 body.on('click', '.btn-submit-appointment', function (e) {
-    e.preventDefault(); // Prevent default form submission
+    e.preventDefault();
 
-    const selectedSlot = $('.djangoAppt_appointment-slot.selected').text();
-    const selectedDate = $('.djangoAppt_date_chosen').text();
+    const $slot = $('.djangoAppt_appointment-slot.selected');
+    const $date = $('.djangoAppt_date_chosen');
+    const selectedSlot = $slot.text().trim();
+    const selectedDate = $date.text().trim();
 
-    // Validate that both slot and date are selected
+    // Validate selection
     if (!selectedSlot || !selectedDate) {
         alert(selectDateAndTimeAlertTxt);
         return;
     }
 
-    // Additional validation - check if we actually have meaningful data
+    // Additional validation
+    const $warning = $('.warning-message');
     if (!selectedSlot.trim() || !selectedDate.trim()) {
-        const warningContainer = $('.warning-message');
-        if (warningContainer.find('.submit-warning').length === 0) {
-            warningContainer.append('<p class="submit-warning">' + selectTimeSlotWarningTxt + '</p>');
+        if ($warning.find('.submit-warning').length === 0) {
+            $warning.append(`<p class="submit-warning">${selectTimeSlotWarningTxt}</p>`);
         }
         return;
     }
 
+    // Extract time and date
     const startTime = convertTo24Hour(selectedSlot);
-    const dateParts = selectedDate.split(', ');
-    const monthDayYear = dateParts[1] + "," + dateParts[2];
-    const formattedDate = new Date(monthDayYear + " " + startTime);
-    const date = formattedDate.toISOString().slice(0, 10);
-    const endTimeDate = new Date(formattedDate.getTime() + serviceDuration * 60000);
-    const endTime = formatTime(endTimeDate);
 
-    // Get the staff member value
-    const staffMember = $('#staff_id').val();
+    const dateParts = selectedDate.split(', '); // e.g. ["Tuesday", "June 11", "2025"]
+    if (dateParts.length < 3) {
+        alert('Invalid date format. Please select a valid appointment date.');
+        return;
+    }
 
-    // Check if it's a recurring appointment
-    const isRecurring = $('#id_is_recurring').is(':checked');
+    const monthDayYear = `${dateParts[1]} ${dateParts[2]}`; // "June 11 2025"
+    const formattedDate = new Date(`${monthDayYear} ${startTime}`);
+    if (isNaN(formattedDate)) {
+        console.error('Invalid formatted date:', `${monthDayYear} ${startTime}`);
+        alert('Invalid date/time. Please verify your selections.');
+        return;
+    }
 
-    if (isRecurring) {
-        // Use the recurring form
-        const recurringForm = $('.appointment-form');
+    const date = formattedDate.toISOString().slice(0, 10);
+    const endTime = formatTime(new Date(formattedDate.getTime() + serviceDuration * 60000));
 
-        // Populate hidden fields for recurring appointments
-        $('#hidden_staff_member').val(staffMember);
-        $('#hidden_selected_date').val(date);
-        $('#hidden_selected_time').val(startTime);
+    const staffMember = $('#staff_id').val();
+    const isRecurring = $('#id_is_recurring').is(':checked');
+    const $form = $('.appointment-form');
+
+    // Prepare hidden fields
+    const hiddenFields = [
+        { name: 'date', value: date },
+        { name: 'start_time', value: startTime },
+        { name: 'end_time', value: endTime },
+        { name: 'service', value: serviceId },
+        { name: 'staff_member', value: staffMember }
+    ];
+
+    if (rescheduledDate) {
+        hiddenFields.push({
+            name: 'reason_for_rescheduling',
+            value: $('#reason_for_rescheduling').val()
+        });
+    }
 
-        if (rescheduledDate) {
-            const reasonForRescheduling = $('#reason_for_rescheduling').val();
-            $('#hidden_reason_for_rescheduling').val(reasonForRescheduling);
-        }
+    if (!isRecurring) {
+        const actionUrl = rescheduledDate ? appointmentRescheduleURL : appointmentRequestSubmitURL;
+        $form.attr('action', actionUrl);
 
-        // Submit the form with recurring data
-        recurringForm.submit();
-    } else {
-        // Use the original form for single appointments
-        const form = $('.appointment-form');
-        let formAction = rescheduledDate ? appointmentRescheduleURL : appointmentRequestSubmitURL;
-        form.attr('action', formAction);
-
-        // Add hidden fields to original form
-        if (!form.find('input[name="appointment_request_id"]').length && rescheduledDate) {
-            form.append($('<input>', {
-                type: 'hidden',
+        if (rescheduledDate && !$form.find('input[name="appointment_request_id"]').length) {
+            hiddenFields.push({
                 name: 'appointment_request_id',
                 value: appointmentRequestId
-            }));
-        }
-
-        form.append($('<input>', {type: 'hidden', name: 'date', value: date}));
-        form.append($('<input>', {type: 'hidden', name: 'start_time', value: startTime}));
-        form.append($('<input>', {type: 'hidden', name: 'end_time', value: endTime}));
-        form.append($('<input>', {type: 'hidden', name: 'service', value: serviceId}));
-
-        if (rescheduledDate) {
-            const reasonForRescheduling = $('#reason_for_rescheduling').val();
-            form.append($('<input>', {type: 'hidden', name: 'reason_for_rescheduling', value: reasonForRescheduling}));
+            });
         }
+    }
 
-        form.submit();
+    // Append fields and submit
+    for (const field of hiddenFields) {
+        $form.append($('<input>', {
+            type: 'hidden',
+            name: field.name,
+            value: field.value
+        }));
     }
+
+    $form.submit();
 });
 
 $('#staff_id').on('change', function () {