rename CidUserAnswer to UserAnswer

anatomy/views.py

@@ -41,7 +41,7 @@ from .forms import (
 from .models import (
     AnatomyQuestion,
     BodyPart,
-    CidUserAnswer,
+    UserAnswer,
     # Examination,
     Structure,
     Exam,
@@ -55,8 +55,8 @@ from reversion.views import RevisionMixin
 
 from .decorators import user_is_author_or_anatomy_checker
 
-from .tables import AnatomyQuestionTable, AnatomyCidUserAnswerTable
-from .filters import AnatomyQuestionFilter, AnatomyCidUserAnswerFilter
+from .tables import AnatomyQuestionTable, AnatomyUserAnswerTable
+from .filters import AnatomyQuestionFilter, AnatomyUserAnswerFilter
 
 from django_tables2 import SingleTableView, SingleTableMixin
 from django_filters.views import FilterView
@@ -161,12 +161,12 @@ def answer_question(request, pk):
 #    }
 #
 #    # Get data for flagged
-#    # answered_questions = CidUserAnswer.objects.filter(user=request.user).values_list("question__pk", flat=True)
-#    user_answer_data = CidUserAnswer.objects.filter(user=request.user).values_list(
+#    # answered_questions = UserAnswer.objects.filter(user=request.user).values_list("question__pk", flat=True)
+#    user_answer_data = UserAnswer.objects.filter(user=request.user).values_list(
 #        "question__pk", "answer", "flagged"
 #    )
-#    # flagged_questions = CidUserAnswer.objects.filter(user=request.user, flagged=True).values_list("question__pk", flat=True)
-#    # flagged_questions I= CidUserAnswer.filter(user=request.user, ).values_list("question__pk", flat=True)
+#    # flagged_questions = UserAnswer.objects.filter(user=request.user, flagged=True).values_list("question__pk", flat=True)
+#    # flagged_questions I= UserAnswer.filter(user=request.user, ).values_list("question__pk", flat=True)
 #
 #    answered_questions = set()
 #    flagged_questions = set()
@@ -215,7 +215,7 @@ def answer_question(request, pk):
 
 # def flag_question(request):
 #    pk = request.GET.get("pk", None)
-#    ans = CidUserAnswer.objects.filter(user=request.user, question__pk=pk).first()
+#    ans = UserAnswer.objects.filter(user=request.user, question__pk=pk).first()
 #    ans.flagged = not ans.flagged
 #    ans.save()
 #    data = {"flagged": ans.flagged}
@@ -384,7 +384,7 @@ def exam_scores_refresh(request, pk):
 
     questions = exam.exam_questions.all()
 
-    cids = CidUserAnswer.objects.filter(question__in=questions, exam__id=pk)
+    cids = UserAnswer.objects.filter(question__in=questions, exam__id=pk)
 
     # Force a score update
     for c in cids:
@@ -733,24 +733,24 @@ def question_save_annotation(request, pk):
 
 
 GenericExamViews = ExamViews(
-    Exam, AnatomyQuestion, Answer, CidUserAnswer, "anatomy", "anatomy"
+    Exam, AnatomyQuestion, Answer, UserAnswer, "anatomy", "anatomy"
 )
 
 
-class CidUserAnswerView(SuperuserRequiredMixin, DetailView):
-    model = CidUserAnswer
+class UserAnswerView(SuperuserRequiredMixin, DetailView):
+    model = UserAnswer
 
 
-class CidUserAnswerTableView(SuperuserRequiredMixin, SingleTableMixin, FilterView):
-    model = CidUserAnswer
-    table_class = AnatomyCidUserAnswerTable
+class UserAnswerTableView(SuperuserRequiredMixin, SingleTableMixin, FilterView):
+    model = UserAnswer
+    table_class = AnatomyUserAnswerTable
     template_name = "anatomy/user_answer_question_view.html"
 
-    filterset_class = AnatomyCidUserAnswerFilter
+    filterset_class = AnatomyUserAnswerFilter
 
 
-class CidUserAnswerDelete(SuperuserRequiredMixin, DeleteView):
-    model = CidUserAnswer
+class UserAnswerDelete(SuperuserRequiredMixin, DeleteView):
+    model = UserAnswer
     template_name = "user_answer_delete.html"
     success_url = reverse_lazy("anatomy:user_answer_table_view")
 
@@ -797,7 +797,7 @@ class ExamAuthorUpdate(RevisionMixin, LoginRequiredMixin, AuthorRequiredMixin, U
 
 
 
-GenericViews = GenericViewBase("anatomy", AnatomyQuestion, CidUserAnswer, Exam)
+GenericViews = GenericViewBase("anatomy", AnatomyQuestion, UserAnswer, Exam)
 
 
 class ExamClone(ExamCloneMixin, ExamCreate):