From ac2b5cd04bfb7a4e63089685cd99bd56dc68fa2b Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Fri, 16 Feb 2024 13:02:33 +0100
Subject: [PATCH] omit discarded and suspended tasks
---
atdb/taskdatabase/views.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 0b803d23..16c5bc89 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -71,6 +71,7 @@ class TaskFilter(filters.FilterSet):
# http://localhost:8000/atdb/tasks/?predecessor__isnull=True
'predecessor': ['isnull'],
'predecessor__status': ['exact', 'icontains', 'in', 'startswith'],
+ 'activity' : ['isnull'],
'activity__id': ['exact'],
'activity__ingested_fraction' : ['exact','lt', 'lte', 'gt', 'gte','isnull'],
}
@@ -1742,7 +1743,9 @@ def UpdateActivitySasId(request, sas_id):
for task in tasks:
i += 1
- activities_handler.update_activity(task)
+ if task.status not in ['discarded', 'suspended']:
+ activities_handler.update_activity(task)
+
logger.info(f'{i} of {total} for sas_id = {sas_id}')
logger.info(f'UpdateActivitySasId {sas_id}')
--
GitLab