X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fdays.py;h=04592a311e3a1abb3fc067699c72237059ee5b5a;hb=32f7f7084797cfa3a303e2c68ce46dfcf2b436bf;hp=0936d047aa3eda7c4ce9374c90ca3f9ad3362ad5;hpb=12bbfea600184c9e2657cc9a0c705848a4dae29a;p=plomtask
diff --git a/plomtask/days.py b/plomtask/days.py
index 0936d04..04592a3 100644
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -18,7 +18,7 @@ def date_valid(date: str):
def todays_date():
"""Return current date in DATE_FORMAT."""
- return str(datetime.now())[:10]
+ return datetime.now().strftime(DATE_FORMAT)
class Day:
@@ -44,7 +44,7 @@ class Day:
@classmethod
def all(cls, db_conn: DatabaseConnection,
- date_range: tuple[str, str] = ('', '')):
+ date_range: tuple[str, str] = ('', ''), fill_gaps: bool = False):
"""Return list of Days in database within date_range."""
def date_from_range_str(date_str: str, default: str):
if date_str == '':
@@ -61,6 +61,15 @@ class Day:
for row in db_conn.exec(sql, (start_date, end_date)):
days += [cls.from_table_row(row)]
days.sort()
+ if fill_gaps and len(days) > 1:
+ gapless_days = []
+ for i, day in enumerate(days):
+ gapless_days += [day]
+ if i < len(days) - 1:
+ while day.next_date != days[i+1].date:
+ day = Day(day.next_date)
+ gapless_days += [day]
+ days = gapless_days
return days
@classmethod