Merge branch 'master' of ssh://git.xkjq.uk:30001/ross/rad

rad/settings.py

@@ -59,9 +59,9 @@ INSTALLED_APPS = [
 MIDDLEWARE = [
     "corsheaders.middleware.CorsMiddleware",
     "django.middleware.security.SecurityMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
-    "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",

rad/urls.py

@@ -37,6 +37,7 @@ router.register(r'longs/exams', long_views.ExamViewSet, basename="long-exams")
 router.register(r'rapids/answers', rapid_views.QuestionAnswerViewSet, basename="rapid-question-answers")
 router.register(r'rapids/user_answer', rapid_views.UserAnswerViewSet, basename="rapid-question-answers")
 router.register(r'rapids', rapid_views.RapidViewSet, basename="rapid")
+#router.register(r'rapids/laterality', rapid_views.RapidLateralityViewSet, basename="rapid")
 
 urlpatterns = [
     path("admin/", admin.site.urls, name="admin"),
@@ -60,6 +61,7 @@ urlpatterns = [
     path("feedback/note/<int:pk>/complete", views.feedback_mark_complete, name="feedback_mark_complete"),
     #path("feedback/", views.AddQuestionNote.as_view(), name="feedback"),
     path("feedback/answer", views.answer_suggestion_submit, name="answer_suggestion_submit"),
+    path("feedback/answer_submit", views.answer_submit, name="answer_submit"),
     path("feedback/answer/confirm", views.answer_suggestion_confirm, name="answer_suggestion_confirm"),
     path("feedback/view", views.view_feedback, name="view_feedback"),
 

rad/views.py

@@ -248,6 +248,37 @@ def answer_suggestion_submit(request):
     # postExamAnswers
     return JsonResponse({"success": False, "error": "Invalid data"})
 
+@login_required
+def answer_submit(request):
+    if request.is_ajax and request.method == "POST":
+        qid = request.POST.get("qid")
+        question_type = request.POST.get("question_type")
+        answer_string = request.POST.get("answer")
+        status = request.POST.get("status")
+
+        if str(status) not in "012":
+            return JsonResponse({"success": False, "error": "Invalid status"})
+
+        if question_type == "anatomy":
+            AnswerModel = AnatomyAnswer
+            question = AnatomyQuestion
+        elif question_type == "rapid":
+            AnswerModel = RapidAnswer
+            question = Rapid
+        else:
+            return JsonResponse({"success": False, "error": "Invalid question type"})
+        
+        q = get_object_or_404(question, pk=qid)
+        if AnswerModel.objects.filter(answer=answer_string, question=q):
+            return JsonResponse({"success": False, "error": "Answer already exists"})
+
+
+        a = AnswerModel(question=q, answer=answer_string, status=status)
+        a.save()
+        return JsonResponse({"success": True, "error": "Answer added"})
+
+    return JsonResponse({"success": False, "error": "Invalid data"})
+
 @login_required
 def answer_suggestion_confirm(request):
     if request.is_ajax and request.method == "POST":