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/tests/test_calculated_qualities.py b/atdb/taskdatabase/tests/test_calculated_qualities.py index f5fe5ce64a4b15624d0d8060bac6c64e497e78c5..58627b613c0a67bf3e15d949c2bbc8f1c8c6df93 100644 --- a/atdb/taskdatabase/tests/test_calculated_qualities.py +++ b/atdb/taskdatabase/tests/test_calculated_qualities.py @@ -111,7 +111,7 @@ class TestCalculatedQualities(TestCase): quality_values = qualities.unpack_qualities_per_task(task,quality_values) try: - quality_per_sasid = task.calculated_qualities['per_sasid'] + quality_per_sasid = task.activity.calculated_quality except: # ignore the tasks that have no calculated quality. pass @@ -146,7 +146,7 @@ class TestCalculatedQualities(TestCase): quality_indicators = task.quality_json["summary"]['details']['quality_indicators'] try: - quality_per_sasid = task.calculated_qualities['per_sasid'] + quality_per_sasid = task.activity.calculated_quality except: # ignore the tasks that have no calculated quality. pass @@ -194,7 +194,7 @@ class TestCalculatedQualities(TestCase): quality_values = qualities.unpack_qualities_per_task(task,quality_values) try: - quality_per_sasid = task.calculated_qualities['per_sasid'] + quality_per_sasid = task.activity.calculated_quality except: # ignore the tasks that have no calculated quality. pass @@ -231,7 +231,7 @@ class TestCalculatedQualities(TestCase): quality_values = qualities.unpack_qualities_per_task(task,quality_values) try: - quality_per_sasid = task.calculated_qualities['per_sasid'] + quality_per_sasid = task.activity.calculated_quality except: # ignore the tasks that have no calculated quality. pass @@ -368,12 +368,10 @@ class TestCalculatedQualities(TestCase): # Act task.save() qualities_per_task = task.calculated_qualities['per_task'] - quality_per_sasid = task.calculated_qualities['per_sasid'] # Assert # good is based on rfi_percent self.assertEqual(qualities_per_task,expected_qualities_per_task) # also check if the quality per sas_id was stored in the expected locations - self.assertEqual(quality_per_sasid, "moderate") self.assertEqual(task.activity.calculated_quality, "moderate") \ No newline at end of file diff --git a/atdb/taskdatabase/tests/test_views.py b/atdb/taskdatabase/tests/test_views.py index f27922bc6fa40db79a3c79c13a9b771f2eec4f90..c66e7b88bd977155d1aeaf6153ca81e6369184f0 100644 --- a/atdb/taskdatabase/tests/test_views.py +++ b/atdb/taskdatabase/tests/test_views.py @@ -394,29 +394,7 @@ class TestViews(TestCase): self.assertEqual(response.status_code, 200) self.assertEqual(self.task1.remarks['discard_reason'], 'no longer needed') - @patch('taskdatabase.views.Task.objects.get') - @patch('taskdatabase.views.Task.objects.filter') - def test_validate_sasid(self, mock_filter, mock_get): - """ - test TaskValidatedSasId - """ - # Arrange - mock_get.return_value = self.task5 - mock_filter.return_value = [self.task5, self.task6] - - request = self.factory.get('/dummy-url') - self._set_up_session(request) - request.user = self.user - - # Act - response = TaskValidateSasId(request, self.task5.id, quality='calculated', new_status="validated", page="0") - - # Assert - self.assertEqual(self.task5.quality, 'good') - self.assertEqual(self.task6.quality, 'good') - self.assertEqual(response.status_code, 302) - self.assertEqual(response.url, reverse('validation') + '?' + 'page=0') @patch('taskdatabase.views.Task.objects.get') 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