Merge pull request EGCETSII#29 from Full-Tortuga/feature/votings_impl…

…ementation

 Feature/votings_implementation-002

decide/voting/serializers.py

@@ -1,8 +1,8 @@
 from rest_framework import serializers
 
-from .models import Question
-from .models import QuestionOption
-from .models import Voting
+from .models import Question, BinaryQuestion, MultipleQuestion, ScoreQuestion
+from .models import QuestionOption, BinaryQuestionOption, MultipleQuestionOption, ScoreQuestionOption
+from .models import Voting, BinaryVoting, MultipleVoting, ScoreVoting
 from base.serializers import KeySerializer, AuthSerializer
 
 
@@ -27,14 +27,97 @@ class VotingSerializer(serializers.HyperlinkedModelSerializer):
  class Meta:
  model = Voting
  fields = ('id', 'name', 'desc', 'question', 'start_date',
- 'end_date', 'pub_key', 'auths', 'tally', 'postproc')
+ 'end_date', 'pub_key', 'auths', 'tally', 'postproc', 'type')
 
 
 class SimpleVotingSerializer(serializers.HyperlinkedModelSerializer):
  question = QuestionSerializer(many=False)
 
  class Meta:
  model = Voting
- fields = ('name', 'desc', 'question', 'start_date', 'end_date')
+ fields = ('name', 'desc', 'question', 'start_date', 'end_date', 'type')
 
 
+class BinaryQuestionOptionSerializer(serializers.HyperlinkedModelSerializer):
+ class Meta:
+ model = BinaryQuestionOption
+ fields = ('number', 'option')
+
+class BinaryQuestionSerializer(serializers.HyperlinkedModelSerializer):
+ options = BinaryQuestionOptionSerializer(many=True)
+ class Meta:
+ model = BinaryQuestion
+ fields = ('desc', 'options')
+
+class BinaryVotingSerializer(serializers.HyperlinkedModelSerializer):
+ question = BinaryQuestionSerializer(many=False)
+ pub_key = KeySerializer()
+ auths = AuthSerializer(many=True)
+
+ class Meta:
+ model = BinaryVoting
+ fields = ('id', 'name', 'desc', 'question', 'start_date',
+ 'end_date', 'pub_key', 'auths', 'tally', 'postproc', 'type')
+
+class SimpleBinaryVotingSerializer(serializers.HyperlinkedModelSerializer):
+ question = BinaryQuestionSerializer(many=False)
+
+ class Meta:
+ model = BinaryVoting
+ fields = ('name', 'desc', 'question', 'start_date', 'end_date', 'type')
+
+class MultipleQuestionOptionSerializer(serializers.HyperlinkedModelSerializer):
+ class Meta:
+ model = MultipleQuestionOption
+ fields = ('number', 'option')
+
+class MultipleQuestionSerializer(serializers.HyperlinkedModelSerializer):
+ options = MultipleQuestionOptionSerializer(many=True)
+ class Meta:
+ model = MultipleQuestion
+ fields = ('desc', 'options')
+
+class MultipleVotingSerializer(serializers.HyperlinkedModelSerializer):
+ question = MultipleQuestionSerializer(many=False)
+ pub_key = KeySerializer()
+ auths = AuthSerializer(many=True)
+
+ class Meta:
+ model = MultipleVoting
+ fields = ('id', 'name', 'desc', 'question', 'start_date',
+ 'end_date', 'pub_key', 'auths', 'tally', 'postproc', 'type')
+
+class SimpleMultipleVotingSerializer(serializers.HyperlinkedModelSerializer):
+ question = MultipleQuestionSerializer(many=False)
+
+ class Meta:
+ model = MultipleVoting
+ fields = ('name', 'desc', 'question', 'start_date', 'end_date', 'type')
+
+class ScoreQuestionOptionSerializer(serializers.HyperlinkedModelSerializer):
+ class Meta:
+ model = ScoreQuestionOption
+ fields = ('number', 'option')
+
+class ScoreQuestionSerializer(serializers.HyperlinkedModelSerializer):
+ options = ScoreQuestionOptionSerializer(many=True)
+ class Meta:
+ model = ScoreQuestion
+ fields = ('desc', 'options')
+
+class ScoreVotingSerializer(serializers.HyperlinkedModelSerializer):
+ question = ScoreQuestionSerializer(many=False)
+ pub_key = KeySerializer()
+ auths = AuthSerializer(many=True)
+
+ class Meta:
+ model = ScoreVoting
+ fields = ('id', 'name', 'desc', 'question', 'start_date',
+ 'end_date', 'pub_key', 'auths', 'tally', 'postproc', 'type')
+
+class SimpleScoreVotingSerializer(serializers.HyperlinkedModelSerializer):
+ question = ScoreQuestionSerializer(many=False)
+
+ class Meta:
+ model = ScoreVoting
+ fields = ('name', 'desc', 'question', 'start_date', 'end_date', 'type')

decide/voting/urls.py

@@ -5,4 +5,10 @@
 urlpatterns = [
  path('', views.VotingView.as_view(), name='voting'),
  path('<int:voting_id>/', views.VotingUpdate.as_view(), name='voting'),
+ path('binaryVoting/', views.BinaryVotingView.as_view(), name='binaryVoting'),
+ path('binaryVoting/<int:voting_id>/', views.BinaryVotingUpdate.as_view(), name='binaryVoting'),
+ path('multipleVoting/', views.MultipleVotingView.as_view(), name='multipleVoting'),
+ path('multipleVoting/<int:voting_id>/', views.MultipleVotingUpdate.as_view(), name='multipleVoting'),
+ path('scoreVoting/', views.ScoreVotingView.as_view(), name='scoreVoting'),
+ path('scoreVoting/<int:voting_id>/', views.ScoreVotingUpdate.as_view(), name='scoreVoting')
 ]