Merge branch 'main' into timezone-utils

Author: deronnax

appointment/models.py

@@ -244,6 +244,9 @@ def get_services_offered(self):
     def get_service_offered_text(self):
         return ', '.join([service.name for service in self.services_offered.all()])
 
+    def get_service_is_offered(self, service_id):
+        return self.services_offered.filter(id=service_id).exists()
+
     def get_appointment_buffer_time(self):
         config = Config.objects.first()
         return self.appointment_buffer_time or (config.appointment_buffer_time if config else 0)

appointment/services.py

@@ -308,19 +308,22 @@ def get_working_hours_and_days_off_context(request, btn_txt, form_name, form, us
 
 
 def save_appointment(appt, client_name, client_email, start_time, phone_number, client_address, service_id, request,
-                     want_reminder=False, additional_info=None):
+                     staff_member_id=None, want_reminder=False, additional_info=None):
     """Save an appointment's details.
     :return: The modified appointment.
     """
+    service = Service.objects.get(id=service_id)
+    if staff_member_id:
+        staff_member = StaffMember.objects.get(id=staff_member_id)
+        if not staff_member.get_service_is_offered(service_id):
+            return None
     # Modify and save client details
     first_name, last_name = parse_name(client_name)
     client = appt.client
     client.first_name = first_name
     client.last_name = last_name
     client.email = client_email
     client.save()
-
-    service = Service.objects.get(id=service_id)
     # convert start time to a time object if it is a string
     if isinstance(start_time, str):
         start_time = convert_str_to_time(start_time)
@@ -337,6 +340,7 @@ def save_appointment(appt, client_name, client_email, start_time, phone_number,
     appt_request.service = service
     appt_request.start_time = start_time
     appt_request.end_time = end_time
+    appt_request.staff_member = staff_member
     appt_request.save()
 
     # Modify and save appointment details
@@ -559,7 +563,11 @@ def handle_service_management_request(post_data, files_data=None, service_id=Non
 
 def create_new_appointment(data, request):
     service = Service.objects.get(id=data.get("service_id"))
-    staff_member = StaffMember.objects.get(user=request.user)
+    staff_id = data.get("staff_id")
+    if staff_id:
+        staff_member = StaffMember.objects.get(id=staff_id)
+    else:
+        staff_member = StaffMember.objects.get(user=request.user)
 
     # Convert date and start time strings to datetime objects
     date = convert_str_to_date(data.get("date"))
@@ -610,6 +618,7 @@ def create_new_appointment(data, request):
 def update_existing_appointment(data, request):
     try:
         appt = Appointment.objects.get(id=data.get("appointment_id"))
+        staff_id = data.get("staff_id")
         want_reminder = data.get("want_reminder") == 'true'
         appt = save_appointment(
             appt,
@@ -621,8 +630,12 @@ def update_existing_appointment(data, request):
             service_id=data.get("service_id"),
             want_reminder=want_reminder,
             additional_info=data.get("additional_info"),
+            staff_member_id=staff_id,
             request=request,
         )
+        if not appt:
+            return json_response("Service not offered by staff member.", status=400, success=False,
+                                 error_code=ErrorCode.SERVICE_NOT_FOUND)
         appointments_json = convert_appointment_to_json(request, [appt])[0]
         return json_response(appt_updated_successfully, custom_data={'appt': appointments_json})
     except Appointment.DoesNotExist:

appointment/static/js/app_admin/staff_index.js

@@ -40,7 +40,6 @@ document.addEventListener("DOMContentLoaded", function () {
     });
 });
 
-
 function initializeCalendar() {
     const formattedAppointments = formatAppointmentsForCalendar(appointments);
     const calendarEl = document.getElementById('calendar');
@@ -244,7 +243,6 @@ function setUserStaffAdminFlag() {
         });
 }
 
