|
|
@@ -14,7 +14,10 @@ def report_start_date(request: Request, s: str | date | None = None) -> date:
|
|
|
|
return d
|
|
|
|
return d
|
|
|
|
if "start" not in session:
|
|
|
|
if "start" not in session:
|
|
|
|
session["start"] = get_first_day(date.today()).isoformat()
|
|
|
|
session["start"] = get_first_day(date.today()).isoformat()
|
|
|
|
return date.fromisoformat(session["start"])
|
|
|
|
try:
|
|
|
|
|
|
|
|
return date.fromisoformat(session["start"])
|
|
|
|
|
|
|
|
except ValueError:
|
|
|
|
|
|
|
|
return get_first_day(date.today())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def report_finish_date(request: Request, f: str | date | None = None) -> date:
|
|
|
|
def report_finish_date(request: Request, f: str | date | None = None) -> date:
|
|
|
@@ -28,7 +31,10 @@ def report_finish_date(request: Request, f: str | date | None = None) -> date:
|
|
|
|
return d
|
|
|
|
return d
|
|
|
|
if "finish" not in session:
|
|
|
|
if "finish" not in session:
|
|
|
|
session["finish"] = get_last_day(date.today()).isoformat()
|
|
|
|
session["finish"] = get_last_day(date.today()).isoformat()
|
|
|
|
return date.fromisoformat(session["finish"])
|
|
|
|
try:
|
|
|
|
|
|
|
|
return date.fromisoformat(session["finish"])
|
|
|
|
|
|
|
|
except ValueError:
|
|
|
|
|
|
|
|
return get_last_day(date.today())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def report_date(request: Request, d: str | date | None = None) -> date:
|
|
|
|
def report_date(request: Request, d: str | date | None = None) -> date:
|
|
|
@@ -42,7 +48,10 @@ def report_date(request: Request, d: str | date | None = None) -> date:
|
|
|
|
return parsed_date
|
|
|
|
return parsed_date
|
|
|
|
if "date" not in session:
|
|
|
|
if "date" not in session:
|
|
|
|
session["date"] = get_last_day(date.today()).isoformat()
|
|
|
|
session["date"] = get_last_day(date.today()).isoformat()
|
|
|
|
return date.fromisoformat(session["date"])
|
|
|
|
try:
|
|
|
|
|
|
|
|
return date.fromisoformat(session["date"])
|
|
|
|
|
|
|
|
except ValueError:
|
|
|
|
|
|
|
|
return get_last_day(date.today())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_first_day(dt: date, d_years: int = 0, d_months: int = 0) -> date:
|
|
|
|
def get_first_day(dt: date, d_years: int = 0, d_months: int = 0) -> date:
|
|
|
|