.

2022-06-07 22:37:11 +01:00
parent 70b7c4befe
commit 3a542231f0
3 changed files with 225 additions and 176 deletions
@@ -3,6 +3,7 @@ import django_filters
 from .models import Rapid, CidUserAnswer, Exam
 from django.contrib.auth.models import User

+
 def get_exams(request):
    if request is None:
        return Exam.objects.none()
@@ -14,6 +15,7 @@ def get_exams(request):

    return queryset

+
 def get_authors(request):
    if request is None:
        return User.objects.none()
@@ -25,22 +27,47 @@ def get_authors(request):

    return queryset

+
 class RapidFilter(django_filters.FilterSet):
-    exams = django_filters.ModelMultipleChoiceFilter(queryset=get_exams, null_label="No exam")
-    author = django_filters.ModelMultipleChoiceFilter(queryset=get_authors, null_label="No author")
+    exams = django_filters.ModelMultipleChoiceFilter(
+        queryset=get_exams, null_label="No exam"
+    )
+    author = django_filters.ModelMultipleChoiceFilter(
+        queryset=get_authors, null_label="No author"
+    )
+
    class Meta:
        model = Rapid
-        fields = ("normal", "abnormality", "region", "examination",
-                  "laterality", 
-                  #"site", 
-                  "created_date", "open_access")
+        fields = { 
+            "normal": ["exact"],
+            "abnormality": ["exact"],
+            "region": ["exact"],
+            "examination": ["exact"],
+            "laterality": ["exact"],
+            # "site",
+            "created_date": ["exact"],
+            "open_access": ["exact"],
+         }

-    def __init__(self, data=None, queryset=None, prefix=None, strict=None, user=None, request=None):
+    def __init__(
+        self,
+        data=None,
+        queryset=None,
+        prefix=None,
+        strict=None,
+        user=None,
+        request=None,
+    ):
        if not request.user.groups.filter(name="rapid_checker").exists():
-            queryset = queryset.filter(open_access=True) | queryset.filter(author__id=request.user.id)
-        super(RapidFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request)
+            queryset = queryset.filter(open_access=True) | queryset.filter(
+                author__id=request.user.id
+            )
+        super(RapidFilter, self).__init__(
+            data=data, queryset=queryset, prefix=prefix, request=request
+        )
        pass

+
 class RapidUserAnswerFilter(django_filters.FilterSet):
    class Meta:
        model = CidUserAnswer
@@ -49,14 +76,26 @@ class RapidUserAnswerFilter(django_filters.FilterSet):
            "user",
            "normal",
            "answer",
-            #"answer_compare",
+            # "answer_compare",
            "exam",
            "created",
            "updated",
        )

-    def __init__(self, data=None, queryset=None, prefix=None, strict=None, user=None, request=None):
+    def __init__(
+        self,
+        data=None,
+        queryset=None,
+        prefix=None,
+        strict=None,
+        user=None,
+        request=None,
+    ):
        if not request.user.groups.filter(name="rapid_checker").exists():
-            queryset = queryset.filter(open_access=True) | queryset.filter(author__id=request.user.id)
-        super(RapidUserAnswerFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request)
-        pass
+            queryset = queryset.filter(open_access=True) | queryset.filter(
+                author__id=request.user.id
+            )
+        super(RapidUserAnswerFilter, self).__init__(
+            data=data, queryset=queryset, prefix=prefix, request=request
+        )
+        pass