ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More improvements to user management

Browse Source
This commit is contained in:
Ross
2022-11-21 12:43:46 +00:00
parent be3f420c68
commit 0b90308394
21 changed files with 321 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generic/models.py
+3 -5
View File
@@ -339,7 +339,7 @@ class ExamBase(models.Model):
emails = [user.email]
supervisor_email = user.userprofile.supervisor_email
supervisor_email = user.userprofile.supervisor.email
if supervisor_email:
emails.append(supervisor_email)
@@ -438,7 +438,7 @@ class CidUser(models.Model):
internal_candidate = models.BooleanField(default=False)
name = models.CharField(blank=True, max_length=255)
email = models.EmailField(blank=True)
supervisor_email = models.EmailField(blank=True)
supervisor = models.ForeignKey("Supervisor", on_delete=models.SET_NULL, blank=True, null=True, related_name="cid_user")
login_email_sent = models.BooleanField(default=False)
results_email_sent = models.BooleanField(default=False)
@@ -518,7 +518,7 @@ class CidUser(models.Model):
# Get a list of taken exams
msg = self.generate_exam_report()
emails = [self.email, self.supervisor_email]
emails = [self.email, self.supervisor.email]
if additional_emails:
emails.extend(additional_emails)
@@ -667,8 +667,6 @@ class UserGrades(models.Model):
class UserProfile(models.Model):
user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
supervisor_email = models.EmailField(blank=True)
supervisor_name = models.CharField(max_length=100, blank=True)
supervisor = models.ForeignKey("Supervisor", on_delete=models.SET_NULL, blank=True, null=True, related_name="trainee")
registration_number = models.CharField(max_length=25, blank=True)
grade = models.ForeignKey(UserGrades, null=True, blank=True, help_text="User grade", on_delete=models.CASCADE)