add basic (user) history for collections
This commit is contained in:
+7
-3
@@ -531,7 +531,7 @@ class SeriesBase(models.Model):
|
||||
size = 0
|
||||
|
||||
for i in images:
|
||||
size += i.image.size
|
||||
size += i.get_file_size()
|
||||
|
||||
return size
|
||||
|
||||
@@ -997,7 +997,6 @@ class ExamBase(ExamOrCollectionGenericBase):
|
||||
|
||||
return User.objects.filter(pk__in=user_ids)
|
||||
|
||||
|
||||
def generate_user_report(self, user):
|
||||
exam_text = [f"Candidate {user.first_name} [{user.email}]"]
|
||||
|
||||
@@ -1478,6 +1477,12 @@ class CidUserExam(models.Model):
|
||||
|
||||
return f"{self.exam} / {user}: {start_time} {end_time}"
|
||||
|
||||
def get_user_name(self) -> str:
|
||||
if self.cid_user is None:
|
||||
return self.user_user.username
|
||||
else:
|
||||
return "CID" + str(self.cid_user.cid)
|
||||
|
||||
|
||||
CID_GROUP_EXAMS = (
|
||||
("SBAs", "sba_cid_user_groups"),
|
||||
@@ -1504,7 +1509,6 @@ class BaseUserGroup(models.Model):
|
||||
|
||||
|
||||
class CidUserGroup(BaseUserGroup):
|
||||
|
||||
def __str__(self) -> str:
|
||||
return str(self.name)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user