');
+ }
+ return;
+ }
+
+ 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();
+
+ // Check if it's a recurring appointment
+ const isRecurring = $('#id_is_recurring').is(':checked');
+
+ if (isRecurring) {
+ // Use the recurring form
+ const recurringForm = $('.appointment-form');
+
+ // Populate hidden fields for recurring appointments
+ $('#hidden_staff_member').val(staffMember);
+ $('#hidden_selected_date').val(date);
+ $('#hidden_selected_time').val(startTime);
+
+ if (rescheduledDate) {
+ const reasonForRescheduling = $('#reason_for_rescheduling').val();
+ $('#hidden_reason_for_rescheduling').val(reasonForRescheduling);
+ }
+
+ // 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);
- if (!form.find('input[name="appointment_request_id"]').length) {
+
+ // Add hidden fields to original form
+ if (!form.find('input[name="appointment_request_id"]').length && rescheduledDate) {
form.append($('', {
type: 'hidden',
name: 'appointment_request_id',
value: appointmentRequestId
}));
}
+
form.append($('', {type: 'hidden', name: 'date', value: date}));
form.append($('', {type: 'hidden', name: 'start_time', value: startTime}));
form.append($('', {type: 'hidden', name: 'end_time', value: endTime}));
form.append($('', {type: 'hidden', name: 'service', value: serviceId}));
- form.append($('', {type: 'hidden', name: 'reason_for_rescheduling', value: reasonForRescheduling}));
- form.submit();
- } else {
- const warningContainer = $('.warning-message');
- if (warningContainer.find('submit-warning') === 0) {
- warningContainer.append('
' + selectTimeSlotWarningTxt + '
');
+
+ if (rescheduledDate) {
+ const reasonForRescheduling = $('#reason_for_rescheduling').val();
+ form.append($('', {type: 'hidden', name: 'reason_for_rescheduling', value: reasonForRescheduling}));
}
+
+ form.submit();
}
});
@@ -313,7 +353,7 @@ function getAvailableSlots(selectedDate, staffId = null) {
$('#service-datetime-chosen').text(data.date_chosen);
isRequestInProgress = false;
},
- error: function() {
+ error: function () {
isRequestInProgress = false; // Ensure the flag is reset even if the request fails
}
});
diff --git a/appointment/templates/appointment/appointments.html b/appointment/templates/appointment/appointments.html
index 12abf72..d1fcca9 100644
--- a/appointment/templates/appointment/appointments.html
+++ b/appointment/templates/appointment/appointments.html
@@ -4,6 +4,7 @@
{% block customCSS %}
+
{% endblock %}
{% block title %}
{{ page_title }}
@@ -56,37 +57,107 @@
{% endif %}
-
+
+
+
+
+
+
+
+
+
+
+
+
-
{% trans "Service Details" %}
-
-
-
{{ service.name }}
-
{{ date_chosen }}
-
{{ service.get_duration }}
-
{{ service.get_price_text }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ {% trans "Configure settings to see preview" %}
+
+
+
+
+
+
+
{% if messages %}
{% for message in messages %}
+
+ {% if form %}{{ form.media }}{% endif %}
{% endblock %}
diff --git a/appointment/utils/db_helpers.py b/appointment/utils/db_helpers.py
index e563f8a..1f4d8cd 100644
--- a/appointment/utils/db_helpers.py
+++ b/appointment/utils/db_helpers.py
@@ -17,6 +17,7 @@
from django.core.exceptions import FieldDoesNotExist
from django.urls import reverse
from django.utils import timezone
+from django.db.models import Q
from appointment.logger_config import get_logger
from appointment.settings import (
@@ -119,8 +120,7 @@ def create_and_save_appointment(ar, client_data: dict, appointment_data: dict, r
"""
user = get_user_by_email(client_data['email'])
appointment = Appointment.objects.create(
- client=user, appointment_request=ar,
- **appointment_data
+ client=user, appointment_request=ar, **appointment_data
)
appointment.save()
logger.info(f"New appointment created: {appointment.to_dict()}")
@@ -348,6 +348,98 @@ def create_payment_info_and_get_url(appointment):
return payment_url
+def exclude_recurring_appointments(slots, staff_member, date, slot_duration):
+ """Exclude slots that are blocked by recurring appointments."""
+ from appointment.models import RecurringAppointment
+
+ # Get all active recurring appointments for this staff member
+ recurring_appointments = RecurringAppointment.objects.filter(
+ appointment_request__staff_member=staff_member,
+ is_active=True,
+ appointment_request__date__lte=date # Started on or before this date
+ ).filter(
+ Q(end_date__isnull=True) | Q(end_date__gte=date) # No end date or ends after this date
+ ).select_related('appointment_request')
+
+ available_slots = []
+ for slot in slots:
+ slot_end = slot + slot_duration
+ is_available = True
+
+ for recurring_appt in recurring_appointments:
+ # Check if this recurring appointment occurs on this date
+ if recurring_appt.occurs_on_date(date):
+ # Get the time range for this recurring appointment
+ recurring_start = datetime.datetime.combine(date, recurring_appt.appointment_request.start_time)
+ recurring_end = datetime.datetime.combine(date, recurring_appt.appointment_request.end_time)
+
+ # Check if slot conflicts with this recurring appointment
+ if recurring_start < slot_end and slot < recurring_end:
+ is_available = False
+ break
+
+ if is_available:
+ available_slots.append(slot)
+
+ return available_slots
+
+
+def create_recurring_appointment(appointment_request, recurrence_rule, end_date=None):
+ """Create a recurring appointment from an existing AppointmentRequest."""
+ from appointment.models import RecurringAppointment
+
+ recurring_appointment = RecurringAppointment.objects.create(
+ appointment_request=appointment_request,
+ recurrence_rule=_parse_recurrence_rule(recurrence_rule),
+ end_date=end_date
+ )
+
+ logger.info(f"Created recurring appointment: {recurring_appointment}")
+ return recurring_appointment
+
+
+def _parse_recurrence_rule(recurrence_rule_string):
+ """Convert RRULE string to django-recurrence Recurrence object."""
+ import recurrence
+ from datetime import datetime
+
+ if recurrence_rule_string.startswith('RRULE:'):
+ clean_rule = recurrence_rule_string[6:]
+ else:
+ clean_rule = recurrence_rule_string
+
+ rule_parts = clean_rule.split(';')
+ rule_params = {}
+ freq = None
+
+ for part in rule_parts:
+ key, value = part.split('=')
+ if key == 'FREQ':
+ if value == 'WEEKLY':
+ freq = recurrence.WEEKLY
+ elif value == 'DAILY':
+ freq = recurrence.DAILY
+ elif value == 'MONTHLY':
+ freq = recurrence.MONTHLY
+ elif key == 'BYDAY':
+ days = []
+ day_map = {
+ 'MO': recurrence.MONDAY, 'TU': recurrence.TUESDAY, 'WE': recurrence.WEDNESDAY,
+ 'TH': recurrence.THURSDAY, 'FR': recurrence.FRIDAY, 'SA': recurrence.SATURDAY, 'SU': recurrence.SUNDAY
+ }
+ for day in value.split(','):
+ if day in day_map:
+ days.append(day_map[day])
+ rule_params['byday'] = days
+ elif key == 'UNTIL':
+ until_dt = datetime.strptime(value, '%Y%m%dT%H%M%SZ')
+ rule_params['until'] = until_dt
+
+ # Create the Rule and Recurrence objects
+ rule = recurrence.Rule(freq, **rule_params)
+ return recurrence.Recurrence(rrules=[rule])
+
+
def exclude_booked_slots(appointments, slots, slot_duration=None):
"""Exclude the booked slots from the given list of slots.
diff --git a/appointment/views.py b/appointment/views.py
index c7c5d83..b9195b8 100644
--- a/appointment/views.py
+++ b/appointment/views.py
@@ -31,7 +31,8 @@
from appointment.settings import check_q_cluster
from appointment.utils.db_helpers import (
can_appointment_be_rescheduled, check_day_off_for_staff, create_and_save_appointment, create_new_user,
- create_payment_info_and_get_url, get_non_working_days_for_staff, get_user_by_email, get_user_model,
+ create_payment_info_and_get_url, create_recurring_appointment, get_non_working_days_for_staff, get_user_by_email,
+ get_user_model,
get_website_name, get_weekday_num_from_date, is_working_day, staff_change_allowed_on_reschedule,
username_in_user_model
)
@@ -223,38 +224,58 @@ def appointment_request(request, service_id=None, staff_member_id=None):
'date_chosen': date_chosen,
'locale': get_locale(),
'timezoneTxt': get_current_timezone_name(),
- 'label': label
+ 'label': label,
+ 'max_recurring_months': config.max_recurring_months,
}
context = get_generic_context_with_extra(request, extra_context, admin=False)
return render(request, 'appointment/appointments.html', context=context)
-def appointment_request_submit(request):
- """This view function handles the submission of the appointment request form.
+def _log_appointment_submission(cleaned_data):
+ """Log the details of the appointment submission."""
+ logger.info(
+ f"Appointment submission - date: {cleaned_data['date']}, "
+ f"start_time: {cleaned_data['start_time']}, end_time: {cleaned_data['end_time']}, "
+ f"service: {cleaned_data['service']}, staff: {cleaned_data['staff_member']}, "
+ f"is_recurring: {cleaned_data.get('is_recurring', False)}"
+ )
- :param request: The request instance.
- :return: The rendered HTML page.
- """
+
+def appointment_request_submit(request):
+ """This view function handles the submission of the appointment request form."""
if request.method == 'POST':
form = AppointmentRequestForm(request.POST)
if form.is_valid():
- # Use form.cleaned_data to get the cleaned and validated data
staff_member = form.cleaned_data['staff_member']
- staff_exists = StaffMember.objects.filter(id=staff_member.id).exists()
- if not staff_exists:
+ if not StaffMember.objects.filter(id=staff_member.id).exists():
messages.error(request, _("Selected staff member does not exist."))
else:
- logger.info(
- f"date_f {form.cleaned_data['date']} start_time {form.cleaned_data['start_time']} end_time "
- f"{form.cleaned_data['end_time']} service {form.cleaned_data['service']} staff {staff_member}")
+ _log_appointment_submission(form.cleaned_data)
+
+ # Create the base AppointmentRequest
ar = form.save()
+
+ # Check if it's recurring
+ is_recurring = form.cleaned_data.get('is_recurring')
+ if is_recurring:
+ recurrence_rule = form.cleaned_data.get('recurrence_rule')
+ end_recurrence = form.cleaned_data.get('end_recurrence')
+
+ if recurrence_rule:
+ try:
+ # Create the recurring appointment linked to this AppointmentRequest
+ create_recurring_appointment(ar, recurrence_rule, end_recurrence)
+ logger.info(f"Created recurring appointment for AppointmentRequest {ar.id}")
+ except Exception as e:
+ logger.error(f"Error creating recurring appointment: {e}")
+ # Don't fail the whole request, just log the error
+
request.session[f'appointment_completed_{ar.id_request}'] = False
- # Redirect the user to the account creation page
- return redirect('appointment:appointment_client_information', appointment_request_id=ar.id,
+ return redirect('appointment:appointment_client_information',
+ appointment_request_id=ar.id,
id_request=ar.id_request)
else:
- # Handle the case if the form is not valid
messages.error(request, _('There was an error in your submission. Please check the form and try again.'))
else:
form = AppointmentRequestForm()
diff --git a/requirements.txt b/requirements.txt
index c1d4251..9c7a39b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,5 @@ python-dotenv==1.1.0
colorama~=0.4.6
django-q2==1.8.0
icalendar~=6.3.1
+icalendar~=6.1.3
+django-recurrence>=1.11.1
From 4cc4754becae3819f396319d0ae674e0ea478517 Mon Sep 17 00:00:00 2001
From: Adams Pierre David <57180807+adamspd@users.noreply.github.com>
Date: Tue, 10 Jun 2025 01:11:29 +0200
Subject: [PATCH 2/5] check all necessary fields are given
---
appointment/static/js/appointments.js | 6 +++
.../templates/appointment/appointments.html | 53 ++++++++++++++++++-
2 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/appointment/static/js/appointments.js b/appointment/static/js/appointments.js
index cccaf70..ea58a42 100644
--- a/appointment/static/js/appointments.js
+++ b/appointment/static/js/appointments.js
@@ -252,6 +252,7 @@ function getAvailableSlots(selectedDate, staffId = null) {
// Clear previous error messages and slots
slotList.empty();
+ $('.btn-submit-appointment').attr('disabled', 'disabled');
errorMessageContainer.find('.djangoAppt_no-availability-text').remove();
// Remove the "Next available date" message
@@ -343,6 +344,11 @@ function getAvailableSlots(selectedDate, staffId = null) {
// Enable the submit button
$('.btn-submit-appointment').removeAttr('disabled');
+ //revalidate the recurring settings
+ if (window.revalidateSubmitButton) {
+ window.revalidateSubmitButton();
+ }
+
// Continue with the existing logic
const selectedSlot = $(this).text();
$('#service-datetime-chosen').text(data.date_chosen + ' ' + selectedSlot);
diff --git a/appointment/templates/appointment/appointments.html b/appointment/templates/appointment/appointments.html
index d1fcca9..3456cfa 100644
--- a/appointment/templates/appointment/appointments.html
+++ b/appointment/templates/appointment/appointments.html
@@ -229,6 +229,15 @@
}
}
+ window.revalidateSubmitButton = function () {
+ console.log('revalidateSubmitButton called');
+ console.log('Recurring checked:', isRecurringCheckbox.checked);
+ console.log('End date value:', endDateInput.value);
+
+ // Force validation regardless of current button state
+ return validateRecurringSettings();
+ };
+
// Sync form data with hidden fields
function syncFormData() {
const staffSelect = document.getElementById('staff_id');
@@ -365,6 +374,42 @@
previewText.textContent = previewHtml || 'Configure settings';
}
+ // Validate recurring settings and update submit button state
+ function validateRecurringSettings() {
+ const submitButton = document.querySelector('.btn-submit-appointment');
+
+ if (isRecurringCheckbox.checked) {
+ // If recurring is enabled, end date is required
+ const hasEndDate = endDateInput.value && endDateInput.value.trim() !== '';
+
+ if (!hasEndDate) {
+ submitButton.disabled = true;
+ submitButton.title = 'End date is required for recurring appointments';
+ return false;
+ }
+
+ // If weekly, at least one day must be selected
+ if (frequencySelect.value === 'WEEKLY') {
+ const selectedDays = document.querySelectorAll('.day-button.selected');
+ if (selectedDays.length === 0) {
+ submitButton.disabled = true;
+ submitButton.title = 'Select at least one day for weekly recurring appointments';
+ return false;
+ }
+ }
+ }
+
+ // If we get here, validation passed - but don't enable if other conditions aren't met
+ // (like no time slot selected - that's handled by the original appointments.js logic)
+ const hasSelectedSlot = document.querySelector('.djangoAppt_appointment-slot.selected');
+ if (hasSelectedSlot) {
+ submitButton.disabled = false;
+ submitButton.title = '';
+ }
+
+ return true;
+ }
+
// Toggle recurring settings visibility
if (isRecurringCheckbox && recurrenceFieldsDiv) {
isRecurringCheckbox.addEventListener('change', function () {
@@ -375,6 +420,7 @@