handling stakeholder feedback

adding additional statusses

atdb/taskdatabase/models.py

@@ -340,8 +340,7 @@ class Task(models.Model):
             except:
                 pass
 
-        incomplete = int(statusses['scrubbed']) + int(statusses['archiving']) \
-                     + int(statusses['suspended']) + int(statusses['discarded']) \
+        incomplete = int(statusses['scrubbed']) + int(statusses['archiving']) + int(statusses['suspended']) \
                      + int(statusses['archived_failed']) + int(statusses['finished_failed'])
         complete = int(statusses['archived']) + int(statusses['finished'])
         completion = round(complete / (incomplete + complete) * 100)

atdb/taskdatabase/tests/test_ingest_fraction.py

@@ -16,7 +16,7 @@ class TestIngestFraction(TestCase):
         Task.objects.get_or_create(filter='a',sas_id=54321, status='archived', workflow=workflow_requantisation)
         Task.objects.get_or_create(filter='a',sas_id=54321, status='finished', workflow=workflow_requantisation)
         Task.objects.get_or_create(filter='b',sas_id=54321, status='finished', workflow=workflow_requantisation)
-
+        Task.objects.get_or_create(filter='b', sas_id=54321, status='discarded', workflow=workflow_requantisation)
     def test_ingest_fraction(self):
 
         # collapse all tasks into a single task for this sas_id
@@ -26,5 +26,5 @@ class TestIngestFraction(TestCase):
         statusses = task.sasid_ingested_fraction['status']
         completion = task.sasid_ingested_fraction['completion']
 
-        self.assertEqual(statusses, {'scrubbed': 2, 'archiving': 1, 'archived': 1, 'finished': 2})
+        self.assertEqual(statusses, {'scrubbed': 2, 'archiving': 1, 'archived': 1, 'finished': 2, 'discarded': 1})
         self.assertEqual(completion,50)