Skip to content
Snippets Groups Projects
Commit 19cbf788 authored by Carlos Vega's avatar Carlos Vega
Browse files

Fixes #262 : sorting with empty screening number fails

parent 7536a235
No related branches found
No related tags found
1 merge request!181Hotfix/import file
......@@ -179,23 +179,26 @@ class StudySubject(models.Model):
)
def sort_matched_screening_first(self, pattern, reverse=False):
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)
return matches + sorted(reminder, reverse=reverse)
if self.screening_number is None:
return None
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)
return matches + sorted(reminder, reverse=reverse)
@staticmethod
def check_nd_number_regex(regex_str):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment