aboutsummaryrefslogtreecommitdiff
path: root/app/main/routes.py
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2019-06-03 15:19:28 +0100
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2019-06-03 15:19:28 +0100
commit94c3656bea0ff16b826f1adf34a3ada9084c7f8f (patch)
treeb9e64849ea5dd15ab94fb3b8f79a2080fa050d1e /app/main/routes.py
parentInitial version of demo (diff)
downloadAnnotateChange-94c3656bea0ff16b826f1adf34a3ada9084c7f8f.tar.gz
AnnotateChange-94c3656bea0ff16b826f1adf34a3ada9084c7f8f.zip
Rewrite the task assignment flow
With the demo in place, we're rewriting the task assignment flow such that users only get a task assigned when: 1. They finish the demo 2. They finish a task 3. They login again. This way we can better balance the datasets and we won't have datasets that don't get enough annotations because some users didn't finish tasks they were assigned.
Diffstat (limited to 'app/main/routes.py')
-rw-r--r--app/main/routes.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/app/main/routes.py b/app/main/routes.py
index 11de2f9..a0033b1 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -11,6 +11,7 @@ from app.decorators import login_required
from app.main import bp
from app.models import Annotation, Task
from app.utils.datasets import load_data_for_chart
+from app.utils.tasks import generate_user_task
logger = logging.getLogger(__name__)
@@ -31,7 +32,9 @@ def index():
user_id = current_user.id
tasks = Task.query.filter_by(annotator_id=user_id).all()
tasks_done = [t for t in tasks if t.done and not t.dataset.is_demo]
- tasks_todo = [t for t in tasks if not t.done]
+ tasks_todo = [
+ t for t in tasks if (not t.done) and (not t.dataset.is_demo)
+ ]
return render_template(
"index.html",
title="Home",
@@ -78,8 +81,18 @@ def annotate(task_id):
task.done = True
task.annotated_on = now
db.session.commit()
-
flash("Your annotation has been recorded, thank you!", "success")
+
+ # assign a new task if necessary
+ task = generate_user_task(current_user)
+ if task is None:
+ return url_for("main.index")
+ db.session.add(task)
+ db.session.commit()
+ flash(
+ "A new dataset has been assigned for you to annotate. Thanks for your help!",
+ "info",
+ )
return url_for("main.index")
task = Task.query.filter_by(id=task_id).first()