Added feature for client to be able to reschedule

Author: adamspd

appointment/admin.py

@@ -9,8 +9,8 @@
 from django import forms
 from django.contrib import admin
 
-from .models import (
-    Appointment, AppointmentRequest, Config, DayOff, EmailVerificationCode, Service, StaffMember, WorkingHours)
+from .models import (Appointment, AppointmentRequest, AppointmentRescheduleHistory, Config, DayOff,
+                     EmailVerificationCode, Service, StaffMember, WorkingHours)
 
 
 @admin.register(Service)
@@ -76,3 +76,18 @@ class WorkingHoursAdmin(admin.ModelAdmin):
     list_display = ('staff_member', 'day_of_week', 'start_time', 'end_time')
     search_fields = ('day_of_week',)
     list_filter = ('day_of_week', 'start_time', 'end_time')
+
+
+@admin.register(AppointmentRescheduleHistory)
+class AppointmentRescheduleHistoryAdmin(admin.ModelAdmin):
+    list_display = (
+        'appointment_request', 'date', 'start_time',
+        'end_time', 'staff_member', 'reason_for_rescheduling', 'created_at'
+    )
+    search_fields = (
+        'appointment_request__id_request', 'staff_member__user__first_name',
+        'staff_member__user__last_name', 'reason_for_rescheduling'
+    )
+    list_filter = ('appointment_request__service', 'date', 'created_at')
+    date_hierarchy = 'created_at'
+    ordering = ('-created_at',)

appointment/forms.py

@@ -11,7 +11,10 @@
 from phonenumber_field.formfields import PhoneNumberField
 from phonenumber_field.widgets import PhoneNumberPrefixWidget
 
-from .models import Appointment, AppointmentRequest, DayOff, Service, StaffMember, WorkingHours
+from .models import (
+    Appointment, AppointmentRequest, AppointmentRescheduleHistory, DayOff, Service, StaffMember,
+    WorkingHours
+)
 from .utils.db_helpers import get_user_model
 
 
@@ -21,6 +24,15 @@ class Meta:
         fields = ('date', 'start_time', 'end_time', 'service', 'staff_member')
 
 
+class ReschedulingForm(forms.ModelForm):
+    class Meta:
+        model = AppointmentRescheduleHistory
+        fields = ['reason_for_rescheduling']
+        widgets = {
+            'reason_for_rescheduling': forms.Textarea(attrs={'rows': 4, 'placeholder': 'Reason for rescheduling...'}),
+        }
+
+
 class AppointmentForm(forms.ModelForm):
     phone = PhoneNumberField(widget=PhoneNumberPrefixWidget(initial='US'))
 

appointment/services.py

@@ -23,7 +23,8 @@
 from appointment.utils.db_helpers import (
     Appointment, AppointmentRequest, EmailVerificationCode, Service, StaffMember, WorkingHours, calculate_slots,
     calculate_staff_slots, check_day_off_for_staff, create_and_save_appointment, create_new_user,
-    day_off_exists_for_date_range, exclude_booked_slots, get_all_appointments, get_all_staff_members,
+    day_off_exists_for_date_range, exclude_booked_slots, exclude_pending_reschedules, get_all_appointments,
+    get_all_staff_members,
     get_appointment_by_id, get_appointments_for_date_and_time, get_staff_member_appointment_list,
     get_staff_member_from_user_id_or_logged_in, get_times_from_config, get_user_by_email,
     get_working_hours_for_staff_and_day, parse_name, update_appointment_reminder, working_hours_exist)
