Resolve "import of serology data"

Closes #335 (closed), #336 (closed)

smash/web/api_views/subject.py

@@ -153,7 +153,9 @@ def get_subjects_order(subjects_to_be_ordered, order_column, order_direction, co
         order_direction = ""
     else:
         order_direction = "-"
-    if order_column == "first_name":
+    if order_column is None:
+        logger.warn("Column cannot be null")
+    elif order_column == "first_name":
         result = subjects_to_be_ordered.order_by(order_direction + 'subject__first_name')
     elif order_column == "last_name":
         result = subjects_to_be_ordered.order_by(order_direction + 'subject__last_name')
@@ -301,7 +303,9 @@ def get_subjects_filtered(subjects_to_be_filtered, filters):
     for row in filters:
         column = row[0]
         value = row[1]
-        if column == "first_name":
+        if column is None:
+            logger.warn("Filter column cannot be null")
+        elif column == "first_name":
             result = result.filter(subject__first_name__icontains=value)
         elif column == "last_name":
             result = result.filter(subject__last_name__icontains=value)