This commit is contained in:
Ross
2021-12-12 08:50:35 +00:00
parent 9789739e27
commit 358b13b95a
7 changed files with 88 additions and 59 deletions
+7 -7
View File
@@ -20,20 +20,20 @@ class ImageColumn(tables.Column):
class CidUserTable(tables.Table):
#edit = tables.LinkColumn(
# edit = tables.LinkColumn(
# "anatomy:anatomy_question_update", text="Edit", args=[A("pk")], orderable=False
#)
#view = tables.LinkColumn(
# )
# view = tables.LinkColumn(
# "anatomy:question_detail", text="View", args=[A("pk")], orderable=False
#)
#image = ImageColumn("image", orderable=False)
# )
# image = ImageColumn("image", orderable=False)
# clone = tables.LinkColumn('anatomy:anatomy_question_clone',
# text='Clone',
# args=[A('pk')],
# orderable=False)
physics_exams = tables.ManyToManyColumn(verbose_name="Physics Exams")
rapid_exams = tables.ManyToManyColumn(verbose_name="Rapid Exams")
sbas_exams = tables.ManyToManyColumn(verbose_name="SBA Exams")
sba_exams = tables.ManyToManyColumn(verbose_name="SBA Exams")
longs_exams = tables.ManyToManyColumn(verbose_name="Long Exams")
anatomy_exams = tables.ManyToManyColumn(verbose_name="Anatomy Exams")
@@ -47,4 +47,4 @@ class CidUserTable(tables.Table):
"passcode",
"active",
)
#sequence = ("view")
# sequence = ("view")
+2 -2
View File
@@ -42,7 +42,7 @@
<span>
Sba Exams<br/>
<select id="sbas-exams" multiple="multiple">
{% for name, id in sbas_exams %}
{% for name, id in sba_exams %}
<option value="{{id}}">{{name}}</option>
{% endfor %}
@@ -88,7 +88,7 @@
number: $("#add-number").get(0).value,
physics_exams: JSON.stringify($("#physics-exams").val()),
rapid_exams: JSON.stringify($("#rapid-exams").val()),
sbas_exams: JSON.stringify($("#sbas-exams").val()),
sba_exams: JSON.stringify($("#sbas-exams").val()),
longs_exams: JSON.stringify($("#longs-exams").val()),
anatomy_exams: JSON.stringify($("#anatomy-exams").val()),
},
+5 -5
View File
@@ -936,7 +936,7 @@ class CidUserView(LoginRequiredMixin, SingleTableMixin, FilterView):
(i.name, i.pk) for i in PhysicsExam.objects.filter(archive=False)
]
rapid_exams = [(i.name, i.pk) for i in RapidExam.objects.filter(archive=False)]
sbas_exams = [(i.name, i.pk) for i in SbasExam.objects.filter(archive=False)]
sba_exams = [(i.name, i.pk) for i in SbasExam.objects.filter(archive=False)]
longs_exams = [(i.name, i.pk) for i in LongExam.objects.filter(archive=False)]
anatomy_exams = [
(i.name, i.pk) for i in PhysicsExam.objects.filter(archive=False)
@@ -944,7 +944,7 @@ class CidUserView(LoginRequiredMixin, SingleTableMixin, FilterView):
context["physics_exams"] = physics_exams
context["rapid_exams"] = rapid_exams
context["sbas_exams"] = sbas_exams
context["sba_exams"] = sba_exams
context["longs_exams"] = longs_exams
context["anatomy_exams"] = anatomy_exams
return context
@@ -956,7 +956,7 @@ def create_cid_users(request):
number = int(request.POST.get("number"))
physics_exams = json.loads(request.POST.get("physics_exams"))
rapid_exams = json.loads(request.POST.get("rapid_exams"))
sbas_exams = json.loads(request.POST.get("sbas_exams"))
sba_exams = json.loads(request.POST.get("sba_exams"))
longs_exams = json.loads(request.POST.get("longl_exams"))
anatomy_exams = json.loads(request.POST.get("anatomy_exams"))
@@ -972,8 +972,8 @@ def create_cid_users(request):
if rapid_exams:
c.rapid_exams.set(rapid_exams)
c.save()
if sbas_exams:
c.sbas_exams.set(sbas_exams)
if sba_exams:
c.sba_exams.set(sba_exams)
c.save()
if longs_exams:
c.longs_exams.set(longs_exams)