From 98c8eee0ffd44ac1b4b2f700f50e99a3c4d01dac Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 9 Jan 2024 14:24:42 +0000 Subject: [PATCH] fix cid user api --- anatomy/api.py | 4 +++- generic/models.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/anatomy/api.py b/anatomy/api.py index b5aab755..36654062 100644 --- a/anatomy/api.py +++ b/anatomy/api.py @@ -103,7 +103,9 @@ def get_exam_user_status_cid_user(request, exam_id: int, cid: int): if not exam.check_user_can_edit(request.user): raise HttpError(HTTPStatus.UNAUTHORIZED,"Exam author required") - return exam.exam_user_status.filter(cid_user=cid) + print(exam_id, cid) + + return exam.exam_user_status.filter(cid_user__cid=cid) @router.get('/exam/{exam_id}/user_status/{user_id}/user', response=List[ExamUserStatusSchema]) def get_exam_user_status_user_user(request, exam_id: int, user_id: int): diff --git a/generic/models.py b/generic/models.py index bb7c6ed0..b877df48 100644 --- a/generic/models.py +++ b/generic/models.py @@ -953,10 +953,10 @@ class ExamUserStatus(models.Model): if self.cid_user: user = self.cid_user.cid email = self.cid_user.email - return f"{self.datetime:%Y-%m-%d %H:%M:%S}: {user} ({email}) - {self.status} ({self.extra})" + return f"{self.datetime:%Y-%m-%d %H:%M:%S}: [CID] {user} ({email}) - {self.status} ({self.extra})" else: user = self.user_user.username - return f"{self.datetime:%Y-%m-%d %H:%M:%S}: {user} - {self.status} ({self.extra})" + return f"{self.datetime:%Y-%m-%d %H:%M:%S}: [USER] {user} - {self.status} ({self.extra})" class UserAnswerBase(models.Model):