From 8beb6890a77f8239ddae218f7412594f63dabea4 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 12 Aug 2024 11:09:36 +0100 Subject: [PATCH] fix date wrangling --- generic/forms.py | 2 +- generic/models.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/generic/forms.py b/generic/forms.py index b53232d5..ec59bc88 100755 --- a/generic/forms.py +++ b/generic/forms.py @@ -75,7 +75,7 @@ class SplitDateTimeFieldDefaultTime(SplitDateTimeField): self.error_messages["invalid_date"], code="invalid_date" ) if data_list[1] in self.empty_values: - data_list[1] = datetime.time(0, 0) + data_list[1] = datetime.time(0, 1) #raise ValidationError( # self.error_messages["invalid_time"], code="invalid_time" #) diff --git a/generic/models.py b/generic/models.py index 85a6d59e..73b10ce5 100644 --- a/generic/models.py +++ b/generic/models.py @@ -40,6 +40,7 @@ import pydicom import dicognito.anonymizer from django.contrib.auth.models import User from django.forms.models import model_to_dict +from django.forms.utils import from_current_timezone, to_current_timezone def findMiddle(input_list): @@ -881,7 +882,9 @@ class ExamBase(ExamOrCollectionGenericBase): def __str__(self): if self.start_date and self.start_date is not None: - return f"{self.name} ({self.start_date:%d %B %Y})" + print(self.start_date) + print(to_current_timezone(self.start_date)) + return f"{self.name} ({to_current_timezone(self.start_date):%d %B %Y})" else: return self.name