rename CidUserAnswer to UserAnswer

rapids/models.py

@@ -34,7 +34,7 @@ from generic.models import (
     #Sign,
     ExamBase,
     QuestionNote,
-    CidUserAnswerBase,
+    UserAnswerBase,
     UserUserGroup,
 )
 
@@ -769,7 +769,7 @@ class Exam(ExamBase):
 
 
 @reversion.register
-class CidUserAnswer(CidUserAnswerBase):
+class UserAnswer(UserAnswerBase):
     """User answers by candidate"""
 
     question = models.ForeignKey(
@@ -830,7 +830,7 @@ class CidUserAnswer(CidUserAnswerBase):
 
     def save(self, *args, **kwargs):
         self.clean()
-        return super(CidUserAnswer, self).save(*args, **kwargs)
+        return super(UserAnswer, self).save(*args, **kwargs)
 
     def clean(self):
         self.score = Answer.MarkOptions.UNMARKED
@@ -885,9 +885,9 @@ class CidUserAnswer(CidUserAnswerBase):
         # First step we check that the normal/abnormal states match
         if q.normal != self.normal:
             if q.normal:
-                self.callstate = CidUserAnswer.CallStateOptions.OVERCALL
+                self.callstate = UserAnswer.CallStateOptions.OVERCALL
             else:
-                self.callstate = CidUserAnswer.CallStateOptions.UNDERCALL
+                self.callstate = UserAnswer.CallStateOptions.UNDERCALL
 
             self.score = Answer.MarkOptions.INCORRECT
             self.save()
@@ -895,7 +895,7 @@ class CidUserAnswer(CidUserAnswerBase):
             return 0
         # If both are normal full marks
         elif q.normal and self.normal:
-            self.callstate = CidUserAnswer.CallStateOptions.CORRECT
+            self.callstate = UserAnswer.CallStateOptions.CORRECT
             self.score = Answer.MarkOptions.CORRECT
             self.save()
             return 2
@@ -920,13 +920,13 @@ class CidUserAnswer(CidUserAnswerBase):
             self.score = marked_ans.status
 
             if marked_ans.status == Answer.MarkOptions.CORRECT:
-                self.callstate = CidUserAnswer.CallStateOptions.CORRECT
+                self.callstate = UserAnswer.CallStateOptions.CORRECT
                 mark = 2
             elif marked_ans.status == Answer.MarkOptions.HALF_MARK:
-                self.callstate = CidUserAnswer.CallStateOptions.PARTIALCALL
+                self.callstate = UserAnswer.CallStateOptions.PARTIALCALL
                 mark = 1
             elif marked_ans.status == Answer.MarkOptions.INCORRECT:
-                self.callstate = CidUserAnswer.CallStateOptions.INCORRECTCALL
+                self.callstate = UserAnswer.CallStateOptions.INCORRECTCALL
                 mark = 0
             self.save()