feat: group daily focus items by project with "General" fallback
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -37,7 +37,8 @@ async def focus_view(
|
||||
SELECT df.*,
|
||||
t.title as title, t.priority, t.status as task_status,
|
||||
t.project_id, t.due_date, t.estimated_minutes,
|
||||
p.name as project_name,
|
||||
COALESCE(p.name, lp.name) as project_name,
|
||||
COALESCE(t.project_id, l.project_id) as effective_project_id,
|
||||
d.name as domain_name, d.color as domain_color,
|
||||
li.content as list_item_content, li.list_id as list_item_list_id,
|
||||
li.completed as list_item_completed,
|
||||
@@ -48,11 +49,23 @@ async def focus_view(
|
||||
LEFT JOIN domains d ON t.domain_id = d.id
|
||||
LEFT JOIN list_items li ON df.list_item_id = li.id
|
||||
LEFT JOIN lists l ON li.list_id = l.id
|
||||
LEFT JOIN projects lp ON l.project_id = lp.id
|
||||
WHERE df.focus_date = :target_date AND df.is_deleted = false
|
||||
ORDER BY df.sort_order, df.created_at
|
||||
"""), {"target_date": target_date})
|
||||
items = [dict(r._mapping) for r in result]
|
||||
|
||||
# Group items by project for template rendering
|
||||
from collections import OrderedDict
|
||||
_groups = OrderedDict()
|
||||
for item in items:
|
||||
key = item.get("effective_project_id") or "__general__"
|
||||
label = item.get("project_name") or "General"
|
||||
if key not in _groups:
|
||||
_groups[key] = {"label": label, "rows": []}
|
||||
_groups[key]["rows"].append(item)
|
||||
grouped_items = list(_groups.values())
|
||||
|
||||
# --- Available tasks ---
|
||||
available_tasks = []
|
||||
if source_type == "tasks":
|
||||
@@ -139,7 +152,7 @@ async def focus_view(
|
||||
|
||||
return templates.TemplateResponse("focus.html", {
|
||||
"request": request, "sidebar": sidebar,
|
||||
"items": items,
|
||||
"items": items, "grouped_items": grouped_items,
|
||||
"available_tasks": available_tasks,
|
||||
"available_list_items": available_list_items,
|
||||
"focus_date": target_date,
|
||||
|
||||
Reference in New Issue
Block a user