Skip to content

Commit

Permalink
Update parsers.py
Browse files Browse the repository at this point in the history
Fix #44496
  • Loading branch information
delchiv committed May 22, 2024
1 parent 033bbfd commit 30878bc
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions xlsexport/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.postgres.fields.jsonb import JSONField
from django.db import transaction
from django.db.models import Q, DateField
from django.db.models import Q, DateField, DateTimeField
from openpyxl import load_workbook


Expand Down Expand Up @@ -93,8 +93,9 @@ def get_attr_value_ext(self, model, row_data, type_model=None):
m2m_flag = True
if model:
processed_model_list.append(model)
elif isinstance(field, DateField) and isinstance(self.item_data[row_data], datetime.datetime):
attr_value = self.item_data[row_data].date()
elif (isinstance(field, DateField) and not isinstance(field, DateTimeField)
and isinstance(self.item_data[row_data], datetime.datetime)):
attr_value = self.item_data[row_data].date()
elif isinstance(field, JSONField):
json_key = splitted_fields[current_idx+1]
attr_value = self.item_data['.'.join(splitted_fields)]
Expand Down Expand Up @@ -334,7 +335,7 @@ def get_formatted_field(value, format, file_format):
try:
formatted_value = datetime.datetime.strptime(value, format)
except TypeError:
formatted_value = get_cell_date(value, file_format)
formatted_value = get_cell_date(value, file_format)
return formatted_value
else:
return get_cell_date(value, file_format)
Expand Down

0 comments on commit 30878bc

Please sign in to comment.