Validation Page

atdb/taskdatabase/models.py

@@ -43,7 +43,8 @@ def convert_quality_to_shortlist_for_template(task):
         list.append(str(task.quality_json['uv-coverage']))
         list.append(str(task.quality_json['sensitivity']))
         list.append(str(task.quality_json['observing-conditions']))
-
+        #url = '{ <a href="' + task.quality_json['plots'][0]["path"] + '">Diagnostic Plots</a> }'
+        list.append("Diagnostic Plots")
     except Exception as err:
         pass
 

atdb/taskdatabase/templates/taskdatabase/failures/failures_page.html

@@ -10,8 +10,8 @@
             <div class="col-8">
                 <h3>Failures</h3>
                 These are all the tasks that failed.
-                Click 'Retry' to restart a specific step in the workflow.
-                <a class="nav-link" href="{% url 'diagram' %}">See workflow diagram</a>
+                Click 'Retry' to restart the this step in the workflow (see 'Diagram' in top menu).
+                <td>{% include 'taskdatabase/filter/search.html' %}</td>
                 <hr>
             </div>
         </div>

atdb/taskdatabase/templates/taskdatabase/failures/tasks_failures.html

@@ -3,7 +3,7 @@
 
         {% if task.status != "removed_invisible" %}
         <div class="row">
-            <tr class="{{ task.status }}">
+            <tr>
 
                 <td>
                     <a href="{{ task.get_absolute_url }}" target="_blank">{{ task.id }} </a>
@@ -16,6 +16,13 @@
                            ><i class="fas fa-list"></i> Details
                         </a>&nbsp;
                     {% endif %}
+                    {% if task.has_quality %}
+                            <a class="open-modal btn btn-primary btn-sm"
+                               href="{% url 'task-quality' task.id my_tasks.number %}"
+                               data-popup-url="{% url 'task-quality' task.id my_tasks.number %}"
+                               ><i class="fas fa-balance-scale-right"></i> Quality
+                            </a>&nbsp;
+                    {% endif %}
                 </td>
 
                 {% if task.resume  %}
@@ -29,9 +36,35 @@
                 <td>{{ task.sas_id }}</td>
 
                 <td>{{ task.filter }} </td>
-                {% if task.status == "processed_failed" %}
+
+                {% if task.status == "staged_failed" or task.status == "staging_failed" %}
+                    <td>
+                        <a href="{% url 'task-retry-view' task.pk 'defined' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+                    </td>
+                {% endif %}
+                {% if task.status == "fetched_failed" or task.status == "fetching_failed" %}
+                    <td>
+                        <a href="{% url 'task-retry-view' task.pk 'staged' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+                    </td>
+                 {% endif %}
+                {% if task.status == "processed_failed" or task.status == "processing_failed" %}
+                    <td>
+                        <a href="{% url 'task-retry-view' task.pk 'fetched' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+                    </td>
+                {% endif %}
+                {% if task.status == "stored_failed" or task.status == "storing_failed" %}
+                    <td>
+                        <a href="{% url 'task-retry-view' task.pk 'processed' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+                    </td>
+                {% endif %}
+                {% if task.status == "scrubbed_failed" or task.status == "scrubbing_failed" %}
+                    <td>
+                        <a href="{% url 'task-retry-view' task.pk 'validated' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+                    </td>
+                {% endif %}
+                {% if task.status == "archived_failed" or task.status == "archiving_failed" %}
                     <td>
