.
This commit is contained in:
+14
-12
@@ -1347,6 +1347,7 @@ class CidUserExamView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
|
||||
sba_exams = [(i.name, i.pk) for i in SbasExam.objects.filter(**filters)]
|
||||
longs_exams = [(i.name, i.pk) for i in LongExam.objects.filter(**filters)]
|
||||
anatomy_exams = [(i.name, i.pk) for i in AnatomyExam.objects.filter(**filters)]
|
||||
casecollection_exams = [(i.name, i.pk) for i in CaseCollection.objects.filter(archive=False, collection_type__gt = 0)]
|
||||
|
||||
cid_user_groups = [
|
||||
(i.name, i.pk) for i in CidUserGroup.objects.filter(archive=False)
|
||||
@@ -1357,6 +1358,7 @@ class CidUserExamView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
|
||||
context["sba_exams"] = sba_exams
|
||||
context["longs_exams"] = longs_exams
|
||||
context["anatomy_exams"] = anatomy_exams
|
||||
context["casecollection_exams"] = casecollection_exams
|
||||
context["cid_user_groups"] = cid_user_groups
|
||||
context["exams"] = True
|
||||
return context
|
||||
@@ -1375,23 +1377,23 @@ class CidUserView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
|
||||
|
||||
filters = {"archive": False, "exam_mode": True}
|
||||
|
||||
physics_exams = [(i.name, i.pk) for i in PhysicsExam.objects.filter(**filters)]
|
||||
rapid_exams = [(i.name, i.pk) for i in RapidExam.objects.filter(**filters)]
|
||||
sba_exams = [(i.name, i.pk) for i in SbasExam.objects.filter(**filters)]
|
||||
longs_exams = [(i.name, i.pk) for i in LongExam.objects.filter(**filters)]
|
||||
anatomy_exams = [(i.name, i.pk) for i in AnatomyExam.objects.filter(**filters)]
|
||||
casecollection_exams = [(i.name, i.pk) for i in CaseCollection.objects.filter(archive=False, collection_type__gt = 0)]
|
||||
#physics_exams = [(i.name, i.pk) for i in PhysicsExam.objects.filter(**filters)]
|
||||
#rapid_exams = [(i.name, i.pk) for i in RapidExam.objects.filter(**filters)]
|
||||
#sba_exams = [(i.name, i.pk) for i in SbasExam.objects.filter(**filters)]
|
||||
#longs_exams = [(i.name, i.pk) for i in LongExam.objects.filter(**filters)]
|
||||
#anatomy_exams = [(i.name, i.pk) for i in AnatomyExam.objects.filter(**filters)]
|
||||
#casecollection_exams = [(i.name, i.pk) for i in CaseCollection.objects.filter(archive=False, collection_type__gt = 0)]
|
||||
|
||||
cid_user_groups = [
|
||||
(i.name, i.pk) for i in CidUserGroup.objects.filter(archive=False)
|
||||
]
|
||||
|
||||
context["physics_exams"] = physics_exams
|
||||
context["rapid_exams"] = rapid_exams
|
||||
context["sba_exams"] = sba_exams
|
||||
context["longs_exams"] = longs_exams
|
||||
context["anatomy_exams"] = anatomy_exams
|
||||
context["casecollection_exams"] = casecollection_exams
|
||||
#context["physics_exams"] = physics_exams
|
||||
#context["rapid_exams"] = rapid_exams
|
||||
#context["sba_exams"] = sba_exams
|
||||
#context["longs_exams"] = longs_exams
|
||||
#context["anatomy_exams"] = anatomy_exams
|
||||
#context["casecollection_exams"] = casecollection_exams
|
||||
context["cid_user_groups"] = cid_user_groups
|
||||
|
||||
cid_user_groups = [
|
||||
|
||||
Reference in New Issue
Block a user