|
|
|
@@ -196,7 +196,7 @@ async def get_evening_ritual_form(request: Request, db: Session = Depends(get_db
|
|
|
|
if not journal_entry:
|
|
|
|
if not journal_entry:
|
|
|
|
raise HTTPException(status_code=404, detail="No journal entry for today")
|
|
|
|
raise HTTPException(status_code=404, detail="No journal entry for today")
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
"calm/evening_ritual_form.html", {"request": request, "journal_entry": journal_entry}
|
|
|
|
request, "calm/evening_ritual_form.html", {"journal_entry": journal_entry}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -257,8 +257,9 @@ async def create_new_task(
|
|
|
|
# After creating a new task, we might need to re-evaluate NOW/NEXT/LATER, but for simplicity
|
|
|
|
# After creating a new task, we might need to re-evaluate NOW/NEXT/LATER, but for simplicity
|
|
|
|
# and given the spec, new tasks go to LATER. Promotion happens on completion/deferral.
|
|
|
|
# and given the spec, new tasks go to LATER. Promotion happens on completion/deferral.
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
|
|
|
|
request,
|
|
|
|
"calm/partials/later_count.html",
|
|
|
|
"calm/partials/later_count.html",
|
|
|
|
{"request": request, "later_tasks_count": len(get_later_tasks(db))},
|
|
|
|
{"later_tasks_count": len(get_later_tasks(db))},
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -287,9 +288,9 @@ async def start_task(
|
|
|
|
promote_tasks(db)
|
|
|
|
promote_tasks(db)
|
|
|
|
|
|
|
|
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
|
|
|
|
request,
|
|
|
|
"calm/partials/now_next_later.html",
|
|
|
|
"calm/partials/now_next_later.html",
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"request": request,
|
|
|
|
|
|
|
|
"now_task": get_now_task(db),
|
|
|
|
"now_task": get_now_task(db),
|
|
|
|
"next_task": get_next_task(db),
|
|
|
|
"next_task": get_next_task(db),
|
|
|
|
"later_tasks_count": len(get_later_tasks(db)),
|
|
|
|
"later_tasks_count": len(get_later_tasks(db)),
|
|
|
|
@@ -316,9 +317,9 @@ async def complete_task(
|
|
|
|
promote_tasks(db)
|
|
|
|
promote_tasks(db)
|
|
|
|
|
|
|
|
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
|
|
|
|
request,
|
|
|
|
"calm/partials/now_next_later.html",
|
|
|
|
"calm/partials/now_next_later.html",
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"request": request,
|
|
|
|
|
|
|
|
"now_task": get_now_task(db),
|
|
|
|
"now_task": get_now_task(db),
|
|
|
|
"next_task": get_next_task(db),
|
|
|
|
"next_task": get_next_task(db),
|
|
|
|
"later_tasks_count": len(get_later_tasks(db)),
|
|
|
|
"later_tasks_count": len(get_later_tasks(db)),
|
|
|
|
@@ -345,9 +346,9 @@ async def defer_task(
|
|
|
|
promote_tasks(db)
|
|
|
|
promote_tasks(db)
|
|
|
|
|
|
|
|
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
|
|
|
|
request,
|
|
|
|
"calm/partials/now_next_later.html",
|
|
|
|
"calm/partials/now_next_later.html",
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"request": request,
|
|
|
|
|
|
|
|
"now_task": get_now_task(db),
|
|
|
|
"now_task": get_now_task(db),
|
|
|
|
"next_task": get_next_task(db),
|
|
|
|
"next_task": get_next_task(db),
|
|
|
|
"later_tasks_count": len(get_later_tasks(db)),
|
|
|
|
"later_tasks_count": len(get_later_tasks(db)),
|
|
|
|
@@ -360,8 +361,9 @@ async def get_later_tasks_list(request: Request, db: Session = Depends(get_db)):
|
|
|
|
"""Render the expandable list of LATER tasks."""
|
|
|
|
"""Render the expandable list of LATER tasks."""
|
|
|
|
later_tasks = get_later_tasks(db)
|
|
|
|
later_tasks = get_later_tasks(db)
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
|
|
|
|
request,
|
|
|
|
"calm/partials/later_tasks_list.html",
|
|
|
|
"calm/partials/later_tasks_list.html",
|
|
|
|
{"request": request, "later_tasks": later_tasks},
|
|
|
|
{"later_tasks": later_tasks},
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -404,9 +406,9 @@ async def reorder_tasks(
|
|
|
|
|
|
|
|
|
|
|
|
# Re-render the relevant parts of the UI
|
|
|
|
# Re-render the relevant parts of the UI
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
return templates.TemplateResponse(
|
|
|
|
|
|
|
|
request,
|
|
|
|
"calm/partials/now_next_later.html",
|
|
|
|
"calm/partials/now_next_later.html",
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"request": request,
|
|
|
|
|
|
|
|
"now_task": get_now_task(db),
|
|
|
|
"now_task": get_now_task(db),
|
|
|
|
"next_task": get_next_task(db),
|
|
|
|
"next_task": get_next_task(db),
|
|
|
|
"later_tasks_count": len(get_later_tasks(db)),
|
|
|
|
"later_tasks_count": len(get_later_tasks(db)),
|
|
|
|
|