imacat/mia-accounting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 41 Wiki Activity

Added the __get_since_desc and __get_until_desc methods to simplify the __get_desc method in the Period utility.

Browse Source
This commit is contained in:
依瑪貓 2023-03-08 18:50:54 +08:00
parent f438f97571
commit 338b49c965
1 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/accounting/report/period.py
View File

@ -206,27 +206,12 @@ class Period:
:return: The period description. :return: The period description.
""" """
if self.start is None: if self.start is None and self.end is None:
if self.end is None:
return gettext("for all time") return gettext("for all time")
else: if self.start is None:
if self.end != _month_end(self.end): return self.__get_until_desc()
return gettext("until %(end)s",
end=self.__format_date(self.end))
if self.end.month != 12:
return gettext("until %(end)s",
end=self.__format_month(self.end))
return gettext("until %(end)s", end=str(self.end.year))
else:
if self.end is None: if self.end is None:
if self.start.day != 1: return self.__get_since_desc()
return gettext("since %(start)s",
start=self.__format_date(self.start))
if self.start.month != 1:
return gettext("since %(start)s",
start=self.__format_month(self.start))
return gettext("since %(start)s", start=str(self.start.year))
else:
try: try:
return self.__get_year_desc() return self.__get_year_desc()
except ValueError: except ValueError:
@ -255,6 +240,43 @@ class Period:
""" """
return f"{month.year}/{month.month}" return f"{month.year}/{month.month}"
def __get_since_desc(self) -> str:
"""Returns the description without the end time.
:return: The description without the end time.
"""
def get_start_desc() -> str:
"""Returns the description of the start time.
:return: The description of the start time.
"""
if self.start.month == 1 and self.start.day == 1:
return str(self.start.year)
if self.start.day == 1:
return self.__format_month(self.start)
return self.__format_date(self.start)
return gettext("since %(start)s", start=get_start_desc())
def __get_until_desc(self) -> str:
"""Returns the description without the start time.
:return: The description without the start time.
"""
def get_end_desc() -> str:
"""Returns the description of the end time.
:return: The description of the end time.
"""
if self.end.month == 12 and self.end.day == 31:
return str(self.end.year)
if (self.end + datetime.timedelta(days=1)).day == 1:
return self.__format_month(self.end)
return self.__format_date(self.end)
return gettext("until %(end)s", end=get_end_desc())
def __get_year_desc(self) -> str: def __get_year_desc(self) -> str:
"""Returns the description as a year range. """Returns the description as a year range.