Merge branch 'bug/sorting_screening_numbers' into 'master'

Bug/sorting screening numbers

Closes #271

See merge request NCER-PD/scheduling-system!186

smash/web/models/study_subject.py

@@ -184,19 +184,26 @@ class StudySubject(models.Model):
 
       parts = self.screening_number.split(';')
       matches, reminder = [], []
-      for part in parts:
-          chunks = part.strip().split('-')
-          if len(chunks) == 2:
-              letter, number = chunks
-              tupl = (letter, int(number))
-          else:
-              logger.warn('There are {} chunks in some parts of this screening_number: |{}|.'.format(
-                  len(chunks), self.screening_number))
-              tupl = (part.strip(), None)
-          if pattern is not None and pattern in part:
-              matches.append(tupl)
-          else:
-              reminder.append(tupl)
+  
+      try:
+        for part in parts:
+            chunks = part.strip().split('-')
+            if len(chunks) == 2:
+                letter, number = chunks
+                try:
+                  tupl = (letter, int(number))
+                except ValueError: #better than isdigit because isdigit fails with negative numbers and others
+                  tupl = (letter, number)
+            else:
+                logger.warn('There are {} chunks in some parts of this screening_number: |{}|.'.format(
+                    len(chunks), self.screening_number))
+                tupl = (part.strip(), None)
+            if pattern is not None and pattern in part:
+                matches.append(tupl)
+            else:
+                reminder.append(tupl)
+      except: #if the format is not the expected format
+        matches = parts
 
       return matches + sorted(reminder, reverse=reverse)
 

smash/web/tests/functions.py

@@ -204,13 +204,16 @@ def create_study_subject(subject_id=1, subject=None, nd_number='ND0001'):
     return study_subject
 
 
-def create_study_subject_with_multiple_screening_numbers(subject_id=1, subject=None):
+def create_study_subject_with_multiple_screening_numbers(subject_id=1, subject=None, screening_number=None):
     if subject is None:
         subject = create_subject()
+
+    if screening_number is None:
+        screening_number = 'E-00{}; L-00{}'.format(subject_id, subject_id)
     return StudySubject.objects.create(
         default_location=get_test_location(),
         type=SUBJECT_TYPE_CHOICES_CONTROL,
-        screening_number='E-00{}; L-00{}'.format(subject_id, subject_id),
+        screening_number=screening_number,
         study=get_test_study(),
         subject=subject
     )

smash/web/tests/models/test_study_subject.py

@@ -119,3 +119,24 @@ class SubjectModelTests(TestCase):
             'E-00{subject_id}; L-00{subject_id}', subject_id=1))
         self.assertEqual(subject.sort_matched_screening_first('potato'), create_result(
             'E-00{subject_id}; L-00{subject_id}', subject_id=1))
+
+    def test_sort_matched_screening_first_bad_number(self):
+
+        subject_id = 2
+        screening_number = 'L-0/0{}; E-00{}; F-0/1{}'.format(subject_id, subject_id, subject_id)
+
+        subject = create_study_subject_with_multiple_screening_numbers(
+            subject_id=subject_id, screening_number=screening_number)
+
+        self.assertEqual(subject.sort_matched_screening_first('E-'), [('E', subject_id), ('F', '0/12'), ('L', '0/02')])
+
+        self.assertEqual(subject.sort_matched_screening_first('L-'), [('L', '0/02'), ('E', subject_id), ('F', '0/12')])
+
+    def test_sort_matched_screening_first_bad_format(self):
+
+        screening_number = 'potato; tomato'
+        subject_id = 3
+        subject = create_study_subject_with_multiple_screening_numbers(
+            subject_id=subject_id, screening_number=screening_number)
+
+        self.assertEqual(subject.sort_matched_screening_first('L-'), [('potato', None), ('tomato', None)])