Backlink to task

cvat/apps/dashboard/__init__.py

@@ -3,3 +3,6 @@
 #
 # SPDX-License-Identifier: MIT
 
+from cvat.settings.base import JS_3RDPARTY
+
+JS_3RDPARTY['engine'] = JS_3RDPARTY.get('engine', []) + ['dashboard/js/enginePlugin.js']

cvat/apps/dashboard/static/dashboard/js/enginePlugin.js

@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+"use strict";
+
+window.addEventListener('DOMContentLoaded', () => {
+    $(`<button class="menuButton semiBold h2"> Open Task </button>`).on('click', () => {
+        let win = window.open(`${window.location.origin }/dashboard/?jid=${window.cvat.job.id}`, '_blank');
+        win.focus();
+    }).prependTo('#engineMenuButtons');
+});
+

cvat/apps/dashboard/templates/dashboard/dashboard.html

@@ -55,7 +55,7 @@
             </table>
         </center>
 
-        {% autopaginate data %}
+        {% autopaginate data tasks_per_page %}
         <div style="float: left; width: 100%">
             {% for item in data %}
                 {% include "dashboard/task.html" %}

cvat/apps/dashboard/views.py

@@ -10,7 +10,7 @@
 from django.contrib.auth.decorators import permission_required
 from cvat.apps.authentication.decorators import login_required
 
-from cvat.apps.engine.models import Task as TaskModel
+from cvat.apps.engine.models import Task as TaskModel, Job as JobModel
 from cvat.settings.base import JS_3RDPARTY
 
 import os
@@ -97,22 +97,39 @@ def DetailTaskInfo(request, task, dst_dict):
 @login_required
 @permission_required('engine.view_task', raise_exception=True)
 def DashboardView(request):
-    filter_name = request.GET['search'] if 'search' in request.GET else None
-    tasks_query_set = list(TaskModel.objects.prefetch_related('segment_set').order_by('-created_date').all())
-    if filter_name is not None:
-        tasks_query_set = list(filter(lambda x: filter_name.lower() in x.name.lower(), tasks_query_set))
+    query_name = request.GET['search'] if 'search' in request.GET else None
+    query_job = int(request.GET['jid']) if 'jid' in request.GET and request.GET['jid'].isdigit() else None
+    query_page = None
+    elements_per_page = 20
+    task_list = None
+
+    if query_job is not None and JobModel.objects.filter(pk = query_job).exists():
+        task_list = [JobModel.objects.select_related('segment__task').get(pk = query_job).segment.task]
+    else:
+        task_list = list(TaskModel.objects.prefetch_related('segment_set').order_by('-created_date').all())
+        if query_name is not None:
+            task_list = list(filter(lambda x: query_name.lower() in x.name.lower(), task_list))
+        query_page = int(request.GET['page']) if 'page' in request.GET and request.GET['page'].isdigit() else None
+
+    if query_page is not None:
+        start, stop = (query_page - 1) * elements_per_page, query_page * elements_per_page - 1    # 0, 19; 20, 39, 40, 59 etc
+        task_list = [ None if idx < start or idx > stop else task for idx, task in enumerate(task_list) ]
 
     data = []
-    for task in tasks_query_set:
-        task_info = {}
-        MainTaskInfo(task, task_info)
-        DetailTaskInfo(request, task, task_info)
-        data.append(task_info)
+    for task in task_list:
+        if task is not None:
+            task_info = {}
+            MainTaskInfo(task, task_info)
+            DetailTaskInfo(request, task, task_info)
+            data.append(task_info)
+        else:
+            data.append(None)
 
     return render(request, 'dashboard/dashboard.html', {
         'data': data,
         'max_upload_size': settings.LOCAL_LOAD_MAX_FILES_SIZE,
         'max_upload_count': settings.LOCAL_LOAD_MAX_FILES_COUNT,
+        'tasks_per_page': elements_per_page,
         'share_path': os.getenv('CVAT_SHARE_URL', default=r'${cvat_root}/share'),
         'js_3rdparty': JS_3RDPARTY.get('dashboard', [])
     })