home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly use DATE_FORMAT in todays_date().
[plomtask]
/
plomtask
/
days.py
diff --git
a/plomtask/days.py
b/plomtask/days.py
index 0936d047aa3eda7c4ce9374c90ca3f9ad3362ad5..04592a311e3a1abb3fc067699c72237059ee5b5a 100644
(file)
--- 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."""
def todays_date():
"""Return current date in DATE_FORMAT."""
- return
str(datetime.now())[:10]
+ return
datetime.now().strftime(DATE_FORMAT)
class Day:
class Day:
@@
-44,7
+44,7
@@
class Day:
@classmethod
def all(cls, db_conn: DatabaseConnection,
@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 == '':
"""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()
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
return days
@classmethod