rename CidUserAnswer to UserAnswer

sbas/views.py

@@ -2,7 +2,7 @@ from reversion.views import RevisionMixin
 from generic.mixins import SuperuserRequiredMixin
 from django.views.generic.detail import DetailView
 from generic.models import CidUser
-from sbas.forms import CidUserAnswerForm, ExamAuthorForm, ExamForm
+from sbas.forms import UserAnswerForm, ExamAuthorForm, ExamForm
 from django.shortcuts import render, get_object_or_404, redirect
 from django.views.decorators.csrf import csrf_exempt
 from django import forms
@@ -28,7 +28,7 @@ from django.http import Http404, JsonResponse
 
 from django.http import HttpResponseRedirect, HttpResponse
 
-from .models import Question, Category, Exam, CidUserAnswer
+from .models import Question, Category, Exam, UserAnswer
 
 from django_tables2 import SingleTableView, SingleTableMixin
 from django_filters.views import FilterView
@@ -48,8 +48,8 @@ from rest_framework.pagination import PageNumberPagination
 
 from django.core.exceptions import PermissionDenied
 
-from .tables import QuestionTable, CidUserAnswerTable
-from .filters import QuestionFilter, CidUserAnswerFilter
+from .tables import QuestionTable, UserAnswerTable
+from .filters import QuestionFilter, UserAnswerFilter
 
 from .forms import (
     QuestionForm,
@@ -178,7 +178,7 @@ def exam_take_overview(request, pk, cid, passcode):
 
     questions = exam.exam_questions.all()
 
-    answers = CidUserAnswer.objects.filter(cid=cid, exam=exam)
+    answers = UserAnswer.objects.filter(cid=cid, exam=exam)
 
     answer_question_map = {}
     for ans in answers:
@@ -234,9 +234,9 @@ def exam_take(request, pk, sk, cid, passcode):
 
     if request.method == "POST":
         if answer:
-            form = CidUserAnswerForm(request.POST, instance=answer)
+            form = UserAnswerForm(request.POST, instance=answer)
         else:
-            form = CidUserAnswerForm(request.POST)
+            form = UserAnswerForm(request.POST)
         if form.is_valid():
             answer = form.save(commit=False)
             answer.cid = cid
@@ -261,7 +261,7 @@ def exam_take(request, pk, sk, cid, passcode):
                 "sbas:exam_take", sk=int(request.POST.get("goto")), **kwargs
             )
     else:
-        form = CidUserAnswerForm(instance=answer)
+        form = UserAnswerForm(instance=answer)
 
     previous = -1
     if sk > 0:
@@ -294,7 +294,7 @@ def exam_take(request, pk, sk, cid, passcode):
 
 
 GenericExamViews = ExamViews(
-    Exam, Question, None, CidUserAnswer, "sbas", "sbas"
+    Exam, Question, None, UserAnswer, "sbas", "sbas"
 )
 
 
@@ -404,20 +404,20 @@ class QuestionClone(QuestionCreateBase):
 
         return initial_data
 
-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 = "sbas/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("sbas:user_answer_table_view")
 
@@ -429,11 +429,11 @@ class CidUserAnswerDelete(SuperuserRequiredMixin, DeleteView):
 #
 #        # 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"})
 
 
-GenericViews = GenericViewBase("sbas", Question, CidUserAnswer, Exam)
+GenericViews = GenericViewBase("sbas", Question, UserAnswer, Exam)
 
 
 class QuestionDelete(AuthorOrCheckerRequiredMixin, DeleteView):