rename CidUserAnswer to UserAnswer

longs/views.py

@@ -41,10 +41,10 @@ from .models import (
     LongSeries,
     Examination,
     Exam,
-    CidUserAnswer,
+    UserAnswer,
 )
-from .tables import LongTable, LongSeriesTable, CidUserAnswerTable
-from .filters import LongFilter, LongSeriesFilter, CidUserAnswerFilter
+from .tables import LongTable, LongSeriesTable, UserAnswerTable
+from .filters import LongFilter, LongSeriesFilter, UserAnswerFilter
 
 from django_tables2 import SingleTableView, SingleTableMixin
 from django_filters.views import FilterView
@@ -831,7 +831,7 @@ def mark_question_overview(request, exam_id, sk):
     user_answers = question.cid_user_answers.filter(exam__id=exam_id)
 
     unmarked_count = user_answers.filter(
-        score=CidUserAnswer.ScoreOptions.UNMARKED
+        score=UserAnswer.ScoreOptions.UNMARKED
     ).count()
 
     if exam.double_mark:
@@ -872,7 +872,7 @@ def exam_scores_all(request, pk):
     questions = exam.exam_questions.all()
 
     cids = (
-        CidUserAnswer.objects.filter(question__in=questions, exam__id=pk)
+        UserAnswer.objects.filter(question__in=questions, exam__id=pk)
         .order_by("cid")
         .values_list("cid", flat=True)
         .distinct()
@@ -1115,7 +1115,7 @@ def long_series_order_upload_filename(request, pk):
     return redirect("longs:long_series_detail", pk=pk)
 
 
-GenericExamViews = ExamViews(Exam, Long, None, CidUserAnswer, "longs", "long")
+GenericExamViews = ExamViews(Exam, Long, None, UserAnswer, "longs", "long")
 
 class ExamCreate(ExamCreateBase):
     model = Exam
@@ -1194,20 +1194,20 @@ def question_json_recreate(request, pk):
     return redirect("longs:question_detail", pk=pk)
 
 
-class CidUserAnswerView(LoginRequiredMixin, DetailView):
-    model = CidUserAnswer
+class UserAnswerView(LoginRequiredMixin, DetailView):
+    model = UserAnswer
 
 
-class CidUserAnswerTableView(LoginRequiredMixin, SingleTableMixin, FilterView):
-    model = CidUserAnswer
-    table_class = CidUserAnswerTable
+class UserAnswerTableView(LoginRequiredMixin, SingleTableMixin, FilterView):
+    model = UserAnswer
+    table_class = UserAnswerTable
     template_name = "longs/user_answer_question_view.html"
 
-    filterset_class = CidUserAnswerFilter
+    filterset_class = UserAnswerFilter
 
 
-class CidUserAnswerDelete(SuperuserRequiredMixin, DeleteView):
-    model = CidUserAnswer
+class UserAnswerDelete(SuperuserRequiredMixin, DeleteView):
+    model = UserAnswer
     template_name = "user_answer_delete.html"
     success_url = reverse_lazy("longs:user_answer_table_view")
 
@@ -1219,7 +1219,7 @@ def user_answer_delete_multiple(request):
 
         # We could probably delete them all at once....
         for id in answer_ids:
-            CidUserAnswer.objects.get(pk=id).delete()
+            UserAnswer.objects.get(pk=id).delete()
         return JsonResponse({"status": "success"})
     return JsonResponse({"status": "error"})