From 3416465f8a90d86c570348310b750ea26a90d3c0 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 25 Oct 2018 17:08:38 +0200 Subject: [PATCH] Add string representation to student submission --- server/assignments/models.py | 3 +++ server/users/models.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/server/assignments/models.py b/server/assignments/models.py index c3b78d15..f5bdd3e6 100644 --- a/server/assignments/models.py +++ b/server/assignments/models.py @@ -24,3 +24,6 @@ class StudentSubmission(TimeStampedModel): assignment = models.ForeignKey(Assignment, on_delete=models.CASCADE, related_name='submissions') student = models.ForeignKey(get_user_model(), on_delete=models.CASCADE) final = models.BooleanField(default=False) + + def __str__(self): + return '{} - {}'.format(self.student.full_name, self.text) diff --git a/server/users/models.py b/server/users/models.py index 1079f5fc..8ceab740 100644 --- a/server/users/models.py +++ b/server/users/models.py @@ -34,6 +34,10 @@ class User(AbstractUser): def users_in_same_school_class(self): return User.objects.filter(school_classes__users=self.pk) + @property + def full_name(self): + return self.get_full_name() + class SchoolClass(models.Model): name = models.CharField(max_length=100, blank=False, null=False)