feat: add shared task assignments and quick win sorting

This commit is contained in:
2026-04-15 13:18:50 +02:00
parent f8f3641811
commit 4233175067
18 changed files with 414 additions and 55 deletions

View File

@@ -5,6 +5,7 @@ from uuid import uuid4
from flask import Blueprint, current_app, flash, jsonify, redirect, render_template, request, url_for
from flask_login import current_user, login_required
from sqlalchemy import func
from werkzeug.utils import secure_filename
from ..extensions import csrf, db
@@ -109,6 +110,7 @@ def quick_wins():
effort=quick_win_form.effort.data,
active=True,
created_by_user_id=current_user.id,
sort_order=(db.session.query(func.max(QuickWin.sort_order)).scalar() or -1) + 1,
)
db.session.add(quick_win)
db.session.commit()
@@ -120,7 +122,7 @@ def quick_wins():
quick_win_form=quick_win_form,
quick_task_config_form=quick_task_config_form,
quick_task_config=quick_task_config,
quick_wins=QuickWin.query.filter_by(active=True).order_by(QuickWin.id.asc()).all(),
quick_wins=QuickWin.query.filter_by(active=True).order_by(QuickWin.sort_order.asc(), QuickWin.id.asc()).all(),
settings_tabs=_settings_tabs(),
active_settings_tab="settings.quick_wins",
)
@@ -268,6 +270,31 @@ def update_quick_win(quick_win_id: int):
return redirect(url_for("settings.quick_wins"))
@bp.route("/quick-wins/reorder", methods=["POST"])
@login_required
@csrf.exempt
def reorder_quick_wins():
payload = request.get_json(silent=True) or {}
raw_ids = payload.get("ids", [])
ordered_ids = [int(item) for item in raw_ids if str(item).isdigit()]
quick_wins = QuickWin.query.filter_by(active=True).all()
quick_wins_by_id = {quick_win.id: quick_win for quick_win in quick_wins}
for position, quick_win_id in enumerate(ordered_ids):
quick_win = quick_wins_by_id.get(quick_win_id)
if quick_win:
quick_win.sort_order = position
used_ids = set(ordered_ids)
remaining = [quick_win for quick_win in quick_wins if quick_win.id not in used_ids]
for offset, quick_win in enumerate(sorted(remaining, key=lambda item: (item.sort_order, item.id)), start=len(ordered_ids)):
quick_win.sort_order = offset
db.session.commit()
return jsonify({"ok": True})
@bp.route("/users/<int:user_id>/toggle-admin", methods=["POST"])
@login_required
def toggle_admin(user_id: int):
@@ -308,7 +335,9 @@ def delete_user(user_id: int):
return redirect(url_for("settings.index"))
TaskTemplate.query.filter_by(default_assigned_user_id=user.id).update({"default_assigned_user_id": None})
TaskTemplate.query.filter_by(default_assigned_user_secondary_id=user.id).update({"default_assigned_user_secondary_id": None})
TaskInstance.query.filter_by(assigned_user_id=user.id).update({"assigned_user_id": None})
TaskInstance.query.filter_by(assigned_user_secondary_id=user.id).update({"assigned_user_secondary_id": None})
TaskInstance.query.filter_by(completed_by_user_id=user.id).update({"completed_by_user_id": None})
MonthlyScoreSnapshot.query.filter_by(user_id=user.id).delete()
NotificationLog.query.filter_by(user_id=user.id).delete()