From 9b709b8f024e2dd7df3a247a97a57e986fb662cd Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Thu, 28 Mar 2019 10:53:17 +0000 Subject: Flash warning when insufficient users present --- app/admin/routes.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'app/admin') diff --git a/app/admin/routes.py b/app/admin/routes.py index 862a705..0f2a691 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -26,7 +26,9 @@ def manage_tasks(): form_auto = AdminAutoAssignForm() user_list = [(u.id, u.username) for u in User.query.all()] - dataset_list = [(d.id, d.name) for d in Dataset.query.all()] + dataset_list = [ + (d.id, d.name) for d in Dataset.query.order_by(Dataset.name).all() + ] form_manual = AdminManageTaskForm() form_manual.username.choices = user_list @@ -76,6 +78,11 @@ def manage_tasks(): db.session.commit() available_users[user] -= 1 datasets_tbd[dataset] -= 1 + if any((datasets_tbd[d] > 0 for d in datasets)): + flash( + "Insufficient users available for the desired number of tasks per dataset.", + "info", + ) flash("Automatic task assignment successful.", "success") elif form_manual.validate_on_submit(): -- cgit v1.2.3