feat: add shared task assignments and quick win sorting

app/routes/tasks.py

@@ -6,6 +6,7 @@ from datetime import date
 
 from flask import Blueprint, flash, redirect, render_template, request, url_for
 from flask_login import current_user, login_required
+from sqlalchemy import or_
 
 from ..forms import QuickTaskForm, TaskForm
 from ..models import QuickWin, TaskInstance, User
@@ -28,22 +29,44 @@ def _user_choices() -> list[tuple[int, str]]:
     return [(user.id, user.name) for user in User.query.order_by(User.name.asc()).all()]
 
 
+def _secondary_user_choices() -> list[tuple[int, str]]:
+    return [(0, "Keine zweite Person")] + _user_choices()
+
+
 @bp.route("/my-tasks")
 @login_required
 def my_tasks():
     tasks = (
-        TaskInstance.query.filter_by(assigned_user_id=current_user.id)
+        TaskInstance.query.filter(
+            or_(
+                TaskInstance.assigned_user_id == current_user.id,
+                TaskInstance.assigned_user_secondary_id == current_user.id,
+            )
+        )
         .order_by(TaskInstance.completed_at.is_(None).desc(), TaskInstance.due_date.asc())
         .all()
     )
     refresh_task_statuses(tasks)
 
-    sections = {"open": [], "soon": [], "overdue": [], "completed": []}
+    sections = {
+        "open": [],
+        "due_today": [],
+        "due_tomorrow": [],
+        "due_day_after_tomorrow": [],
+        "overdue": [],
+        "completed": [],
+    }
     for task in tasks:
         sections[task.status].append(task)
 
     completed_count = len(sections["completed"])
-    active_count = len(sections["open"]) + len(sections["soon"]) + len(sections["overdue"])
+    active_count = (
+        len(sections["open"])
+        + len(sections["due_today"])
+        + len(sections["due_tomorrow"])
+        + len(sections["due_day_after_tomorrow"])
+        + len(sections["overdue"])
+    )
     completion_ratio = 0 if completed_count + active_count == 0 else round(completed_count / (completed_count + active_count) * 100)
 
     return render_template(
@@ -64,9 +87,19 @@ def all_tasks():
     sort = request.args.get("sort", "due")
 
     if mine == "1":
-        query = query.filter(TaskInstance.assigned_user_id == current_user.id)
+        query = query.filter(
+            or_(
+                TaskInstance.assigned_user_id == current_user.id,
+                TaskInstance.assigned_user_secondary_id == current_user.id,
+            )
+        )
     elif user_filter:
-        query = query.filter(TaskInstance.assigned_user_id == user_filter)
+        query = query.filter(
+            or_(
+                TaskInstance.assigned_user_id == user_filter,
+                TaskInstance.assigned_user_secondary_id == user_filter,
+            )
+        )
 
     if sort == "points":
         query = query.order_by(TaskInstance.points_awarded.desc(), TaskInstance.due_date.asc())
@@ -79,10 +112,20 @@ def all_tasks():
     refresh_task_statuses(tasks)
 
     if status != "all":
-        status_map = {"completed": "completed", "overdue": "overdue", "open": "open", "soon": "soon"}
-        selected = status_map.get(status)
-        if selected:
-            tasks = [task for task in tasks if task.status == selected]
+        if status == "soon":
+            tasks = [task for task in tasks if task.status in {"due_today", "due_tomorrow", "due_day_after_tomorrow"}]
+        else:
+            status_map = {
+                "completed": "completed",
+                "overdue": "overdue",
+                "open": "open",
+                "today": "due_today",
+                "tomorrow": "due_tomorrow",
+                "day_after_tomorrow": "due_day_after_tomorrow",
+            }
+            selected = status_map.get(status)
+            if selected:
+                tasks = [task for task in tasks if task.status == selected]
 
     return render_template(
         "tasks/all_tasks.html",
@@ -97,6 +140,7 @@ def all_tasks():
 def create():
     form = TaskForm()
     form.assigned_user_id.choices = _user_choices()
+    form.assigned_user_secondary_id.choices = _secondary_user_choices()
     if request.method == "GET" and not form.due_date.data:
         form.due_date.data = today_local()
 
@@ -158,13 +202,15 @@ def edit(task_id: int):
     task = TaskInstance.query.get_or_404(task_id)
     form = TaskForm(obj=task.task_template)
     form.assigned_user_id.choices = _user_choices()
+    form.assigned_user_secondary_id.choices = _secondary_user_choices()
     next_url = request.args.get("next") or request.form.get("next") or request.referrer or url_for("tasks.all_tasks")
 
     if request.method == "GET":
         form.title.data = task.title
         form.description.data = task.description
-        form.default_points.data = task.points_awarded
+        form.default_points.data = task.task_template.default_points
         form.assigned_user_id.data = task.assigned_user_id or _user_choices()[0][0]
+        form.assigned_user_secondary_id.data = task.assigned_user_secondary_id or 0
         form.due_date.data = task.due_date
         form.recurrence_interval_value.data = task.task_template.recurrence_interval_value or 1
         form.recurrence_interval_unit.data = task.task_template.recurrence_interval_unit
@@ -200,8 +246,15 @@ def complete(task_id: int):
         return redirect(request.referrer or url_for("tasks.my_tasks"))
 
     completed_by_id = current_user.id
-    if task.assigned_user_id and task.assigned_user_id != current_user.id and choice == "assigned":
-        completed_by_id = task.assigned_user_id
+    allowed_ids = {current_user.id}
+    if task.assigned_user_id:
+        allowed_ids.add(task.assigned_user_id)
+    if task.assigned_user_secondary_id:
+        allowed_ids.add(task.assigned_user_secondary_id)
+    if choice != "me":
+        selected_user_id = request.form.get("completed_for", type=int)
+        if selected_user_id in allowed_ids:
+            completed_by_id = selected_user_id
 
     complete_task(task, completed_by_id)
     flash("Punkte verbucht. Gute Arbeit.", "success")