From 131c858ac368f2ea446da3f69412ca8a6ae8f7de Mon Sep 17 00:00:00 2001 From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:39:51 +0200 Subject: [PATCH] update stringtodate --- src/utils/stringtodate.py | 50 ++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/src/utils/stringtodate.py b/src/utils/stringtodate.py index edaf24c..9a8ad55 100644 --- a/src/utils/stringtodate.py +++ b/src/utils/stringtodate.py @@ -13,28 +13,30 @@ def stringToDate(date: str) -> QtCore.QDate: debugMessage(date=date) if not date: return "" - if "." in date: - # converts the date from dd.mm.yyyy to qdate - datedata = date.split(".") - day = datedata[0] - month = datedata[1] - year = datedata[2] - return QtCore.QDate(int(year), int(month), int(day)) # .toString("dd.MM.yyyy") + if isinstance(date, QtCore.QDate): + return date.toString("yyyy-MM-dd") else: - datedata = date.split(" ")[1:] - month = datedata[0] - day = datedata[1] - year = datedata[2] - month = month.replace("Jan", "01") - month = month.replace("Feb", "02") - month = month.replace("Mar", "03") - month = month.replace("Apr", "04") - month = month.replace("May", "05") - month = month.replace("Jun", "06") - month = month.replace("Jul", "07") - month = month.replace("Aug", "08") - month = month.replace("Sep", "09") - month = month.replace("Oct", "10") - month = month.replace("Nov", "11") - month = month.replace("Dec", "12") - return QtCore.QDate(int(year), int(month), int(day)).toString("dd.MM.yyyy") + datedata = date.split("-") + day = datedata[2] + month = datedata[1] + year = datedata[0] + return QtCore.QDate(int(year), int(month), int(day)) + + # else: + # datedata = date.split(" ")[1:] + # month = datedata[0] + # day = datedata[1] + # year = datedata[2] + # month = month.replace("Jan", "01") + # month = month.replace("Feb", "02") + # month = month.replace("Mar", "03") + # month = month.replace("Apr", "04") + # month = month.replace("May", "05") + # month = month.replace("Jun", "06") + # month = month.replace("Jul", "07") + # month = month.replace("Aug", "08") + # month = month.replace("Sep", "09") + # month = month.replace("Oct", "10") + # month = month.replace("Nov", "11") + # month = month.replace("Dec", "12") + # return QtCore.QDate(int(year), int(month), int(day)).toString("dd.MM.yyyy")