diff --git a/atdb/taskdatabase/services/calculated_qualities.py b/atdb/taskdatabase/services/calculated_qualities.py index 178494e9bed8dda87e45078e4f6835e2c0c85d51..6f558cf9cef783124cdb6ed1ae41d08c2a12168d 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 5bc1d629f39e1c6b7f457b52c2d1cbb447a9bdef..a678c372df858563dbf95874d7d77c531cd487bd 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 cc4323a734addeae397605efd93635dfec328e01..f8fafc2056e6a3628319d528c0cf64ed0e141c89 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