handle review comments

atdb/atdb/settings/base.py

@@ -204,7 +204,7 @@ LOGOUT_REDIRECT_URL = FORCE_SCRIPT_NAME + 'atdb'
 STATIC_URL = FORCE_SCRIPT_NAME + 'atdb/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
-ALL_STATUSSES = ['defining','defined','staging','staged','processing','processed','storing','stored','scrubbing','scrubbed','validated', 'pre_archiving','pre_archived', 'archiving','archived','finished']
+ALL_STATUSSES = ['defining','defined','staging','staged','processing','processed','storing','stored','scrubbing','scrubbed','validated', 'pre_archiving','pre_archived', 'archiving','archived','finishing','finished']
 ACTIVE_STATUSSES = ['staging','staged','processing','processed','validated','storing','stored','scrubbing','scrubbed','pre_archiving','pre_archived', 'archiving','archived']
 STATUSSES_WITH_DATA = ['staged','fetching','fetched','processing','processed','validated','storing','stored','scrubbing','scrubbed','pre_archiving','pre_archived', 'archiving','archived']
 AGGREGATES = ['failed','active','total']

atdb/taskdatabase/services/activities_handler.py

@@ -31,8 +31,8 @@ def calculate_ingested_fraction(this_task):
             pass
 
     incomplete = int(statusses['scrubbed']) + int(statusses['pre_archiving']) + int(statusses['pre_archived']) + \
-                 int(statusses['archiving']) + int(statusses['finishing']) + \
-                 int(statusses['suspended']) + int(statusses['archived_failed']) + int(statusses['finished_failed'])
+                 int(statusses['archiving']) +int(statusses['finishing']) + int(statusses['suspended']) + \
+                 int(statusses['pre_archived_failed']) + int(statusses['archived_failed']) + int(statusses['finished_failed'])
     complete = int(statusses['archived']) + int(statusses['finished'])
     completion = round(complete / (incomplete + complete) * 100)
 

atdb/taskdatabase/services/algorithms.py

@@ -533,7 +533,7 @@ def construct_tasks_per_workflow_html(request, workflow_results):
     for workflow_result in workflow_results:
 
         link = construct_link_to_workflow_api(request, workflow_result)
-        values = "<tr class='info'><td colspan='8'><b>" + link + "</b></td>"
+        values = "<tr class='info'><td colspan='9'><b>" + link + "</b></td>"
 
         # add sizes
         values += "<td><b>size to process:</b> " + str(human_readable(workflow_result['size_to_process'])) + "</td>"

atdb/taskdatabase/templates/taskdatabase/failures/retry_buttons.html

@@ -19,6 +19,6 @@
             {% if task.status == "archived_failed" %}
                     <a href="{% url 'task-retry-view' task.pk 'pre_archived' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
             {% endif %}
-            {% if task.status == "finished_failed" or task.status == "finishing_failed" %}
+            {% if task.status == "finished_failed" %}
                     <a href="{% url 'task-retry-view' task.pk 'finishing' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
             {% endif %}
\ No newline at end of file

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -31,7 +31,7 @@
             {% include 'taskdatabase/pagination.html' %}
         </div>
     </div>
-    <p class="footer"> Version 26 Feb 2024
+    <p class="footer"> Version 27 Feb 2024
 </div>
 
 {% include 'taskdatabase/refresh.html' %}