fix date wrangling

This commit is contained in:
Ross
2024-08-12 11:09:36 +01:00
parent 2d185aa95f
commit 8beb6890a7
2 changed files with 5 additions and 2 deletions
+1 -1
View File
@@ -75,7 +75,7 @@ class SplitDateTimeFieldDefaultTime(SplitDateTimeField):
self.error_messages["invalid_date"], code="invalid_date" self.error_messages["invalid_date"], code="invalid_date"
) )
if data_list[1] in self.empty_values: if data_list[1] in self.empty_values:
data_list[1] = datetime.time(0, 0) data_list[1] = datetime.time(0, 1)
#raise ValidationError( #raise ValidationError(
# self.error_messages["invalid_time"], code="invalid_time" # self.error_messages["invalid_time"], code="invalid_time"
#) #)
+4 -1
View File
@@ -40,6 +40,7 @@ import pydicom
import dicognito.anonymizer import dicognito.anonymizer
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.forms.models import model_to_dict from django.forms.models import model_to_dict
from django.forms.utils import from_current_timezone, to_current_timezone
def findMiddle(input_list): def findMiddle(input_list):
@@ -881,7 +882,9 @@ class ExamBase(ExamOrCollectionGenericBase):
def __str__(self): def __str__(self):
if self.start_date and self.start_date is not None: 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: else:
return self.name return self.name