migarate exam_user_status
This commit is contained in:
+8
-6
@@ -1074,14 +1074,16 @@ class ExamUserStatus(models.Model):
|
||||
object_id = models.PositiveIntegerField()
|
||||
exam = GenericForeignKey("content_type", "object_id")
|
||||
|
||||
cid_user_exam = models.ForeignKey("CidUserExam", blank=True, null=True, on_delete=models.SET_NULL)
|
||||
|
||||
def __str__(self):
|
||||
self.cid_user: "CidUser"
|
||||
if self.cid_user:
|
||||
user = self.cid_user.cid
|
||||
email = self.cid_user.email
|
||||
self.cid_user_exam: "CidUserExam"
|
||||
if self.cid_user_exam.cid_user:
|
||||
user = self.cid_user_exam.cid_user.cid
|
||||
email = self.cid_user_exam.cid_user.email
|
||||
return f"{self.datetime:%Y-%m-%d %H:%M:%S}: [CID] {user} ({email}) - {self.status} ({self.extra})"
|
||||
else:
|
||||
user = self.user_user.username
|
||||
user = self.cid_user_exam.user_user.username
|
||||
return f"{self.datetime:%Y-%m-%d %H:%M:%S}: [USER] {user} - {self.status} ({self.extra})"
|
||||
|
||||
|
||||
@@ -1440,7 +1442,7 @@ class CidUserExam(models.Model):
|
||||
else:
|
||||
end_time = f"{ self.end_time:%Y-%m-%d %H:%M }"
|
||||
|
||||
return f"{user}: {start_time} {end_time}"
|
||||
return f"{self.exam} / {user}: {start_time} {end_time}"
|
||||
|
||||
|
||||
CID_GROUP_EXAMS = (
|
||||
|
||||
Reference in New Issue
Block a user