From 7faff61d1ba4835a5b947989a6ffed5ab479db45 Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Thu, 6 Feb 2025 09:58:05 +0100
Subject: [PATCH] bugfix SDC-1663
---
atdb/taskdatabase/services/calculated_qualities.py | 3 ---
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
atdb/taskdatabase/views.py | 3 ++-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/atdb/taskdatabase/services/calculated_qualities.py b/atdb/taskdatabase/services/calculated_qualities.py
index 178494e9..6f558cf9 100644
--- a/atdb/taskdatabase/services/calculated_qualities.py
+++ b/atdb/taskdatabase/services/calculated_qualities.py
@@ -199,9 +199,6 @@ def calculate_qualities(task, tasks_for_this_sasid, quality_thresholds):
calculated_quality_sasid = calculate_quality_sasid(task, tasks_for_this_sasid)
if calculated_quality_sasid:
- # store the result in task.calculated_qualities (not yet saved in the database)
- qualities['per_sasid'] = calculated_quality_sasid
-
# store the result in the activity, and save it
task.activity.calculated_quality = calculated_quality_sasid
task.activity.save()
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 5bc1d629..a678c372 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 4 Feb 2025</p>
+ <p class="footer"> Version 6 Feb 2025</p>
</div>
{% include 'taskdatabase/refresh.html' %}
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index cc4323a7..f8fafc20 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -1300,7 +1300,8 @@ def TaskValidateSasId(request, pk, quality, new_status, page=0):
if quality == 'calculated':
try:
- quality = task.calculated_qualities['per_sasid']
+ #quality = task.calculated_qualities['per_sasid']
+ quality = task.activity.calculated_quality
except:
# no calculated quality present, just the existing quality (so no change)
quality = task.quality
--
GitLab