@@ -304,7 +305,7 @@ def get_working_hours_and_days_off_context(request, btn_txt, form_name, form, us
     return context
 
 
-def save_appointment(appt, client_name, client_email, start_time, phone_number, client_address, service_id,
+def save_appointment(appt, client_name, client_email, start_time, phone_number, client_address, service_id, request,
                      want_reminder=False, additional_info=None):
     """Save an appointment's details.
     :return: The modified appointment.
@@ -329,7 +330,7 @@ def save_appointment(appt, client_name, client_email, start_time, phone_number,
 
     # Update reminder here
     update_appointment_reminder(appointment=appt, new_date=appt_request.date, new_start_time=start_time,
-                                want_reminder=want_reminder)
+                                want_reminder=want_reminder, request=request)
 
     appt_request.service = service
     appt_request.start_time = start_time
@@ -345,12 +346,13 @@ def save_appointment(appt, client_name, client_email, start_time, phone_number,
     return appt
 
 
-def save_appt_date_time(appt_start_time, appt_date, appt_id):
+def save_appt_date_time(appt_start_time, appt_date, appt_id, request):
     """Save the date and time of an appointment request.
 
     :param appt_start_time: The start time of the appointment request.
     :param appt_date: The date of the appointment request.
     :param appt_id: The ID of the appointment to modify.
+    :param request: The request object.
     :return: The modified appointment.
     """
     appt = Appointment.objects.get(id=appt_id)
@@ -373,7 +375,8 @@ def save_appt_date_time(appt_start_time, appt_date, appt_id):
         appt_date_obj = appt_date
 
     # Update reminder here
-    update_appointment_reminder(appointment=appt, new_date=appt_date_obj, new_start_time=appt_start_time_obj)
+    update_appointment_reminder(appointment=appt, new_date=appt_date_obj, new_start_time=appt_start_time_obj,
+                                request=request)
 
     # Modify and save appointment request details
     appt_request = appt.appointment_request
@@ -422,6 +425,7 @@ def get_available_slots_for_staff(date, staff_member):
 
     slot_duration = datetime.timedelta(minutes=staff_member.get_slot_duration())
     slots = calculate_staff_slots(date, staff_member)
+    slots = exclude_pending_reschedules(slots, staff_member, date)
     appointments = get_appointments_for_date_and_time(date, working_hours_dict['start_time'],
                                                       working_hours_dict['end_time'], staff_member)
     slots = exclude_booked_slots(appointments, slots, slot_duration)
@@ -594,7 +598,7 @@ def create_new_appointment(data, request):
         'additional_info': data.get("additional_info", ""),
         'paid': False
     }
-    appointment = create_and_save_appointment(appointment_request, client_data, appointment_data)
+    appointment = create_and_save_appointment(appointment_request, client_data, appointment_data, request)
     appointment_list = convert_appointment_to_json(request, [appointment])
 
     return json_response("Appointment created successfully.", custom_data={'appt': appointment_list})
@@ -613,7 +617,8 @@ def update_existing_appointment(data, request):
             client_address=data.get("client_address"),
             service_id=data.get("service_id"),
             want_reminder=want_reminder,
-            additional_info=data.get("additional_info")
+            additional_info=data.get("additional_info"),
+            request=request,
         )
         appointments_json = convert_appointment_to_json(request, [appt])[0]
         return json_response(appt_updated_successfully, custom_data={'appt': appointments_json})

appointment/settings.py

@@ -65,6 +65,6 @@ def check_q_cluster():
         for warning in missing_conf:
             logger.warning(warning)
         return False
-    print(f"Mising conf: {missing_conf}")
+    print(f"Missing conf: {missing_conf}")
     # Both 'django_q' is installed and 'Q_CLUSTER' is configured
     return True

appointment/static/img/dog-family-colored-doodle-drawing.webp

@@ -2,12 +2,13 @@ const calendarEl = document.getElementById('calendar');
 let nextAvailableDateSelector = $('.djangoAppt_next-available-date')
 const body = $('body');
 let nonWorkingDays = [];
-let selectedDate = null;
+let selectedDate = rescheduledDate || null;
 let staffId = $('#staff_id').val() || null;
 let previouslySelectedCell = null;
 
 const calendar = new FullCalendar.Calendar(calendarEl, {
     initialView: 'dayGridMonth',
+    initialDate: selectedDate,
     headerToolbar: {
         left: 'title',
         right: 'prev,today,next',
@@ -43,6 +44,9 @@ const calendar = new FullCalendar.Calendar(calendarEl, {
         selectedDate = info.dateStr;
         getAvailableSlots(info.dateStr, staffId);
     },
+    datesSet: function (info) {
+        highlightSelectedDate();
+    },
     selectAllow: function (info) {
         const day = info.start.getDay();  // Get the day of the week (0 for Sunday, 6 for Saturday)
         if (nonWorkingDays.includes(day)) {
@@ -64,10 +68,20 @@ calendar.setOption('locale', locale);
 $(document).ready(function () {
     staffId = $('#staff_id').val() || null;
     calendar.render();
-    const currentDate = moment.tz(timezone).format('YYYY-MM-DD');
+    const currentDate = rescheduledDate || moment.tz(timezone).format('YYYY-MM-DD');
     getAvailableSlots(currentDate, staffId);
 });
 
+function highlightSelectedDate() {
+    setTimeout(function () {
+        const dateCell = document.querySelector(`.fc-daygrid-day[data-date='${selectedDate}']`);
+        if (dateCell) {
+            dateCell.classList.add('selected-cell');
+            previouslySelectedCell = dateCell;
+        }
+    }, 10);
+}
+
 body.on('click', '.djangoAppt_btn-request-next-slot', function () {
     const serviceId = $(this).data('service-id');
     requestNextAvailableSlot(serviceId);
@@ -91,13 +105,22 @@ body.on('click', '.btn-submit-appointment', function () {
         const date = formattedDate.toISOString().slice(0, 10);
         const endTimeDate = new Date(formattedDate.getTime() + serviceDuration * 60000);
         const endTime = formatTime(endTimeDate);
-
+        const reasonForRescheduling = $('#reason_for_rescheduling').val();
         const form = $('.appointment-form');
-
+        let formAction = rescheduledDate ? appointmentRescheduleURL : appointmentRequestSubmitURL;
+        form.attr('action', formAction);
+        if (!form.find('input[name="appointment_request_id"]').length) {
+            form.append($('<input>', {
+                type: 'hidden',
+                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}));
+        form.append($('<input>', {type: 'hidden', name: 'reason_for_rescheduling', value: reasonForRescheduling}));
         form.submit();
     } else {
         const warningContainer = $('.warning-message');
@@ -197,7 +220,7 @@ function getAvailableSlots(selectedDate, staffId = null) {
     // Check if 'staffId' is 'none', null, or undefined and display an error message
     if (staffId === 'none' || staffId === null || staffId === undefined) {
         console.log('No staff ID provided, displaying error message.');
-        const errorMessage = $('<p class="djangoAppt_no-availability-text">'+ noStaffMemberSelectedTxt + '</p>');
+        const errorMessage = $('<p class="djangoAppt_no-availability-text">' + noStaffMemberSelectedTxt + '</p>');
         errorMessageContainer.append(errorMessage);
         // Optionally disable the "submit" button here
         $('.btn-submit-appointment').attr('disabled', 'disabled');

appointment/static/img/texture.webp

@@ -8,18 +8,13 @@
 from django.utils.translation import gettext as _
 
 from appointment.email_sender import notify_admin, send_email
-from appointment.models import Appointment
 from appointment.logger_config import logger
+from appointment.models import Appointment
 
 
-def send_email_reminder(to_email, first_name, appointment_id):
+def send_email_reminder(to_email, first_name, reschedule_link, appointment_id):
     """
     Send a reminder email to the client about the upcoming appointment.
-
-    :param to_email: The email address of the client.
-    :param first_name: The first name of the client.
-    :param appointment_id: The appointment ID.
-    :return: None
     """
 
     # Fetch the appointment using appointment_id
@@ -28,6 +23,7 @@ def send_email_reminder(to_email, first_name, appointment_id):
     email_context = {
         'first_name': first_name,
         'appointment': appointment,
+        'reschedule_link': reschedule_link,
     }
     send_email(
         recipient_list=[to_email], subject=_("Reminder: Upcoming Appointment"),

appointment/static/img/wood-fence.webp

@@ -15,7 +15,8 @@
     <div class="container">
         <div class="djangoAppt_main-container">
             <div class="djangoAppt_body-container">
-                <h1 class="page-title">{{ service.name }}</h1>
+                <h1 class="page-title">
+                    {% if page_header %}{{ page_header }}{% else %}{{ service.name }}{% endif %} </h1>
                 <small class="page-description">
                     {% trans "Check out our availability and book the date and time that works for you" %}
                 </small>
@@ -46,6 +47,13 @@ <h1 class="page-title">{{ service.name }}</h1>
 
                             </div>
                         </div>
+                        {% if rescheduled_date %}
+                            <div class="form-group" style="margin-top: 10px">
+                                <label for="reason_for_rescheduling">{% trans "Reason for rescheduling" %}:</label>
+                                <textarea name="reason_for_rescheduling" id="reason_for_rescheduling"
+                                          class="form-control" rows="1" required></textarea>
+                            </div>
+                        {% endif %}
                     </div>
                     <div class="djangoAppt_service-description">
                         <form method="post" action="{% url 'appointment:appointment_request_submit' %}"
@@ -108,6 +116,10 @@ <h1 class="page-title">{{ service.name }}</h1>
         const getNonWorkingDaysURL = "{% url 'appointment:get_non_working_days_ajax' %}";
         const serviceId = "{{ service.id }}";
         const serviceDuration = parseInt("{{ service.duration.total_seconds }}") / 60;
+        const rescheduledDate = "{{ rescheduled_date }}";
+        const appointmentRequestId = "{{ ar_id_request }}";
+        const appointmentRequestSubmitURL = "{% url 'appointment:appointment_request_submit' %}";
+        const appointmentRescheduleURL = "{% url 'appointment:reschedule_appointment_submit' %}";
     </script>
     <script>
         const requestNonAvailableSlotBtnTxt = "{% trans 'Request next available slot' %}";