reoorganise atlas modules

generic/models.py

@@ -503,7 +503,9 @@ class ExamCollectionGenericBase(models.Model):
         new.save()
         return new
 
-    def get_cid_user_exams(self, cid_user=None, user_user=None):
+    def get_cid_user_exams(
+        self, cid_user: "CidUser" = None, user_user: User = None
+    ) -> "CidUserExam":
         content_type = ContentType.objects.get_for_model(self)
         if cid_user is None and user_user is None:
             return CidUserExam.objects.filter(
@@ -1071,11 +1073,26 @@ class CidUserExam(models.Model):
 
     def __str__(self) -> str:
         if self.cid_user is None:
-            user = self.user_user.username
+            try:
+                user = self.user_user.username
+            except AttributeError:
+                user = "None"
         else:
             user = self.cid_user.cid
+
+        if self.start_time is None:
+            start_time = ""
+        else:
+            start_time = f"{ self.start_time:%Y-%m-%d %H:%M }"
+
+        if self.end_time is None:
+            end_time = ""
+        else:
+            end_time = f"{ self.end_time:%Y-%m-%d %H:%M }"
+
+
         return (
-            f"{user}: {self.start_time:%Y-%m-%d %H:%M} {self.end_time:%Y-%m-%d %H:%M}"
+            f"{user}: {start_time} {end_time}"
         )