Skip to content
Snippets Groups Projects
Commit 6c24047d authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'SDC-1678-bugfix-quality-validation' into 'master'

Sdc 1678 bugfix quality validation

See merge request !389
parents 3ee023c5 0e603f78
No related branches found
No related tags found
1 merge request!389Sdc 1678 bugfix quality validation
Pipeline #106719 passed
......@@ -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()
......
......@@ -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' %}
......
......@@ -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
......@@ -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')
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment