Format CSV Imported dateTime values as ISO 8601 strings

onaio · Dec 18, 2019 · 0d4f2fc · 0d4f2fc
1 parent b0692d0
commit 0d4f2fc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/onadata/libs/tests/utils/test_csv_import.py b/onadata/libs/tests/utils/test_csv_import.py
@@ -400,8 +400,8 @@ def test_excel_date_conversion(self):
             [u'6/12/2020 13:20', u'2019-03-11T16:00:51.147+02:00'])
         self.assertEqual(
             conv_datetime,
-            [u'2020-06-12T13:20:00.000000',
-             u'2019-03-11T16:00:51.147000+0200'])
+            [u'2020-06-12T13:20:00',
+             u'2019-03-11T16:00:51.147000+02:00'])
         self.assertEqual(conv_dates, ['2019-03-01', '2019-02-26'])
 
     def test_enforces_data_type(self):

diff --git a/onadata/libs/utils/csv_import.py b/onadata/libs/utils/csv_import.py
@@ -418,6 +418,8 @@ def validate_csv(csv_file, xform):
     csv_headers = csv_reader.fieldnames
 
     # Make sure CSV headers have no spaces
+    # because these are converted to XLSForm names
+    # which cannot have spaces
     if any(' ' in header for header in csv_headers):
         return {
             'error_msg': 'CSV file fieldnames should not contain spaces',
@@ -548,9 +550,18 @@ def validate_row(row, columns):
         if valid:
             if datatype in ['date', 'datetime']:
                 for key in data:
-                    value = datetime.strftime(
-                        data.get(key), '%Y-%m-%d' if datatype == 'date'
-                        else '%Y-%m-%dT%H:%M:%S.%f%z')
+                    # ODK XForms accept date and datetime values formatted in
+                    # accordance to the XML 1.0 spec only deviating when it
+                    # comes to the inclusion of the timezone offset in
+                    # datetime values. This specification matches ISO 8601
+                    value = data.get(key).isoformat()
+
+                    if datatype == 'date' and value.endswith('T00:00:00'):
+                        # Remove the Time string section from dates
+                        # to follow along with the date datetype specification
+                        # in the ODK XForms Spec
+                        value = value.replace('T00:00:00', '')
+
                     data.update({key: value})
 
             row.update(data)