Skip to content

Commit 2f9c31b

Browse files
Merge pull request #1201 from NHSDigital/DTOSS-12483-scheduled-date-time-bug
Fix date/time bug
2 parents 20ca9ba + aa9946d commit 2f9c31b

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

manage_breast_screening/mammograms/presenters/appointment_presenters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def slot_timestamp_single_line(self):
302302
clinic_slot = self._clinic_slot
303303
clinic = self._clinic
304304

305-
return f"{format_date(clinic_slot.starts_at)} ({format_relative_date(clinic.starts_at)}) \n {format_time(clinic.starts_at)} ({clinic_slot.duration_in_minutes} minutes)"
305+
return f"{format_date(clinic_slot.starts_at)} ({format_relative_date(clinic.starts_at)}) \n {format_time(clinic_slot.starts_at)} ({clinic_slot.duration_in_minutes} minutes)"
306306

307307
@cached_property
308308
def clinic_date_and_slot_time(self):

manage_breast_screening/mammograms/tests/presenters/test_appointment_presenters.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,17 @@ def test_clinic_date_and_slot_time(self, clinic_slot_mock):
771771
== "2 January 2025 at 9:30am"
772772
)
773773

774+
@time_machine.travel(datetime(2025, 5, 19, tzinfo=tz.utc))
775+
def test_slot_timestamp_single_line(self, clinic_slot_mock):
776+
clinic_slot_mock.starts_at = datetime(2025, 1, 2, 10, 30)
777+
clinic_slot_mock.duration_in_minutes = 30
778+
clinic_slot_mock.clinic.starts_at = datetime(2025, 1, 2, 9, 0)
779+
780+
assert (
781+
ClinicSlotPresenter(clinic_slot_mock).slot_timestamp_single_line
782+
== "2 January 2025 (4 months ago) \n 10:30am (30 minutes)"
783+
)
784+
774785

775786
class TestSpecialAppointmentPresenter:
776787
def test_change_url(self):

0 commit comments

Comments
 (0)