various enhancements for new tabs and bug fixes

routers/focus.py

@@ -17,7 +17,14 @@ templates = Jinja2Templates(directory="templates")
 
 
 @router.get("/")
-async def focus_view(request: Request, focus_date: Optional[str] = None, db: AsyncSession = Depends(get_db)):
+async def focus_view(
+    request: Request,
+    focus_date: Optional[str] = None,
+    domain_id: Optional[str] = None,
+    area_id: Optional[str] = None,
+    project_id: Optional[str] = None,
+    db: AsyncSession = Depends(get_db),
+):
     sidebar = await get_sidebar_data(db)
     target_date = date.fromisoformat(focus_date) if focus_date else date.today()
 
@@ -36,30 +43,57 @@ async def focus_view(request: Request, focus_date: Optional[str] = None, db: Asy
     items = [dict(r._mapping) for r in result]
 
     # Available tasks to add (open, not already in today's focus)
-    result = await db.execute(text("""
+    avail_where = [
+        "t.is_deleted = false",
+        "t.status NOT IN ('done', 'cancelled')",
+        "t.id NOT IN (SELECT task_id FROM daily_focus WHERE focus_date = :target_date AND is_deleted = false)",
+    ]
+    avail_params = {"target_date": target_date}
+
+    if domain_id:
+        avail_where.append("t.domain_id = :domain_id")
+        avail_params["domain_id"] = domain_id
+    if area_id:
+        avail_where.append("t.area_id = :area_id")
+        avail_params["area_id"] = area_id
+    if project_id:
+        avail_where.append("t.project_id = :project_id")
+        avail_params["project_id"] = project_id
+
+    avail_sql = " AND ".join(avail_where)
+
+    result = await db.execute(text(f"""
         SELECT t.id, t.title, t.priority, t.due_date,
                p.name as project_name, d.name as domain_name
         FROM tasks t
         LEFT JOIN projects p ON t.project_id = p.id
         LEFT JOIN domains d ON t.domain_id = d.id
-        WHERE t.is_deleted = false AND t.status NOT IN ('done', 'cancelled')
-            AND t.id NOT IN (
-                SELECT task_id FROM daily_focus
-                WHERE focus_date = :target_date AND is_deleted = false
-            )
+        WHERE {avail_sql}
         ORDER BY t.priority ASC, t.due_date ASC NULLS LAST
         LIMIT 50
-    """), {"target_date": target_date})
+    """), avail_params)
     available_tasks = [dict(r._mapping) for r in result]
 
     # Estimated total minutes
     total_est = sum(i.get("estimated_minutes") or 0 for i in items)
 
+    # Filter options
+    domains_repo = BaseRepository("domains", db)
+    domains = await domains_repo.list()
+    areas_repo = BaseRepository("areas", db)
+    areas = await areas_repo.list()
+    projects_repo = BaseRepository("projects", db)
+    projects = await projects_repo.list()
+
     return templates.TemplateResponse("focus.html", {
         "request": request, "sidebar": sidebar,
         "items": items, "available_tasks": available_tasks,
         "focus_date": target_date,
         "total_estimated": total_est,
+        "domains": domains, "areas": areas, "projects": projects,
+        "current_domain_id": domain_id or "",
+        "current_area_id": area_id or "",
+        "current_project_id": project_id or "",
         "page_title": "Daily Focus", "active_nav": "focus",
     })