Merge branch 'SDC-933-QA-Process' into 'master'

SDCH-3881: fix 'archived' page, renamed to 'finished'

See merge request !288

atdb/atdb/static/taskdatabase/style.css

@@ -13,6 +13,11 @@ TD {
   color: blue;
 }
 
+.suspended,.discarded {
+    color: grey;
+    font-style: italic;
+}
+
 .active {
   background-color: lemonchiffon;
 }

atdb/taskdatabase/services/algorithms.py

@@ -708,6 +708,9 @@ def construct_inspectionplots(task,source='task_id'):
 
                 url = surl.replace(translation[0],translation[1])
                 results += '<tr><td><a href="' + url + '" target="_blank">'+ basename + '</a></td></tr>'
+#                if basename.endswith('png'):
+#                    results += '<tr><td><a href="' + url + '" target="_blank"><img width="800" src="' + url + '" alt="' + basename + '"/></a></td></tr>'
+
                 plot_files.append(basename)
 
     elif source == 'sas_id':
@@ -737,7 +740,10 @@ def construct_inspectionplots(task,source='task_id'):
 
                         url = surl.replace(translation[0], translation[1])
                         results += '<tr><td><a href="' + url + '" target="_blank">' + basename + '</a></td></tr>'
-                        #results += '<tr><td><a href="' + url + '" target="_blank">' + basename + '</a></td><td>'+str(plot['size'])+'</td></tr>'
+
+#                        if basename.endswith('png'):
+#                            results += '<tr><td><a href="' + url + '" target="_blank"><img width="800" src="' + url + '" alt="'+basename+'"/></a></td></tr>'
+
                         plot_files.append(plot_file)
 
             except Exception as error:

atdb/taskdatabase/static/taskdatabase/style.css

@@ -13,6 +13,11 @@ TD {
   color: blue;
 }
 
+.suspended,.discarded {
+    color: grey;
+    font-style: italic;
+}
+
 .active {
   background-color: lemonchiffon;
 }

atdb/taskdatabase/templates/astronauth/navbar.html

@@ -28,7 +28,7 @@
                 <li><a class="nav-link" href="{% url 'quality' %}">Quality</a></li>
                 <li><a class="nav-link" href="{% url 'validation' %}">Validation</a></li>
                 <li><a class="nav-link" href="{% url 'failures' %}">Failures</a></li>
-                <li><a class="nav-link" href="{% url 'archived' %}">Archived</a></li>
+                <li><a class="nav-link" href="{% url 'finished' %}">Finished</a></li>
                 <li><a class="nav-link" href="{% url 'monitoring' %}">Monitoring</a></li>
                 <li><a class="nav-link" href="{% url 'diagram' %}">Diagram</a></li>
 

atdb/taskdatabase/templates/taskdatabase/archived/headers.html

@@ -9,6 +9,11 @@
         <a href="{% url 'sort-tasks' '-workflow' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
         Workflow
         <a href="{% url 'sort-tasks' 'workflow' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+    <th>
+        <a href="{% url 'sort-tasks' '-status' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+        Status
+        <a href="{% url 'sort-tasks' 'status' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+    </th>
     <th>
         <a href="{% url 'sort-tasks' '-project' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
         Project

atdb/taskdatabase/templates/taskdatabase/archived/page.html

@@ -8,8 +8,8 @@
        <div class="card-body">
         <div class="row">
             <div class="col-12">
-                <h3>Archived</h3>
-                This overview shows the tasks that are <b>archived</b> in the LTA.
+                <h3>Finished</h3>
+                This overview shows the tasks that are <b>finished</b> and ingested into the LTA.
                 <hr>
                 <td>{% include 'taskdatabase/filter/search.html' %}</td>
             </div>

atdb/taskdatabase/templates/taskdatabase/archived/tasks.html

@@ -31,7 +31,12 @@
                            target="_blank"><i class="fas fa-project-diagram"></i> {{ task.workflow }}
                         </a></td>
                 </td>
-
+                {% if task.resume  %}
+                    <td class="bigger">{{ task.status }}</td>
+                {% endif %}
+                {% if not task.resume  %}
+                    <td class="bigger">{{ task.status }} (holding)</td>
+                {% endif %}
                 <td>{{ task.project }}</td>
                 <td>{{ task.filter }} </td>
                 <td>

