rename CidUserAnswer to UserAnswer

rapids/views.py

@@ -39,7 +39,7 @@ from .models import (
     Examination,
     Exam,
     Answer,
-    CidUserAnswer,
+    UserAnswer,
 )
 
 from generic.views import (
@@ -54,8 +54,8 @@ from generic.views import (
 
 from reversion.views import RevisionMixin
 
-from .tables import RapidTable, RapidCidUserAnswerTable
-from .filters import RapidFilter, RapidCidUserAnswerFilter
+from .tables import RapidTable, RapidUserAnswerTable
+from .filters import RapidFilter, RapidUserAnswerFilter
 
 from django_tables2 import SingleTableView, SingleTableMixin
 from django_filters.views import FilterView
@@ -86,7 +86,7 @@ from .serializers import (
     QuestionAnswerSerializer,
     RapidLateralitySerializer,
     RapidSerializer,
-    CidUserAnswerSerializer,
+    UserAnswerSerializer,
 )
 
 from generic.mixins import SuperuserRequiredMixin
@@ -693,7 +693,7 @@ class QuestionDelete(AuthorOrCheckerRequiredMixin, DeleteView):
     success_url = reverse_lazy("rapids:rapid_view")
 
 
-GenericExamViews = ExamViews(Exam, Rapid, Answer, CidUserAnswer, "rapids", "rapid", normalise_score=normaliseScore)
+GenericExamViews = ExamViews(Exam, Rapid, Answer, UserAnswer, "rapids", "rapid", normalise_score=normaliseScore)
 
 
 class ExamCreate(ExamCreateBase):
@@ -717,20 +717,20 @@ class ExamAuthorUpdate(
 
 
 
-class CidUserAnswerView(LoginRequiredMixin, DetailView):
-    model = CidUserAnswer
+class UserAnswerView(LoginRequiredMixin, DetailView):
+    model = UserAnswer
 
 
-class CidUserAnswerTableView(LoginRequiredMixin, SingleTableMixin, FilterView):
-    model = CidUserAnswer
-    table_class = RapidCidUserAnswerTable
+class UserAnswerTableView(LoginRequiredMixin, SingleTableMixin, FilterView):
+    model = UserAnswer
+    table_class = RapidUserAnswerTable
     template_name = "rapids/user_answer_question_view.html"
 
-    filterset_class = RapidCidUserAnswerFilter
+    filterset_class = RapidUserAnswerFilter
 
 
-class CidUserAnswerDelete(SuperuserRequiredMixin, DeleteView):
-    model = CidUserAnswer
+class UserAnswerDelete(SuperuserRequiredMixin, DeleteView):
+    model = UserAnswer
     template_name = "user_answer_delete.html"
     success_url = reverse_lazy("rapids:user_answer_table_view")
 
@@ -768,9 +768,9 @@ class ExamViewSet(RevisionMixin, viewsets.ModelViewSet):
 #    permission_classes = [permissions.IsAuthenticated]
 #
 #
-#class CidUserAnswerViewSet(viewsets.ModelViewSet):
-#    queryset = CidUserAnswer.objects.all()  # .order_by('name')
-#    serializer_class = CidUserAnswerSerializer
+#class UserAnswerViewSet(viewsets.ModelViewSet):
+#    queryset = UserAnswer.objects.all()  # .order_by('name')
+#    serializer_class = UserAnswerSerializer
 #    permission_classes = [permissions.IsAuthenticated]
 
 
@@ -822,7 +822,7 @@ class ExamViewSet(RevisionMixin, viewsets.ModelViewSet):
 #        return { "content_type" : content_type,
 #        "object_id" : pk }
 
-GenericViews = GenericViewBase("rapids", Rapid, CidUserAnswer, Exam)
+GenericViews = GenericViewBase("rapids", Rapid, UserAnswer, Exam)
 
 
 @user_is_author_or_rapid_checker