improve dicom uploading

generic/filters.py

@@ -36,6 +36,7 @@ class CidUserFilter(django_filters.FilterSet):
 class UserUserFilter(django_filters.FilterSet):
     userprofile__grade = django_filters.ModelChoiceFilter(queryset=UserGrades.objects.all(),label="Grade")
     userprofile__supervisor = django_filters.ModelChoiceFilter(queryset=Supervisor.objects.all(), label="Supervisor")
+    userprofile__peninsula_trainee = django_filters.BooleanFilter(label="Peninsula Trainee")
     #has_supervisor = django_filters.BooleanFilter(field_name='supervisor', lookup_expr='isnull', exclude=True, label="Has Supervisor")
 
     class Meta:
@@ -50,7 +51,8 @@ class UserUserFilter(django_filters.FilterSet):
             #"userprofile__grade": ["exact"],
             #"userprofile__supervisor": ["exact"],
             "email": ["contains"],
-            "is_active": ["exact"]
+            "is_active": ["exact"],
+            "groups": ["exact"],
         }
 
     @property

generic/models.py

@@ -230,6 +230,9 @@ class SeriesBase(models.Model):
         help_text="If a series should be freely available to browse", default=True
     )
 
+    created_date = models.DateTimeField(auto_now_add=True)
+    modified_date = models.DateTimeField(auto_now=True)
+
     class Meta:
         abstract = True
 
@@ -1271,6 +1274,7 @@ class UserProfile(models.Model):
         on_delete=models.CASCADE,
     )
     peninsula_trainee = models.BooleanField(default=False)
+    #affiliation = models.ForeignKey("Site", on_delete=models.SET_NULL, blank=True, null=True)
 
     def getusername(self):
         return self.user.username

generic/tables.py

@@ -252,8 +252,12 @@ class UserUserTable(tables.Table):
         return "Edit"
 
     def render_user(self, value, record):
+        span_class = ""
+        if record.userprofile.peninsula_trainee:
+            span_class = "peninsula-trainee"
         return format_html(
-            "{} {}<br/>{}<br/>{}",
+            "<div style='flex-flow: row wrap; display: flex;'><div class='{}'></div><div>{} {}<br/>{}<br/>{}</div></div>",
+            span_class,
             record.first_name,
             record.last_name,
             record.username,