.

physics/tables.py

@@ -6,14 +6,14 @@ from .models import Question, CidUserAnswer
 
 from django.utils.html import format_html
 
-#from easy_thumbnails.files import get_thumbnailer
+# from easy_thumbnails.files import get_thumbnailer
 
-#from easy_thumbnails.exceptions import InvalidImageFormatError
+# from easy_thumbnails.exceptions import InvalidImageFormatError
 
-#from generic.tables import UserAnswerTable
+# from generic.tables import UserAnswerTable
 
 
-#class ImageColumn(tables.Column):
+# class ImageColumn(tables.Column):
 #    def render(self, value):
 #        try:
 #            thumbnailer = get_thumbnailer(value)
@@ -23,32 +23,34 @@ from django.utils.html import format_html
 
 
 class QuestionTable(tables.Table):
-    #edit = tables.LinkColumn(
+    # edit = tables.LinkColumn(
     #    "physics:physics_question_update", text="Edit", args=[A("pk")], orderable=False
-    #)
+    # )
     view = tables.LinkColumn(
         "physics:question_detail", text="View", args=[A("pk")], orderable=False
     )
-    #delete = tables.LinkColumn(
+    # delete = tables.LinkColumn(
     #    "physics:question_delete", text="Delete", args=[A("pk")], orderable=False
-    #)
+    # )
     exams = tables.ManyToManyColumn(verbose_name="Exams")
 
     selection = tables.CheckBoxColumn(accessor="pk", orderable=False)
 
     stem = tables.Column()
-    answers = tables.TemplateColumn("<ol type='A'><li>{{ record.a_answer|safe}}</li><li>{{ record.b_answer|safe}}</li><li>{{ record.c_answer|safe}}</li><li>{{ record.d_answer|safe}}</li><li>{{ record.e_answer|safe}}</li></ol>")
+    answers = tables.TemplateColumn(
+        "<ol type='A'><li>{{ record.a|safe}} : {{ record.a_answer|safe}}</li><li>{{ record.b|safe}} : {{ record.b_answer|safe}}</li><li>{{ record.c|safe}} : {{ record.c_answer|safe}}</li><li>{{ record.d|safe}} : {{ record.d_answer|safe}}</li><li>{{ record.e|safe}} : {{ record.e_answer|safe}}</li></ol>"
+    )
 
     class Meta:
         model = Question
         template_name = "django_tables2/bootstrap4.html"
         fields = (
-            #"stem",
+            # "stem",
-            #"a_answer",
+            # "a_answer",
-            #"b_answer",
+            # "b_answer",
-            #"c_answer",
+            # "c_answer",
-            #"d_answer",
+            # "d_answer",
-            #"e_answer",
+            # "e_answer",
             "best_answer",
             "created_date",
             "category",
@@ -62,13 +64,13 @@ class QuestionTable(tables.Table):
 
 class UserAnswerTable(tables.Table):
     select = tables.CheckBoxColumn(accessor=("pk"))
-    #delete = tables.LinkColumn(
+    # delete = tables.LinkColumn(
     #    "physics:user_answer_delete", text="Delete", args=[A("pk")], orderable=False
-    #)
+    # )
-    view = tables.LinkColumn('physics:user_answer_view',
+    view = tables.LinkColumn(
-                             text='View',
+        "physics:user_answer_view", text="View", args=[A("pk")], orderable=False
-                             args=[A('pk')],
+    )
-                             orderable=False)
+
     class Meta:
         model = CidUserAnswer
         template_name = "django_tables2/bootstrap4.html"
@@ -76,9 +78,8 @@ class UserAnswerTable(tables.Table):
             "cid",
             "question",
             "answer",
-            #"answer_compare",
+            # "answer_compare",
             "exam",
             "created",
             "updated",
         )
-