MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceate excel for herd and livestock

Browse Source
This commit is contained in:
7nimor
2025-08-06 09:25:13 +03:30
parent 8d7af93498
commit 74ca5ba82a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/livestock/services/excel/excel_processing.py
View File

@@ -61,8 +61,8 @@ class LiveStockExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
gender = 'نر' if data.get('gender') == 1 else 'ماده' gender = 'نر' if data.get('gender') == 1 else 'ماده'
weight_type = 'سنگین' if data.get('weight_type') == 'H' else 'سبک' weight_type = 'سنگین' if data.get('weight_type') == 'H' else 'سبک'
date = data.get('birthdate') or None date = data.get('birthdate') or None
if date: if date is not None:
sh_date = shamsi_date(convert_str_to_date(date)) sh_date = shamsi_date(convert_str_to_date(date),in_value=True)
else: else:
sh_date = '-' sh_date = '-'

8
common/helper_excel.py
View File

@@ -308,6 +308,10 @@ def convert_str_to_date(string):
return datetime.strptime(string, '%Y-%m-%dT%H:%M:%S.%fZ').date() return datetime.strptime(string, '%Y-%m-%dT%H:%M:%S.%fZ').date()
except ValueError: except ValueError:
try: 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: except ValueError:
return None try:
return datetime.strptime(string, '%Y-%m-%d').date()
except ValueError:
return None