Convert time object at the very end

Author: adamspd

appointment/services.py

@@ -434,9 +434,7 @@ def get_available_slots_for_staff(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)
-
-    return [slot.strftime('%I:%M %p') for slot in slots]
+    return exclude_booked_slots(appointments, slots, slot_duration)
 
 
 def get_finish_button_text(service) -> str:

appointment/static/js/appointments.js

@@ -10,6 +10,7 @@ let isRequestInProgress = false;
 const calendar = new FullCalendar.Calendar(calendarEl, {
     initialView: 'dayGridMonth',
     initialDate: selectedDate,
+    timeZone: timezone,
     headerToolbar: {
         left: 'title',
         right: 'prev,today,next',

appointment/templates/appointment/appointments.html

@@ -109,7 +109,7 @@ <h1 class="page-title">
             integrity="sha512-JCQkxdym6GmQ+AFVioDUq8dWaWN6tbKRhRyHvYZPupQ6DxpXzkW106FXS1ORgo/m3gxtt5lHRMqSdm2OfPajtg=="
             crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script>
-        const timezone = "{{ timezone }}";
+        const timezone = "{{ timezoneTxt }}";
         const locale = "{{ locale }}";
         const availableSlotsAjaxURL = "{% url 'appointment:available_slots_ajax' %}";
         const requestNextAvailableSlotURLTemplate = "{% url 'appointment:request_next_available_slot' service_id=0 %}";

appointment/tests/test_services.py

@@ -471,8 +471,9 @@ def test_available_slots(self):
         """Test if available slots are returned correctly."""
         # On a Wednesday, the staff member should have slots from 9 AM to 5 PM
         slots = get_available_slots_for_staff(self.next_wednesday, self.staff_member1)
-        expected_slots = [f"{hour:02d}:00 AM" for hour in range(9, 12)] + ["12:00 PM"] + \
-                         [f"{hour:02d}:00 PM" for hour in range(1, 5)]
+        expected_slots = [
+            datetime.datetime(self.next_wednesday.year, self.next_wednesday.month, self.next_wednesday.day, hour) for
+            hour in range(9, 17)]
         self.assertEqual(slots, expected_slots)
 
     def test_booked_slots(self):
@@ -490,7 +491,9 @@ def test_booked_slots(self):
 
         # Now, the staff member should not have that slot available
         slots = get_available_slots_for_staff(self.next_wednesday, self.staff_member1)
-        expected_slots = ['09:00 AM', '11:00 AM', '12:00 PM', '01:00 PM', '02:00 PM', '03:00 PM', '04:00 PM']
+        expected_slots = [
+            datetime.datetime(self.next_wednesday.year, self.next_wednesday.month, self.next_wednesday.day, hour, 0) for
+            hour in range(9, 17) if hour != 10]
         self.assertEqual(slots, expected_slots)
 
     def test_no_working_hours(self):

appointment/views.py

@@ -97,10 +97,10 @@ def get_available_slots_ajax(request):
 
     # Check if the selected_date is today and filter out past slots
     if selected_date == date.today():
-        current_time_edt = datetime.now(pytz.timezone(settings.TIME_ZONE)).time()
-        available_slots = [slot for slot in available_slots if convert_str_to_time(slot) > current_time_edt]
+        current_time = datetime.now(pytz.timezone(settings.TIME_ZONE)).time()
+        available_slots = [slot for slot in available_slots if slot.time() > current_time]
 
-    custom_data['available_slots'] = available_slots
+    custom_data['available_slots'] = [slot.strftime('%I:%M %p') for slot in available_slots]
     if len(available_slots) == 0:
         custom_data['error'] = True
         message = _('No availability')
@@ -524,7 +524,7 @@ def prepare_reschedule_appointment(request, id_request):
         'all_staff_members': all_staff_members,
         'page_title': page_title,
         'page_description': page_description,
-        'available_slots': available_slots,
+        'available_slots': [slot.strftime('%I:%M %p') for slot in available_slots],
         'date_chosen': date_chosen,
         'locale': get_locale(),
         'timezoneTxt': get_current_timezone_name(),