atdb/taskdatabase/templates/taskdatabase/filter/filter_buttons.html

@@ -35,6 +35,7 @@
                 <a href="{% url 'task-set-filter' 'archiving' 'tasks' %}" class="btn btn-secondary btn-sm" role="button"><i>archiving</i></a>
                 <a href="{% url 'task-set-filter' 'archived' 'tasks' %}" class="btn btn-secondary btn-sm" role="button">archived</a>
                 <a href="{% url 'task-set-filter' 'finished' 'tasks' %}" class="btn btn-secondary btn-sm" role="button">finished</a>
+                <a href="{% url 'task-set-filter' 'suspended' 'tasks' %}" class="btn btn-secondary btn-sm" role="button">suspended</a>
 
                </td>
                  <td>

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -34,7 +34,7 @@
         {% include 'taskdatabase/pagination.html' %}
        </div>
     </div>
-    <p class="footer"> Version 31 March 2023
+    <p class="footer"> Version 4 April 2023
 
 </div>
 

atdb/taskdatabase/templates/taskdatabase/quality/filter_buttons.html

@@ -16,16 +16,9 @@
              <tr>
                <td>
                    {% include "taskdatabase/quality/clear_filter_button.html" %}
-                <a href="{% url 'task-set-active-filter' 'quality' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-layer-group"></i> Active</a>
                 <a href="{% url 'task-set-filter' 'failed' 'quality' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-layer-group"></i> Failed</a>
                  <a href="{% url 'task-set-onhold-filter' True 'quality' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-layer-group"></i> On Hold</a>
 
-                <a href="{% url 'task-set-filter' 'defined' 'quality' %}" class="btn btn-secondary btn-sm" role="button">defined</a>
-                <a href="{% url 'task-set-filter' 'staging' 'quality' %}" class="btn btn-secondary btn-sm" role="button"><i>staging</i></a>
-                <a href="{% url 'task-set-filter' 'staged' 'quality' %}" class="btn btn-secondary btn-sm" role="button">staged</a>
-                <a href="{% url 'task-set-filter' 'fetching' 'quality' %}" class="btn btn-secondary btn-sm" role="button"><i>fetching</i></a>
-                <a href="{% url 'task-set-filter' 'fetched' 'quality' %}" class="btn btn-secondary btn-sm" role="button">fetched</a>
-                <a href="{% url 'task-set-filter' 'processing' 'quality' %}" class="btn btn-secondary btn-sm" role="button"><i>processing</i></a>
                 <a href="{% url 'task-set-filter' 'processed' 'quality' %}" class="btn btn-secondary btn-sm" role="button">processed</a>
                 <a href="{% url 'task-set-filter' 'storing' 'quality' %}" class="btn btn-secondary btn-sm" role="button"><i>storing</i></a>
                 <a href="{% url 'task-set-filter' 'stored' 'quality' %}" class="btn btn-secondary btn-sm" role="button">stored</a>
@@ -35,6 +28,7 @@
                 <a href="{% url 'task-set-filter' 'archiving' 'quality' %}" class="btn btn-secondary btn-sm" role="button"><i>archiving</i></a>
                 <a href="{% url 'task-set-filter' 'archived' 'quality' %}" class="btn btn-secondary btn-sm" role="button">archived</a>
                 <a href="{% url 'task-set-filter' 'finished' 'quality' %}" class="btn btn-secondary btn-sm" role="button">finished</a>
+                <a href="{% url 'task-set-filter' 'suspended' 'quality' %}" class="btn btn-secondary btn-sm" role="button">suspended</a>
 
                </td>
                  <td>

atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html

@@ -19,6 +19,8 @@
                      <a href="{% url 'task-multi-setstatus' 'scrubbed' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>&nbsp;
                      <a href="{% url 'task-multi-setstatus' 'archived' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>&nbsp;
                      <a href="{% url 'task-multi-setstatus' 'finished' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>&nbsp;
