From 4bb40fd66aa52b30c4a045cd40809521e570b11d Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Fri, 24 Jan 2025 11:53:23 +0100
Subject: [PATCH] hotfix: activity did not filter on service_filter
---
atdb/atdb/settings/base.py | 4 +++-
atdb/taskdatabase/services/algorithms.py | 7 +++++++
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
atdb/taskdatabase/views.py | 1 +
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/atdb/atdb/settings/base.py b/atdb/atdb/settings/base.py
index 0c06f1ec..9f481122 100644
--- a/atdb/atdb/settings/base.py
+++ b/atdb/atdb/settings/base.py
@@ -280,5 +280,7 @@ CSRF_COOKIE_NAME = 'atdb_csrftoken'
#SILKY_PYTHON_PROFILER_BINARY = False
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+ACCOUNT_UNIQUE_EMAIL = False
-ACCOUNT_UNIQUE_EMAIL = False
\ No newline at end of file
+# this limits the size of the 'monitoring' table where all the running services report heartbeats to ATDB
+MAX_MONITORING_HISTORY_HOURS = 168 # 1 week
\ No newline at end of file
diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py
index 4cb90d5f..9e82a225 100644
--- a/atdb/taskdatabase/services/algorithms.py
+++ b/atdb/taskdatabase/services/algorithms.py
@@ -1029,6 +1029,13 @@ def construct_imaging_summary(task):
results += '<td colspan="2">' + str(rfi) + '</td>'
results += '</tr>'
+ if 'median_dataloss' in details:
+ # add RFI median_dataloss (if present)
+ dataloss = details['median_dataloss']
+ results += '<tr><td><b>median dataloss</b></td>'
+ results += '<td colspan="2">' + str(dataloss) + '</td>'
+ results += '</tr>'
+
try:
# add calculated quality (if present)
calculated_qualities = task.calculated_qualities
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 32321d80..3d6ccb91 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 17 Jan 2025</p>
+ <p class="footer"> Version 24 Jan 2025</p>
</div>
{% include 'taskdatabase/refresh.html' %}
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index c2592439..cc4323a7 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -144,6 +144,7 @@ class ActivityFilter(filters.FilterSet):
'is_processed': ['exact'],
'is_verified': ['exact'],
'is_aggregated': ['exact'],
+ 'service_filter': ['exact','icontains']
}
--
GitLab