update interface

Author: r350178982

demo/dateutils_test.py

@@ -100,14 +100,26 @@
 time_date = dateutils.date(time_year, time_month, time_day) # 2021-07-17
 res = dateutils.dateadd(dateutils.dateadd(dateutils.now(), 10), 10) # 2022-03-03 11:13:02
 
-print(dateutils.to_quarter(time_str))
+print(dateutils.to_quarter(time_str)) # <DateQuarter-2022,3Q>
 time_str2 = "2022-07-28"
 
 q1 = dateutils.to_quarter(time_str)
 q2 = dateutils.to_quarter(time_str2)
-print(q1 < time_str2)
-print(q1 + 1)
+print(q1 < time_str2) # False
+print(q1 + 1) # <DateQuarter-2022,4Q>
 
-# print(list(DateQuarter.between(q1, q2)))
-print(list(dateutils.between_quarter(time_str, time_str2, include_last=True)))
 
+time_str = "2022-07-17"
+q1 = dateutils.to_quarter(time_str)
+print(q1.year) # 2022
+print(q1.quarter) # 3
+
+print(q1.start_date) # 2022-07-01
+print(q1.end_date) # 2022-09-30
+
+print("2022-8-28" in q1) # True
+
+print(list(dateutils.quarters_within("2021-03-28", "2022-07-17", include_last=True))) # [<DateQuarter-2021,1Q>, ...,<DateQuarter-2022,3Q>]
+
+print(dateutils.quarter_from_yq(2022, 4)) # <DateQuarter-2022,4Q>
+print(dateutils.quarter_from_ym(2022, 4)) # <DateQuarter-2022,2Q>

seatable_api/date_utils.py

@@ -67,7 +67,7 @@ class DateQuarter:
     _year = 0
     _quarter = 0
 
-    def __init__(self, year: int, quarter: int):
+    def __init__(self, year, quarter):
         year = year + (quarter-1) // 4
         quarter = (quarter-1) % 4 + 1
 
@@ -187,25 +187,29 @@ def __sub__(self, other):
         else:
             raise ArithmeticError()
 
+    @property
     def year(self):
         return self._year
 
+    @property
     def quarter(self):
         return self._quarter
 
     def days(self):
-        start = self.start_date()
-        end = self.end_date()
+        start = self.start_date
+        end = self.end_date
         curr = start
         while curr <= end:
             yield curr
             curr = curr + datetime.timedelta(days=1)
 
+    @property
     def start_date(self):
         return datetime.date(year=self._year, month=(self._quarter-1)*3+1, day=1)
 
+    @property
     def end_date(self):
-        return (self+1).start_date() - datetime.timedelta(days=1)
+        return (self+1).start_date - datetime.timedelta(days=1)
 
     @classmethod
     def between(cls, start, end, include_last=False):
@@ -408,11 +412,18 @@ def isomonth(self, time_str):
         date_str = self.date(year, month, 1)
         return date_str[0:-3]
 
+    def quarter_from_yq(self, year, quarter):
+        return DateQuarter(year, quarter)
+
+    def quarter_from_ym(self, year, month):
+        dt = self.date(year, month, 1)
+        return self.to_quarter(dt)
+
     def to_quarter(self, time_str):
         dt_obj, _ = _str2datetime(time_str)
         return DateQuarter.from_date(dt_obj)
 
-    def between_quarter(self, time_start, time_end, include_last=False):
+    def quarters_within(self, time_start, time_end, include_last=False):
         q_start = self.to_quarter(time_start)
         q_end = self.to_quarter(time_end)
         return DateQuarter.between(q_start, q_end, include_last=include_last)