This commit is contained in:
Ross
2021-08-31 18:03:20 +01:00
parent cc626faf04
commit bce7420b7a
5 changed files with 167 additions and 2 deletions
+1 -1
View File
@@ -59,7 +59,7 @@ class AnatomyUserAnswerFilter(django_filters.FilterSet):
)
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():
if not request.user.groups.filter(name="anatomy_checker").exists():
queryset = queryset.filter(open_access=True) | queryset.filter(author__id=request.user.id)
super(AnatomyUserAnswerFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request)
pass
+62
View File
@@ -0,0 +1,62 @@
import django_filters
from .models import Question, CidUserAnswer, Exam
#from generic.filters import UserAnswerFilter
from django.contrib.auth.models import User
def get_exams(request):
if request is None:
return Exam.objects.none()
if not request.user.groups.filter(name="anatomy_checker").exists():
queryset = Exam.objects.filter(author__id=request.user.id)
else:
queryset = Exam.objects.all()
return queryset
def get_authors(request):
if request is None:
return User.objects.none()
if not request.user.groups.filter(name="sba_checker").exists():
queryset = User.objects.filter(id=request.user.id)
else:
queryset = User.objects.all()
return queryset
class QuestionFilter(django_filters.FilterSet):
exams = django_filters.ModelMultipleChoiceFilter(queryset=get_exams)
author = django_filters.ModelMultipleChoiceFilter(queryset=get_authors)
class Meta:
model = Question
fields = ("exams", "category", "created_date", "open_access")
def __init__(self, data=None, queryset=None, prefix=None, strict=None, user=None, request=None):
if not request.user.groups.filter(name="sba_checker").exists():
queryset = queryset.filter(open_access=True) | queryset.filter(author__id=request.user.id)
super(QuestionFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request)
pass
class UserAnswerFilter(django_filters.FilterSet):
class Meta:
model= CidUserAnswer
fields = (
"cid",
"question",
"answer",
#"answer_compare",
"exam",
"created",
"updated",
)
def __init__(self, data=None, queryset=None, prefix=None, strict=None, user=None, request=None):
if not request.user.groups.filter(name="sba_checker").exists():
queryset = queryset.filter(open_access=True) | queryset.filter(author__id=request.user.id)
super(UserAnswerFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request)
pass
+72
View File
@@ -0,0 +1,72 @@
import django_tables2 as tables
from django_tables2.utils import A
from .models import Question, CidUserAnswer
from django.utils.html import format_html
#from easy_thumbnails.files import get_thumbnailer
#from easy_thumbnails.exceptions import InvalidImageFormatError
#from generic.tables import UserAnswerTable
#class ImageColumn(tables.Column):
# def render(self, value):
# try:
# thumbnailer = get_thumbnailer(value)
# return format_html('<img src="/media/{}" />', thumbnailer["exam-list"])
# except InvalidImageFormatError:
# return format_html('<span title="{}">Invalid image url<span>', value)
class QuestionTable(tables.Table):
#edit = tables.LinkColumn(
# "sbas:sbas_question_update", text="Edit", args=[A("pk")], orderable=False
#)
view = tables.LinkColumn(
"sbas:question_detail", text="View", args=[A("pk")], orderable=False
)
#delete = tables.LinkColumn(
# "sbas:question_delete", text="Delete", args=[A("pk")], orderable=False
#)
exams = tables.ManyToManyColumn(verbose_name="Exams")
selection = tables.CheckBoxColumn(accessor="pk", orderable=False)
class Meta:
model = Question
template_name = "django_tables2/bootstrap4.html"
fields = (
"stem",
"a_answer",
"b_answer",
"c_answer",
"d_answer",
"e_answer",
"best_answer",
"created_date",
"category",
"author",
)
sequence = ("view", "exams")
class UserAnswerTable(tables.Table):
select = tables.CheckBoxColumn(accessor=("pk"))
#delete = tables.LinkColumn(
# "sbas:user_answer_delete", text="Delete", args=[A("pk")], orderable=False
#)
class Meta:
model = CidUserAnswer
template_name = "django_tables2/bootstrap4.html"
fields = (
"cid",
"question",
"answer",
#"answer_compare",
"exam",
"created",
"updated",
)
+18
View File
@@ -0,0 +1,18 @@
{% extends 'sbas/base.html' %}
{% load render_table from django_tables2 %}
{% block css %}
{% endblock %}
{% block content %}
<div id="view-filter-options">
<h3>Filter SBA Questions</h3>
<form action="" method="get">
{{ filter.form }}
<input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
</form>
</div>
{% render_table table %}
{% endblock %}
+14 -1
View File
@@ -24,6 +24,9 @@ from django.http import HttpResponseRedirect, HttpResponse
from .models import Question, Category, Exam, CidUserAnswer
from django_tables2 import SingleTableView, SingleTableMixin
from django_filters.views import FilterView
from collections import defaultdict
import os
import base64
@@ -39,6 +42,9 @@ from rest_framework.pagination import PageNumberPagination
from django.core.exceptions import PermissionDenied
from .tables import QuestionTable, UserAnswerTable
from .filters import QuestionFilter, UserAnswerFilter
class AuthorOrCheckerRequiredMixin(object):
def get_object(self, *args, **kwargs):
obj = super().get_object(*args, **kwargs)
@@ -348,4 +354,11 @@ def exam_take(request, pk, sk, cid):
def loadJsonAnswer(answer):
pass
SbasExamViews = ExamViews(Exam, Question, "sbas", "sbas", loadJsonAnswer)
SbasExamViews = ExamViews(Exam, Question, "sbas", "sbas", loadJsonAnswer)
class QuestionView(LoginRequiredMixin, SingleTableMixin, FilterView):
model = Question
table_class = QuestionTable
template_name = "anatomy/anatomy_question_view.html"
filterset_class = QuestionFilter