From b27a82e853460b951e1535ba0b5848b4db81f8b2 Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Thu, 15 Feb 2024 15:13:21 +0100
Subject: [PATCH] deploy STEP-2, enable activity functionality for data
migration
---
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
atdb/taskdatabase/views.py | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 825cb6e8..2c0b6764 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 15 Feb 2024 (15:00)
+ <p class="footer"> Version 15 Feb 2024 (15:10)
</div>
{% include 'taskdatabase/refresh.html' %}
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index adeed488..e582fe13 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -23,7 +23,6 @@ from rest_framework.request import Request
from django.conf import settings
from .models import Activity, Task, Workflow, LogEntry, Configuration, Job, PostProcessingRule, Monitor, LatestMonitor
-from .models import associate_task_with_activity
from .services.common import State
from .services.signals import disconnect_signals, connect_signals
from .tables import TaskTable
@@ -1713,7 +1712,7 @@ def UpdateAllActivities(request):
try:
i += 1
task = Task.objects.filter(sas_id=activity.sas_id)[0]
- activities.update_activity(task)
+ activities_handler.update_activity(task)
logger.info(f'{i} of {total}')
except Exception as error:
logger.error(error)
@@ -1736,7 +1735,7 @@ def UpdateFailedTasks(request):
i = 0
for task in tasks:
i+=1
- activities.update_activity(task)
+ activities_handler.update_activity(task)
logger.info(f'{i} of {total}')
return redirect('index')
@@ -1753,7 +1752,7 @@ def UpdateIngestQTasks(request):
i = 0
for task in tasks:
i+=1
- activities.update_activity(task)
+ activities_handler.update_activity(task)
logger.info(f'{i} of {total}')
return redirect('index')
@@ -1765,7 +1764,7 @@ def UpdateFinishedTasks(request):
i = 0
for task in tasks:
i+=1
- activities.update_activity(task)
+ activities_handler.update_activity(task)
logger.info(f'{i} of {total}')
return redirect('index')
\ No newline at end of file
--
GitLab