diff --git a/rad/urls.py b/rad/urls.py index d7900627..4498b92f 100644 --- a/rad/urls.py +++ b/rad/urls.py @@ -34,6 +34,7 @@ router.register(r'rapids/exams', rapid_views.ExamViewSet, basename="rapid-exams" router.register(r'anatomy/exams', anatomy_views.ExamViewSet, basename="anatomy-exams") 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") urlpatterns = [ diff --git a/rapids/serializers.py b/rapids/serializers.py index fe5c8ed6..8aae0a75 100644 --- a/rapids/serializers.py +++ b/rapids/serializers.py @@ -2,7 +2,7 @@ from rest_framework import serializers, permissions -from .models import Exam, Answer, Rapid +from .models import Exam, Answer, Rapid, CidUserAnswer class ExamSerializer(serializers.HyperlinkedModelSerializer): class Meta: @@ -17,6 +17,14 @@ class QuestionAnswerSerializer(serializers.HyperlinkedModelSerializer): model = Answer fields = ('id', 'question', 'answer', "answer_compare", "status") +class UserAnswerSerializer(serializers.HyperlinkedModelSerializer): + #question = serializers.HyperlinkedRelatedField(view_name='rapid-detail', + # read_only=True + # ) + class Meta: + model = CidUserAnswer + fields = ('id', 'question', 'normal', "answer", "answer_compare", "cid", "exam", "created", "updated") + class RapidSerializer(serializers.ModelSerializer): class Meta: model = Rapid diff --git a/rapids/views.py b/rapids/views.py index 4232b667..2e9544f1 100755 --- a/rapids/views.py +++ b/rapids/views.py @@ -975,6 +975,11 @@ class QuestionAnswerViewSet(viewsets.ModelViewSet): serializer_class = QuestionAnswerSerializer permission_classes = [permissions.IsAuthenticated] +class UserAnswerViewSet(viewsets.ModelViewSet): + queryset = CidUserAnswer.objects.all()#.order_by('name') + serializer_class = UserAnswerSerializer + permission_classes = [permissions.IsAuthenticated] + class RapidViewSet(viewsets.ModelViewSet): queryset = Rapid.objects.all()#.order_by('name')