giteadmin/lifeos-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: focus page table layout with domain grouping, area/project columns, compact padding

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Michael
2026-03-03 15:51:14 +00:00
parent bbb80067ef
commit 4c072beec0
2 changed files with 42 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
routers/focus.py
View File

@@ -42,8 +42,8 @@ async def focus_view(
COALESCE(d.name, ld.name) as domain_name,
COALESCE(d.color, ld.color) as domain_color,
COALESCE(d.id, ld.id) as effective_domain_id,
COALESCE(a.name, la.name) as area_name,
COALESCE(a.id, la.id) as effective_area_id,
COALESCE(a.name, pa.name, la.name) as area_name,
COALESCE(a.id, pa.id, la.id) as effective_area_id,
li.content as list_item_content, li.list_id as list_item_list_id,
li.completed as list_item_completed,
l.name as list_name
@@ -52,6 +52,7 @@ async def focus_view(
LEFT JOIN projects p ON t.project_id = p.id
LEFT JOIN domains d ON t.domain_id = d.id
LEFT JOIN areas a ON t.area_id = a.id
LEFT JOIN areas pa ON p.area_id = pa.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
@@ -62,7 +63,7 @@ async def focus_view(
"""), {"target_date": target_date})
items = [dict(r._mapping) for r in result]
# Build Domain > Area > Project hierarchy
# Group items by domain only — area/project shown as inline columns
from collections import OrderedDict
domain_map = OrderedDict()
for item in items:
@@ -70,41 +71,10 @@ async def focus_view(
dl = item.get("domain_name") or "General"
dc = item.get("domain_color") or ""
if dk not in domain_map:
domain_map[dk] = {"label": dl, "color": dc, "areas": OrderedDict()}
domain_map[dk] = {"label": dl, "color": dc, "rows": []}
domain_map[dk]["rows"].append(item)
ak = item.get("effective_area_id") or "__none__"
al = item.get("area_name") or "General"
area_map = domain_map[dk]["areas"]
if ak not in area_map:
area_map[ak] = {"label": al, "projects": OrderedDict()}
pk = item.get("effective_project_id") or "__none__"
pl = item.get("project_name") or "General"
proj_map = area_map[ak]["projects"]
if pk not in proj_map:
proj_map[pk] = {"label": pl, "rows": []}
proj_map[pk]["rows"].append(item)
# Convert to nested lists for Jinja — "General" first, then alpha
def _sorted_projects(proj_dict):
general = []
named = []
for pk, pv in proj_dict.items():
entry = {"label": pv["label"], "rows": pv["rows"]}
if pk == "__none__":
general.append(entry)
else:
named.append(entry)
named.sort(key=lambda p: p["label"].lower())
return general + named
hierarchy = []
for dk, dv in domain_map.items():
domain_group = {"label": dv["label"], "color": dv["color"], "areas": []}
for ak, av in dv["areas"].items():
area_group = {"label": av["label"], "projects": _sorted_projects(av["projects"])}
domain_group["areas"].append(area_group)
hierarchy.append(domain_group)
hierarchy = list(domain_map.values())
# --- Available tasks ---
available_tasks = []