From 74ca5ba82a579f3a54154ddcb30fa16ab2b52e38 Mon Sep 17 00:00:00 2001 From: 7nimor Date: Wed, 6 Aug 2025 09:25:13 +0330 Subject: [PATCH] ceate excel for herd and livestock --- apps/livestock/services/excel/excel_processing.py | 4 ++-- common/helper_excel.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/livestock/services/excel/excel_processing.py b/apps/livestock/services/excel/excel_processing.py index b34da35..8cfd6d8 100644 --- a/apps/livestock/services/excel/excel_processing.py +++ b/apps/livestock/services/excel/excel_processing.py @@ -61,8 +61,8 @@ class LiveStockExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin): gender = 'نر' if data.get('gender') == 1 else 'ماده' weight_type = 'سنگین' if data.get('weight_type') == 'H' else 'سبک' date = data.get('birthdate') or None - if date: - sh_date = shamsi_date(convert_str_to_date(date)) + if date is not None: + sh_date = shamsi_date(convert_str_to_date(date),in_value=True) else: sh_date = '-' diff --git a/common/helper_excel.py b/common/helper_excel.py index 6704c6a..48baeaf 100644 --- a/common/helper_excel.py +++ b/common/helper_excel.py @@ -308,6 +308,10 @@ def convert_str_to_date(string): return datetime.strptime(string, '%Y-%m-%dT%H:%M:%S.%fZ').date() except ValueError: try: - return datetime.strptime(string, '%Y-%m-%d').date() + return datetime.strptime(string, '%Y-%m-%dT%H:%M:%SZ').date() # Added format without milliseconds except ValueError: - return None + try: + return datetime.strptime(string, '%Y-%m-%d').date() + except ValueError: + return None +