.
This commit is contained in:
@@ -35,7 +35,9 @@
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% if can_edit %}
|
||||
<p><button id='button-edit-order' title='click and drag questions to change order' data-posturl="{% url 'anatomy:exam_json_edit' pk=exam.pk %}">Edit question order / Delete questions</button></p>
|
||||
<p>
|
||||
<button id='button-edit-order' title='click and drag questions to change order' data-posturl="{% url 'anatomy:exam_json_edit' pk=exam.pk %}">Edit question order / Delete questions</button>
|
||||
</p>
|
||||
{% endif %}
|
||||
<div>
|
||||
JSON creation time: {{exam.json_creation_time}} ({{exam.json_creation_time|date:"c"}}),
|
||||
|
||||
+50
-11
@@ -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",
|
||||
fields = {
|
||||
"normal": ["exact"],
|
||||
"abnormality": ["exact"],
|
||||
"region": ["exact"],
|
||||
"examination": ["exact"],
|
||||
"laterality": ["exact"],
|
||||
# "site",
|
||||
"created_date", "open_access")
|
||||
"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
|
||||
@@ -55,8 +82,20 @@ class RapidUserAnswerFilter(django_filters.FilterSet):
|
||||
"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)
|
||||
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
|
||||
@@ -118,6 +118,14 @@
|
||||
$(this).remove();
|
||||
sortable('.sortable');
|
||||
|
||||
$("#full-question-list").after($("<button id='random-order-button'>Randomise order</button>").click(() =>{
|
||||
var ul = document.getElementById("full-question-list");
|
||||
for (var i = ul.children.length; i >= 0; i--) {
|
||||
ul.appendChild(ul.children[Math.random() * i | 0]);
|
||||
}
|
||||
}))
|
||||
|
||||
|
||||
$("#full-question-list li").each((n, el) => {
|
||||
$(el).append($(
|
||||
"<span class='exam-question-delete flex-col'><button>DELETE</button></span>"
|
||||
@@ -127,7 +135,7 @@
|
||||
})
|
||||
|
||||
|
||||
$("#full-question-list").append($(
|
||||
$("#full-question-list").after($(
|
||||
"<button title='click and drag questions to change order'>Save exam order</button>"
|
||||
).click(() => {
|
||||
new_order = [];
|
||||
|
||||
Reference in New Issue
Block a user