+                     <a href="{% url 'task-multi-setstatus' 'suspended' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> suspended</a>&nbsp;
+
                     </tr>
                  </table>
                  {% endif %}

atdb/taskdatabase/templates/taskdatabase/query/status_buttons_per_row.html

@@ -10,5 +10,6 @@
  <a href="{% url 'task-setstatus' record.pk 'scrubbed' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>&nbsp;
  <a href="{% url 'task-setstatus' record.pk 'archived' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>
  <a href="{% url 'task-setstatus' record.pk 'finished' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>
+ <a href="{% url 'task-setstatus' record.pk 'suspended' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> suspended</a>
 
 {% endif %}

atdb/taskdatabase/templates/taskdatabase/tasks/details_card.html

@@ -5,6 +5,8 @@
            <table class="table table-striped">
                <tbody>
                 <tr><td><b>id</b></td><td><a href="{% url 'task-detail-view-api' task.pk %}" target="_blank">{{ task.id }} </a></td></tr>
+                <tr><td><b>slurm jobs</b></td><td><a href="{% url 'job-list-view-api' %}?task_id={{ task.id }}" {{ task.id }} target="_blank">jobs for task {{ task.id }} </a></td></tr>
+
                 <tr><td><b>priority</b></td><td>
                     {% if user.is_authenticated %}
                         <a href="{% url 'task-change-priority' task.pk '-10' %}" class="btn btn-warning btn-sm" role="button">-10</a>
@@ -52,6 +54,7 @@
                            ><i class="fas fa-balance-scale-right"></i> Quality
                         </a>&nbsp;
                     {% endif %}
+
                     </td>
                 </tr>
                 <tr><td><b>filter</b></td><td>{{ task.filter }}</td></tr>

atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html

@@ -8,4 +8,5 @@
 <a href="{% url 'task-details-setstatus' task.pk 'scrubbed' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'archived' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'finished' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>&nbsp;
-<a href="{% url 'task-details-setstatus' task.pk 'failed (manual)' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> failed (manual)</a>&nbsp;
+<a href="{% url 'task-details-setstatus' task.pk 'suspended' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> suspended</a>&nbsp;
+<a href="{% url 'task-details-setstatus' task.pk 'discard' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> discard</a>&nbsp;

atdb/taskdatabase/urls.py

@@ -18,7 +18,7 @@ urlpatterns = [
     path('quality', views.ShowQualityPage.as_view(), name='quality'),
     path('validation', views.ShowValidationPage.as_view(), name='validation'),
     path('failures', views.ShowFailuresPage.as_view(), name='failures'),
-    path('archived', views.ShowArchivedPage.as_view(), name='archived'),
+    path('finished', views.ShowFinishedPage.as_view(), name='finished'),
 
     path('task_details/<int:id>/<page>', views.TaskDetails, name='task-details'),
     path('task_details/', views.TaskDetails, name='task-details'),
@@ -68,7 +68,7 @@ urlpatterns = [
     path('configuration/', views.ConfigurationListViewAPI.as_view()),
     path('configuration/<int:pk>/', views.ConfigurationDetailsViewAPI.as_view(), name='configuration-detail-view-api'),
 
-    path('jobs/', views.JobListViewAPI.as_view()),
+    path('jobs/', views.JobListViewAPI.as_view(), name='job-list-view-api'),
     path('jobs/<int:pk>/', views.JobDetailsViewAPI.as_view(), name='job-detail-view-api'),
 
     path('postprocessing/', views.PostProcessingRuleListViewAPI.as_view()),

atdb/taskdatabase/views.py

@@ -404,7 +404,7 @@ class ShowFailuresPage(ListView):
         return tasks
 
 
-class ShowArchivedPage(ListView):
+class ShowFinishedPage(ListView):
     """
     This shows the tasks that are archived
     Note that the global filter is also applied
@@ -417,7 +417,7 @@ class ShowArchivedPage(ListView):
 
     def get_queryset(self):
 
-        archived_tasks = Task.objects.filter(status='archived')
+        archived_tasks = Task.objects.filter(status='finished')
         #tasks = get_filtered_tasks(self.request, archived_tasks, "sas_id")
         tasks = get_filtered_tasks(self.request, archived_tasks)