Improved date parsing of batch query files

adit/batch_query/parsers.py

@@ -1,5 +1,3 @@
-import re
-
 from adit.core.parsers import BatchFileParser
 from adit.core.utils.dicom_utils import person_name_to_dicom
 
@@ -20,8 +18,6 @@
     "pseudonym": "Pseudonym",
 }
 
-dt_regex = re.compile(r"^(\d{4}-\d{2}-\d{2}) \d{2}:\d{2}:\d{2}$")
-
 
 class BatchQueryFileParser(BatchFileParser[BatchQueryTask]):
     serializer_class = BatchQueryTaskSerializer
@@ -34,12 +30,6 @@ def transform_value(self, field: str, value: str) -> str | list[str] | None:
             if not value:
                 return None
 
-            m = dt_regex.match(value)
-            if m:
-                # Only extract the date as the DateField of the date field
-                # will only parse a valid date without time.
-                return m.group(1)
-
         if field in ["modalities", "series_numbers"]:
             return ", ".join(filter(len, map(str.strip, value.split(","))))
 

adit/core/serializers.py

@@ -1,5 +1,6 @@
 from typing import Type
 
+from django.utils import formats
 from rest_framework import serializers
 
 from adit.core.models import DicomTask
@@ -29,6 +30,16 @@ def many_init(cls, *args, **kwargs):
 
     def adapt_date_field(self, field_name):
         field = self.fields[field_name]
+
+        # When loading the data from the Excel sheet the fields with date content may return
+        # a date/time string (when date type was explicitly set in the Excel column)
+        # or the string that was directly provided by the user (text type column).
+        # We make sure that all different formats could be parsed.
+        date_input_formats = formats.get_format("DATE_INPUT_FORMATS")
+        datetime_input_formats = formats.get_format("DATETIME_INPUT_FORMATS")
+        input_formats = date_input_formats + datetime_input_formats
+        field.input_formats = input_formats
+
         field.error_messages["invalid"] = "Date has wrong format."
 
     def validate(self, attrs):