feat: add floating quick task flow
This commit is contained in:
@@ -8,8 +8,9 @@ from flask_login import current_user, login_required
|
||||
from werkzeug.utils import secure_filename
|
||||
|
||||
from ..extensions import csrf, db
|
||||
from ..forms import AdminUserForm, SettingsProfileForm
|
||||
from ..forms import AdminUserForm, QuickTaskConfigForm, SettingsProfileForm
|
||||
from ..models import BadgeDefinition, MonthlyScoreSnapshot, NotificationLog, PushSubscription, TaskInstance, TaskTemplate, User
|
||||
from ..services.app_settings import get_quick_task_config, set_setting_int
|
||||
from ..services.badges import earned_badges_for_user
|
||||
from ..services.notifications import push_enabled
|
||||
|
||||
@@ -46,6 +47,7 @@ def _save_avatar(file_storage) -> str:
|
||||
def index():
|
||||
form = SettingsProfileForm(original_email=current_user.email, obj=current_user)
|
||||
admin_form = AdminUserForm(prefix="admin")
|
||||
quick_task_config_form = QuickTaskConfigForm(prefix="quickconfig")
|
||||
if form.validate_on_submit():
|
||||
current_user.name = form.name.data.strip()
|
||||
current_user.email = form.email.data.lower().strip()
|
||||
@@ -64,6 +66,8 @@ def index():
|
||||
"settings/index.html",
|
||||
form=form,
|
||||
admin_form=admin_form,
|
||||
quick_task_config_form=quick_task_config_form,
|
||||
quick_task_config=get_quick_task_config(),
|
||||
users=User.query.order_by(User.is_admin.desc(), User.name.asc()).all(),
|
||||
earned_badges=earned_badges_for_user(current_user.id),
|
||||
push_ready=push_enabled(),
|
||||
@@ -127,6 +131,28 @@ def create_user():
|
||||
return redirect(url_for("settings.index"))
|
||||
|
||||
|
||||
@bp.route("/quick-task-config", methods=["POST"])
|
||||
@login_required
|
||||
def update_quick_task_config():
|
||||
if not _require_admin():
|
||||
return redirect(url_for("settings.index"))
|
||||
|
||||
form = QuickTaskConfigForm(prefix="quickconfig")
|
||||
if not form.validate_on_submit():
|
||||
for field_errors in form.errors.values():
|
||||
for error in field_errors:
|
||||
flash(error, "error")
|
||||
return redirect(url_for("settings.index"))
|
||||
|
||||
set_setting_int("quick_task_points_fast", form.fast_points.data)
|
||||
set_setting_int("quick_task_points_normal", form.normal_points.data)
|
||||
set_setting_int("quick_task_points_medium", form.medium_points.data)
|
||||
set_setting_int("quick_task_points_heavy", form.heavy_points.data)
|
||||
db.session.commit()
|
||||
flash("Schnellaufgaben-Punkte wurden aktualisiert.", "success")
|
||||
return redirect(url_for("settings.index"))
|
||||
|
||||
|
||||
@bp.route("/users/<int:user_id>/toggle-admin", methods=["POST"])
|
||||
@login_required
|
||||
def toggle_admin(user_id: int):
|
||||
|
||||
@@ -7,10 +7,17 @@ from datetime import date
|
||||
from flask import Blueprint, flash, redirect, render_template, request, url_for
|
||||
from flask_login import current_user, login_required
|
||||
|
||||
from ..forms import TaskForm
|
||||
from ..forms import QuickTaskForm, TaskForm
|
||||
from ..models import TaskInstance, User
|
||||
from ..services.app_settings import get_quick_task_config
|
||||
from ..services.dates import month_label, today_local
|
||||
from ..services.tasks import complete_task, create_task_template_and_instance, refresh_task_statuses, update_template_and_instance
|
||||
from ..services.tasks import (
|
||||
complete_task,
|
||||
create_quick_task,
|
||||
create_task_template_and_instance,
|
||||
refresh_task_statuses,
|
||||
update_template_and_instance,
|
||||
)
|
||||
|
||||
|
||||
bp = Blueprint("tasks", __name__, url_prefix="")
|
||||
@@ -99,6 +106,27 @@ def create():
|
||||
return render_template("tasks/task_form.html", form=form, mode="create", task=None)
|
||||
|
||||
|
||||
@bp.route("/tasks/quick", methods=["POST"])
|
||||
@login_required
|
||||
def quick_create():
|
||||
form = QuickTaskForm(prefix="quick")
|
||||
config = get_quick_task_config()
|
||||
form.effort.choices = [
|
||||
(key, f"{values['label']} · {values['points']} Punkte")
|
||||
for key, values in config.items()
|
||||
]
|
||||
|
||||
if not form.validate_on_submit():
|
||||
for field_errors in form.errors.values():
|
||||
for error in field_errors:
|
||||
flash(error, "error")
|
||||
return redirect(request.referrer or url_for("tasks.my_tasks"))
|
||||
|
||||
task = create_quick_task(form.title.data, form.effort.data, current_user)
|
||||
flash(f"Schnellaufgabe „{task.title}“ wurde für dich angelegt.", "success")
|
||||
return redirect(request.referrer or url_for("tasks.my_tasks"))
|
||||
|
||||
|
||||
@bp.route("/tasks/<int:task_id>/edit", methods=["GET", "POST"])
|
||||
@login_required
|
||||
def edit(task_id: int):
|
||||
@@ -171,4 +199,3 @@ def calendar_view():
|
||||
view=view,
|
||||
tasks=tasks,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user