rename CidUserAnswer to UserAnswer

physics/views.py

@@ -2,9 +2,9 @@ from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 from generic.models import CidUser
 from physics.decorators import user_is_author_or_physics_checker
-from physics.filters import QuestionFilter, CidUserAnswerFilter
+from physics.filters import QuestionFilter, UserAnswerFilter
 from generic.mixins import SuperuserRequiredMixin
-from physics.tables import QuestionTable, CidUserAnswerTable
+from physics.tables import QuestionTable, UserAnswerTable
 from django.shortcuts import render, get_object_or_404, redirect
 from django.views.decorators.csrf import csrf_exempt
 from django import forms
@@ -32,7 +32,7 @@ from django_filters.views import FilterView
 from django_tables2.views import SingleTableMixin
 from reversion.views import RevisionMixin
 
-from .models import Question, Category, Exam, CidUserAnswer
+from .models import Question, Category, Exam, UserAnswer
 
 from collections import defaultdict
 import os
@@ -58,7 +58,7 @@ from rest_framework.pagination import PageNumberPagination
 
 from django.core.exceptions import PermissionDenied
 
-from .forms import CidUserAnswerForm, ExamAuthorForm, ExamForm
+from .forms import UserAnswerForm, ExamAuthorForm, ExamForm
 from .decorators import (
     user_is_author_or_physics_checker,
     user_is_exam_author_or_physics_checker,
@@ -214,9 +214,9 @@ def exam_take_overview(request, pk, cid=None, passcode=None):
     questions = exam.exam_questions.all()
 
     if cid is not None:
-        answers = CidUserAnswer.objects.filter(cid=cid, exam=exam)
+        answers = UserAnswer.objects.filter(cid=cid, exam=exam)
     else:
-        answers = CidUserAnswer.objects.filter(user=request.user, exam=exam)
+        answers = UserAnswer.objects.filter(user=request.user, exam=exam)
 
     answer_question_map = {}
     for ans in answers:
@@ -289,9 +289,9 @@ def exam_take(request, pk, sk, cid=None, passcode=None):
 
     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() and not exam.publish_results:
             answer = form.save(commit=False)
 
@@ -327,7 +327,7 @@ def exam_take(request, pk, sk, cid=None, passcode=None):
         elif "goto" in request.POST:
             return redirect(take_url, sk=int(request.POST.get("goto")), **kwargs)
     else:
-        form = CidUserAnswerForm(instance=answer)
+        form = UserAnswerForm(instance=answer)
 
 
     saved_answer = False
@@ -376,7 +376,7 @@ def exam_take(request, pk, sk, cid=None, passcode=None):
 #        pass
 #
 #    for qid in questions:
-#        exiting_answers = CidUserAnswer.objects.filter(
+#        exiting_answers = UserAnswer.objects.filter(
 #            question__id=qid, exam__id=answer["eid"], cid=answer["cid"]
 #        )
 #
@@ -387,7 +387,7 @@ def exam_take(request, pk, sk, cid=None, passcode=None):
 #        e = questions[qid]["e"]
 #
 #        if not exiting_answers:
-#            ans = CidUserAnswer(a=a, b=b, c=c, d=d, e=e, cid=answer["cid"])
+#            ans = UserAnswer(a=a, b=b, c=c, d=d, e=e, cid=answer["cid"])
 #            ans.question_id = qid
 #            ans.exam_id = answer["eid"]
 #
@@ -409,9 +409,9 @@ def exam_take(request, pk, sk, cid=None, passcode=None):
 #    return True, None
 
 
-GenericExamViews = ExamViews(Exam, Question, None, CidUserAnswer, "physics", "physics")
+GenericExamViews = ExamViews(Exam, Question, None, UserAnswer, "physics", "physics")
 
-GenericViews = GenericViewBase("physics", Question, CidUserAnswer, Exam)
+GenericViews = GenericViewBase("physics", Question, UserAnswer, Exam)
 
 class ExamCreate(ExamCreateBase):
     model = Exam
@@ -457,21 +457,21 @@ class QuestionView(
 
 
 
-class CidUserAnswerView(AuthorOrCheckerRequiredMixin, LoginRequiredMixin, DetailView):
-    model = CidUserAnswer
+class UserAnswerView(AuthorOrCheckerRequiredMixin, LoginRequiredMixin, DetailView):
+    model = UserAnswer
 
 
-class CidUserAnswerTableView(
+class UserAnswerTableView(
     AuthorOrCheckerRequiredMixin, LoginRequiredMixin, SingleTableMixin, FilterView
 ):
-    model = CidUserAnswer
-    table_class = CidUserAnswerTable
+    model = UserAnswer
+    table_class = UserAnswerTable
     template_name = "physics/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("physics:user_answer_table_view")