numerous improvements

anatomy/models.py

@@ -99,8 +99,8 @@ class AnatomyQuestion(models.Model):
 
     def __str__(self):
         # Get first answer
-        a = self.answers.all().first()
-
+        return "{} [{}, {}]".format(self.GetPrimaryAnswer(), self.modality,
+                                             self.structure)
         # Get associated exams
         e = self.exams.all().values_list("name", flat=True)
         exams = ", ".join(e)
@@ -253,7 +253,7 @@ class UserAnswer(models.Model):
             exam = self.exam
         except (Exam.DoesNotExist, KeyError) as e:
             exam = "None"
-        return "{}/{}/{}: {}".format(exam, self.cid, self.question.id,
+        return "{}/{}/{}: {}".format(exam, self.cid, self.question.GetPrimaryAnswer(),
                                      self.answer)
 
     def clean(self):
@@ -284,7 +284,7 @@ class CidUserAnswer(models.Model):
             exam = self.exam
         except (Exam.DoesNotExist, KeyError) as e:
             exam = "None"
-        return "{}/{}/{}: {}".format(exam, self.cid, self.question.id,
+        return "{}/{}/{}: {}".format(exam, self.cid, self.question.GetPrimaryAnswer(),
                                      self.answer)
 
     def clean(self):