-                        <a href="{% url 'task-setstatus-view' task.pk 'fetched' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+                        <a href="{% url 'task-retry-view' task.pk 'scrubbed' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
                     </td>
                 {% endif %}
                 <td>

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -34,7 +34,7 @@
         {% include 'taskdatabase/pagination.html' %}
        </div>
     </div>
-    <p class="footer"> Version 1.0.0 (1 apr 2021 - 15:00)
+    <p class="footer"> Version 1.0.0 (1 apr 2021 - 16:00)
 
 </div>
 

atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality.html

@@ -16,13 +16,13 @@
                            ><i class="fas fa-list"></i> Details
                         </a>&nbsp;
                     {% endif %}
-                                            {% if task.has_quality %}
+                    {% if task.has_quality %}
                             <a class="open-modal btn btn-primary btn-sm"
                                href="{% url 'task-quality' task.id my_tasks.number %}"
                                data-popup-url="{% url 'task-quality' task.id my_tasks.number %}"
                                ><i class="fas fa-balance-scale-right"></i> Quality
                             </a>&nbsp;
-                        {% endif %}
+                    {% endif %}
                 </td>
 
                 {% if task.resume  %}

atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html

@@ -35,7 +35,7 @@
                         <td>{{value}}</td>
                      {% endfor %}
                 {% else %}
-                        <td>-</td><td>-</td><td>-</td>
+                        <td>-</td><td>-</td><td>-</td><td>-</td>
                 {% endif %}
 
                 <td>{{ task.quality|default_if_none:"-" }}</td>

atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html

@@ -8,6 +8,7 @@
     <th>uv-coverage</th>
     <th>Sensitivity</th>
     <th>Conditions</th>
+    <th>Diagnostic plots</th>
     <th>Current Quality</th>
     <th>Choose a Quality</th>
 </tr>
\ No newline at end of file

atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html

@@ -10,9 +10,7 @@
             <div class="col-8">
                 <h3>Validation</h3>
                 These are the tasks in status 'stored' that can be validated. Click one of the quality buttons to validate.
-                <td>
-                     {% include 'taskdatabase/filter/search.html' %}
-                 </td>
+                <td>{% include 'taskdatabase/filter/search.html' %}</td>
                 <hr>
             </div>
         </div>

atdb/taskdatabase/urls.py

@@ -82,6 +82,7 @@ urlpatterns = [
     path('tasks/<int:pk>/setstatus/<new_status>', views.TaskSetStatus, name='task-details-setstatus'),
 
     path('tasks/<int:pk>/validate/<quality>/<new_status>/<page>', views.TaskValidate, name='task-validate-view'),
+    path('tasks/<int:pk>/retry//<new_status>/<page>', views.TaskRetry, name='task-retry-view'),
 
     path('tasks/<int:pk>/change_priority/<priority_change>/<page>', views.ChangePriority, name='task-change-priority'),
     path('tasks/<int:pk>/change_priority/<priority_change>', views.ChangePriority, name='task-change-priority'),

atdb/taskdatabase/views.py

@@ -457,7 +457,6 @@ class ShowFailuresPage(ListView):
     context_object_name = 'my_tasks'
 
     def get_queryset(self):
-        status = self.request.GET.get('status')
         search_box = self.request.GET.get('search_box', None)
 
         # get the sort variable from the session or use default
@@ -469,12 +468,12 @@ class ShowFailuresPage(ListView):
         tasks = Task.objects.filter(status__icontains='failed').order_by(sort)
 
         # check if there is a 'task_filter' put on the session
-        try:
-            filter = self.request.session['task_filter']
-            if filter != 'all':
-                tasks = get_searched_tasks(filter, sort)
-        except:
-            pass
+        #try:
+        #    filter = self.request.session['task_filter']
+        #    if filter != 'all':
+        #        tasks = get_searched_tasks(filter, sort)
+        #except:
+        #    pass
 
         if (search_box is not None):
             tasks = get_searched_tasks(search_box, sort)
@@ -924,6 +923,21 @@ def TaskValidate(request, pk, quality, new_status, page=0):
         return redirect('/atdb/validation?page=' + page)
 
 
+@login_required
+def TaskRetry(request, pk, new_status, page=0):
+    model = Task
+    task = Task.objects.get(pk=pk)
+    task.new_status = new_status
+    task.save()
+
+    if page == 0:
+        # redirect to details screen
+        return redirect('/atdb/task_details')
+    else:
+        # redirect to tasks list
+        return redirect('/atdb/failures?page=' + page)
+
+
 # set a filter value in the session, used later by the 'get_searched_tasks' mechanism
 def TaskSetFilter(request, filter):
     request.session['task_filter'] = filter