diff --git a/atdb/atdb/settings/base.py b/atdb/atdb/settings/base.py index 1d451986b532f0e54643d42ef2b14df9b1ad470f..07a3e77d0303df8d44bdf02c10ebf5c3f8235e93 100644 --- a/atdb/atdb/settings/base.py +++ b/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'] diff --git a/atdb/docs/ATDB-LDV Workflow Diagram.png b/atdb/docs/ATDB-LDV Workflow Diagram.png index 0035bc3bb0fbaa4f4814048548d46304af040a54..eeed7db92827385b647afd4d7cd5bbe68545db9b 100644 Binary files a/atdb/docs/ATDB-LDV Workflow Diagram.png and b/atdb/docs/ATDB-LDV Workflow Diagram.png differ diff --git a/atdb/taskdatabase/services/activities_handler.py b/atdb/taskdatabase/services/activities_handler.py index e8773db029d2cd9331a2430919bf06a9ce47abd6..2829762ac92bcd28e21ef13c1c00aec5bf64828b 100644 --- a/atdb/taskdatabase/services/activities_handler.py +++ b/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) diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index eebcaec9622860b51c9ce6583135781b8abaf8d7..7651909e711f59dbab809ca77b4bcfc8ce55ec5a 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/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>" diff --git a/atdb/taskdatabase/templates/taskdatabase/failures/retry_buttons.html b/atdb/taskdatabase/templates/taskdatabase/failures/retry_buttons.html index 3d31b9e14598e977b2e2b9a983d0b4264ebe829e..6126d241702fe94b93d4ed964ceeed2fc52a12b3 100644 --- a/atdb/taskdatabase/templates/taskdatabase/failures/retry_buttons.html +++ b/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 diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index a671ad6160e846a51fc17d5ed2876cdd96f0c3ce..50fad3c8b172d1687ceef12a58b2c8406396f553 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/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' %}