diff --git a/atdb/taskdatabase/services/activities_handler.py b/atdb/taskdatabase/services/activities_handler.py index efeb2c9e1cbb48c81697c68346daaf75f88a9949..d4b8162d869c3614892382365bbac977992300c2 100644 --- a/atdb/taskdatabase/services/activities_handler.py +++ b/atdb/taskdatabase/services/activities_handler.py @@ -375,6 +375,7 @@ def update_activity(task): # check of any task of this activity already has LTA information. If so, copy to the activity level if task.status in UPDATE_ARCHIVE_STATUSSES: update_archive_info(task) + update_finished_fraction(task) if task.status in ACTIVITY_RESET_STATUSSEN: reset_activity(task) diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index a678c372df858563dbf95874d7d77c531cd487bd..877a17927c43229381b0bf7d179dcc19ec44fedc 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 6 Feb 2025</p> + <p class="footer"> Version 7 Feb 2025</p> </div> {% include 'taskdatabase/refresh.html' %} diff --git a/atdb/taskdatabase/templates/taskdatabase/ingest/headers.html b/atdb/taskdatabase/templates/taskdatabase/ingest/headers.html index 19b6125d0ed7b183d1d6b8b25e546a497c3687cd..f90fd2278537b081cbc2fd47092104791c5fd643 100644 --- a/atdb/taskdatabase/templates/taskdatabase/ingest/headers.html +++ b/atdb/taskdatabase/templates/taskdatabase/ingest/headers.html @@ -37,6 +37,7 @@ <th>Status</th> <th>Completion</th> + <th>Remaining</th> <th> SAS_ID (output) at LTA </th> diff --git a/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html b/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html index 057c5fd6e52df26b1984f826fede7a84ad47ab83..4a882abeffc06c6df9cf383cab01b0694e6bb3f5 100644 --- a/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html @@ -4,7 +4,7 @@ {% if task.status != "removed_invisible" %} <div class="row"> <tr> - <td>{{ task.sas_id }}</td> + <td><a href="{% url 'activity-detail-view-api' task.activity.id%}" target="_blank">{{ task.sas_id }}</a></td> <td>{{ task.project }}</td> <td> <a class="open-modal btn btn-primary btn-sm" @@ -27,6 +27,7 @@ <td>{{ task.purge_policy }}</td> <td>{{ task.activity.ingestq_status }}</td> <td>{{ task.activity.ingested_fraction|floatformat:"0" }}%</td> + <td>{{ task.activity.remaining|filesizeformat }}</td> <td> {% if task.activity.has_archived != None %} <a href={{ task.activity.archive.path_to_lta }} target="_blank">