-
 function handleCalendarRightClick(event, date) {
     if (!AppState.isUserStaffAdmin) {
         showErrorModal(notStaffMemberTxt)
@@ -376,6 +374,15 @@ function fetchServices(isEditMode = false) {
         .catch(error => console.error("Error fetching services: ", error));
 }
 
+function fetchStaffMembers(isEditMode = false) {
+    let url = isEditMode && AppState.eventIdSelected ? `${fetchStaffListURL}?appointmentId=${AppState.eventIdSelected}` : fetchStaffListURL;
+    return fetch(url)
+        .then(response => response.json())
+        .then(data => data.staff_members)
+        .catch(error => console.error("Error fetching staff members: ", error));
+
+}
+
 async function populateServices(selectedServiceId, isEditMode = false) {
     const services = await fetchServices(isEditMode);
     if (!services) {
@@ -394,6 +401,24 @@ async function populateServices(selectedServiceId, isEditMode = false) {
     return selectElement;
 }
 
+async function populateStaffMembers(selectedStaffId, isEditMode = false) {
+    const staffMembers = await fetchStaffMembers(isEditMode);
+    if (!staffMembers) {
+        showErrorModal(noStaffMemberTxt)
+    }
+    const selectElement = document.createElement('select');
+    staffMembers.forEach(staff => {
+        const option = document.createElement('option');
+        option.value = staff.id;  // Accessing the id
+        option.textContent = staff.name;  // Accessing the name
+        if (staff.id === selectedStaffId) {
+            option.defaultSelected = true;
+        }
+        selectElement.appendChild(option);
+    });
+    return selectElement;
+}
+
 function getCSRFToken() {
     const metaTag = document.querySelector('meta[name="csrf-token"]');
     if (metaTag) {
@@ -483,13 +508,13 @@ function createNewAppointment(dateInput) {
     });
 }
 
-
 async function showCreateAppointmentModal(defaultStartTime, formattedDate) {
     const servicesDropdown = await populateServices(null, false);
+    const staffDropdown = await populateStaffMembers(null, false);
     servicesDropdown.id = "serviceSelect";
     servicesDropdown.disabled = false; // Enable dropdown
 
-    document.getElementById('eventModalBody').innerHTML = prepareCreateAppointmentModalContent(servicesDropdown, defaultStartTime, formattedDate);
+    document.getElementById('eventModalBody').innerHTML = prepareCreateAppointmentModalContent(servicesDropdown, staffDropdown, defaultStartTime, formattedDate);
 
     adjustCreateAppointmentModalButtons();
     AppState.isCreating = true;
@@ -504,7 +529,6 @@ function adjustCreateAppointmentModalButtons() {
     document.getElementById("eventGoBtn").style.display = "none";
 }
 
-
 // ################################################################ //
 //                      Show Event Modal                            //
 // ################################################################ //
@@ -543,13 +567,23 @@ async function getServiceDropdown(serviceId, isEditMode) {
     return servicesDropdown;
 }
 
+// Populate Staff Dropdown
+async function getStaffDropdown(staffId, isEditMode) {
+    const staffDropdown = await populateStaffMembers(staffId, !isEditMode);
+    staffDropdown.id = "staffSelect";
+    staffDropdown.disabled = !isEditMode;
+    return staffDropdown;
+}
+
 // Show Event Modal
 async function showEventModal(eventId = null, isEditMode, isCreatingMode = false, defaultStartTime = '') {
     const appointment = await getAppointmentData(eventId, isCreatingMode, defaultStartTime);
     if (!appointment) return;
 
     const servicesDropdown = await getServiceDropdown(appointment.service_id, isEditMode);
-    document.getElementById('eventModalBody').innerHTML = generateModalContent(appointment, servicesDropdown, isEditMode);
+    const staffDropdown = await getStaffDropdown(appointment.staff_id, isEditMode);
+
+    document.getElementById('eventModalBody').innerHTML = generateModalContent(appointment, servicesDropdown, isEditMode, staffDropdown);
     adjustModalButtonsVisibility(isEditMode, isCreatingMode);
     $('#eventDetailsModal').modal('show');
 }
@@ -587,6 +621,7 @@ function toggleEditMode() {
 
 function updateModalUIForEditMode(modal, isEditingAppointment) {
     const inputs = modal.querySelectorAll("input");
+    const staffDropdown = document.getElementById("staffSelect");
     const servicesDropdown = document.getElementById("serviceSelect");
     const editButton = document.getElementById("eventEditBtn");
     const submitButton = document.getElementById("eventSubmitBtn");
@@ -599,6 +634,7 @@ function updateModalUIForEditMode(modal, isEditingAppointment) {
 
     // Toggle input and dropdown enable/disable state
     inputs.forEach(input => input.disabled = !isEditingAppointment);
+    staffDropdown.disabled = !isEditingAppointment;
     servicesDropdown.disabled = !isEditingAppointment;
 
     // Toggle visibility of UI elements
@@ -618,7 +654,6 @@ function toggleElementVisibility(element, isVisible) {
     }
 }
 
-
 // ################################################################ //
 //                         Submit Logic                             //
 // ################################################################ //
@@ -651,7 +686,13 @@ async function submitChanges() {
 function collectFormDataFromModal(modal) {
     const inputs = modal.querySelectorAll("input");
     const serviceId = modal.querySelector("#serviceSelect").value;
-    const data = {isCreating: AppState.isCreating, service_id: serviceId, appointment_id: AppState.eventIdSelected};
+    const staffId = modal.querySelector("#staffSelect").value;
+    const data = {
+        isCreating: AppState.isCreating,
+        service_id: serviceId,
+        staff_id: staffId,
+        appointment_id: AppState.eventIdSelected
+    };
 
     inputs.forEach(input => {
         if (input.name !== "date") {
@@ -711,22 +752,6 @@ async function sendAppointmentData(data) {
     });
 }
 
-// Handle response from server
-async function handleAppointmentResponse(response) {
-    if (!response.ok) {
-        throw new Error(response.message);
-    }
-
-    const responseData = await response.json();
-    if (AppState.isCreating) {
-        addNewAppointmentToCalendar(responseData.appt[0]);
-    } else {
-        updateExistingAppointmentInCalendar(responseData.appt);
-    }
-
-    AppState.calendar.render();
-}
-
 // Add new appointment to calendar
 function addNewAppointmentToCalendar(newAppointment) {
     const newEvent = formatAppointmentsForCalendar([newAppointment])[0];

appointment/templates/administration/staff_index.html

@@ -115,7 +115,7 @@
             margin-right: 10px;
         }
 
-        #serviceSelect {
+        #serviceSelect, #staffSelect {
             width: 100%;
             padding: 8px 12px;
             border: 1px solid #ccc;
@@ -125,7 +125,7 @@
             transition: background-color 0.3s ease;
         }
 
-        #serviceSelect:disabled {
+        #serviceSelect:disabled, #staffSelect:disabled {
             background-color: #e9ecef;
         }
 
@@ -311,10 +311,12 @@
         const serviceDuration = parseInt("{{ service.duration.total_seconds }}") / 60;
         let appointments = {{ appointments|safe }};
         const fetchServiceListForStaffURL = "{% url 'appointment:fetch_service_list_for_staff' %}";
+        const fetchStaffListURL = "{% url 'appointment:fetch_staff_list' %}";
         const updateApptMinInfoURL = "{% url 'appointment:update_appt_min_info' %}";
         const updateApptDateURL = "{% url 'appointment:update_appt_date_time' %}";
         const validateApptDateURL = "{% url 'appointment:validate_appointment_date' %}";
         const isUserStaffAdminURL = "{% url 'appointment:is_user_staff_admin' %}";
+        const isUserSuperUser = "{{ is_superuser }}";
     </script>
     <script>
         {# Text for translation #}
@@ -330,6 +332,7 @@
         const apptNotFoundTxt = "{% trans 'Appointment not found.' %}";
         const notStaffMemberTxt = "{% trans "You're not a staff member. Can't perform this action !" %}";
         const noServiceOfferedTxt = "{% trans "You don't offer any service. Add new service from your profile." %}";
+        const noStaffMemberTxt = "{% trans "No staff members found." %}";
     </script>
 
     <script src="{% static 'js/modal/error_modal.js' %}"></script>
@@ -338,11 +341,25 @@
     <script src="{% static 'js/js-utils.js' %}"></script>
 
     <script>
-        function createCommonInputFields(appointment, servicesDropdown, isEditMode, defaultStartTime) {
+        console.log("isUserSuperUser", isUserSuperUser)
+
+        function createCommonInputFields(appointment, servicesDropdown, isEditMode, defaultStartTime, staffDropdown) {
             const startTimeValue = isEditMode ? moment(appointment.start_time).format('HH:mm:ss') : defaultStartTime;
             const disabledAttribute = isEditMode ? '' : 'disabled';
+            
+            const isSuperuser = isUserSuperUser === "True";
+            let superuserInputField = '';
+            if (isSuperuser) {
+                superuserInputField = `
+                    <div class="flex-container-appt">
+                    <label>{% trans 'Staff Member' %}:</label>
+                    ${staffDropdown.outerHTML}
+                    </div>
+                `;
+            }
 
             return `
+                ${superuserInputField}
                 <div class="flex-container-appt">
                 <label>{% trans 'Service Name' %}:</label>
                 ${servicesDropdown.outerHTML}
@@ -369,9 +386,9 @@
             `;
         }
 
-        function generateModalContent(appointment, servicesDropdown, isEditMode) {
+        function generateModalContent(appointment, servicesDropdown, isEditMode, staffDropdown) {
             const startTimeValue = moment(appointment.start_time).format('HH:mm:ss');
-            const commonInputs = createCommonInputFields(appointment, servicesDropdown, isEditMode, startTimeValue);
+            const commonInputs = createCommonInputFields(appointment, servicesDropdown, isEditMode, startTimeValue, staffDropdown);
             return `
                 ${commonInputs}
                 <div class="flex-container-appt">
@@ -381,9 +398,9 @@
             `;
         }
 
-        function prepareCreateAppointmentModalContent(servicesDropdown, defaultStartTime, formattedDate) {
+        function prepareCreateAppointmentModalContent(servicesDropdown, staffDropdown, defaultStartTime, formattedDate) {
             const appointment = {client_name: '', client_email: '', client_phone: '', client_address: ''};
-            const commonInputs = createCommonInputFields(appointment, servicesDropdown, true, defaultStartTime);
+            const commonInputs = createCommonInputFields(appointment, servicesDropdown, true, defaultStartTime, staffDropdown);
 
             return `
                 ${commonInputs}

appointment/tests/test_services.py

@@ -349,10 +349,11 @@ def test_save_appointment(self):
         phone_number = "+1234567890"
         client_address = "123 New St, TestCity"
         service_id = self.service2.id
+        staff_member_id = self.staff_member2.id
 
         # Call the function
         updated_appt = save_appointment(self.appt, client_name, client_email, start_time_str, phone_number,
-                                        client_address, service_id, self.request)
+                                        client_address, service_id, self.request, staff_member_id)
 
         # Check client details
         self.assertEqual(updated_appt.client.get_full_name(), client_name)

appointment/tests/test_views.py

@@ -61,7 +61,7 @@ def setUp(self):
         self.data = {
             'isCreating': False, 'service_id': '1', 'appointment_id': self.appt.id, 'client_name': 'Bryan Zap',
             'client_email': '[email protected]', 'client_phone': '+33769992738', 'client_address': 'Naples, Florida',
-            'want_reminder': 'false', 'additional_info': '', 'start_time': '15:00:26',
+            'want_reminder': 'false', 'additional_info': '', 'start_time': '15:00:26', 'staff_id': self.staff_member.id,
             'date': self.tomorrow.strftime('%Y-%m-%d')
         }
         self.url_display_appt = reverse('appointment:display_appointment', args=[self.appointment.id])
@@ -405,6 +405,7 @@ def test_update_appt_min_info_update(self):
         # Making the request
         response = self.client.post(url, data=json.dumps(self.data), content_type='application/json',
                                     **{'HTTP_X_REQUESTED_WITH': 'XMLHttpRequest'})
+        print(f"response: {response.content}")
 
         # Check response status
         self.assertEqual(response.status_code, 200)

appointment/urls.py

@@ -16,8 +16,8 @@
 from appointment.views_admin import (
     add_day_off, add_or_update_service, add_or_update_staff_info, add_working_hours, create_new_staff_member,
     delete_appointment, delete_appointment_ajax, delete_day_off, delete_service, delete_working_hours,
-    display_appointment, email_change_verification_code, fetch_service_list_for_staff, get_service_list,
-    get_user_appointments, is_user_staff_admin, make_superuser_staff_member, remove_staff_member,
+    display_appointment, email_change_verification_code, fetch_service_list_for_staff, fetch_staff_list,
+    get_service_list, get_user_appointments, is_user_staff_admin, make_superuser_staff_member, remove_staff_member,
     remove_superuser_staff_member, update_appt_date_time, update_appt_min_info, update_day_off, update_personal_info,
     update_working_hours, user_profile, validate_appointment_date
 )
@@ -87,6 +87,7 @@
          name='request_next_available_slot'),
     path('request_staff_info/', get_non_working_days_ajax, name='get_non_working_days_ajax'),
     path('fetch_service_list_for_staff/', fetch_service_list_for_staff, name='fetch_service_list_for_staff'),
+    path('fetch_staff_list/', fetch_staff_list, name='fetch_staff_list'),
     path('update_appt_min_info/', update_appt_min_info, name="update_appt_min_info"),
     path('update_appt_date_time/', update_appt_date_time, name="update_appt_date_time"),
     path('validate_appointment_date/', validate_appointment_date, name="validate_appointment_date"),