Skip to content
Snippets Groups Projects
Commit 01235d60 authored by borzechof99's avatar borzechof99 :whale2:
Browse files

Adhere to Linter and Formatter

parent 774eb5f5
No related branches found
No related tags found
No related merge requests found
......@@ -7,19 +7,27 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('quiz', '0008_auto_20210627_1812'),
("quiz", "0008_auto_20210627_1812"),
]
operations = [
migrations.AddField(
model_name='question',
name='id',
field=models.BigAutoField(auto_created=True, default=1, primary_key=True, serialize=False, verbose_name='ID'),
model_name="question",
name="id",
field=models.BigAutoField(
auto_created=True,
default=1,
primary_key=True,
serialize=False,
verbose_name="ID",
),
preserve_default=False,
),
migrations.AlterField(
model_name='question',
name='criterion',
field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='quiz.criterion'),
model_name="question",
name="criterion",
field=models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE, to="quiz.criterion"
),
),
]
......@@ -7,17 +7,22 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('quiz', '0009_auto_20210627_2140'),
("quiz", "0009_auto_20210627_2140"),
]
operations = [
migrations.RemoveField(
model_name='question',
name='id',
model_name="question",
name="id",
),
migrations.AlterField(
model_name='question',
name='criterion',
field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='quiz.criterion'),
model_name="question",
name="criterion",
field=models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
primary_key=True,
serialize=False,
to="quiz.criterion",
),
),
]
......@@ -178,6 +178,9 @@ class QuestionManager(models.Manager):
"""
def delete_question(self, pk):
"""
Deletes a Question and the Criterion connected to it
"""
question = self.get(pk=pk)
question.criterion.delete()
......
......@@ -202,7 +202,14 @@ class CriteriaSerializer(serializers.BaseSerializer):
class SmallQuestionListSerializer(serializers.BaseSerializer):
"""
Serializer for a List of Questions
"""
def to_representation(self, questions):
"""
Takes a List of Question Objects and JSONifies them, including id, Text in both languages, and Criterion name
"""
question_list = []
......@@ -220,7 +227,14 @@ class SmallQuestionListSerializer(serializers.BaseSerializer):
class SingleQuestionSerializer(serializers.BaseSerializer):
"""
Serializer for Single Questions
"""
def to_representation(self, question):
"""
Take a Question and JSONify it and its Criterion
"""
number_of_sports_active, sum_of_weights = question.criterion.get_active_sum()
......@@ -236,6 +250,9 @@ class SingleQuestionSerializer(serializers.BaseSerializer):
return question_dict
def to_internal_value(self, data):
"""
Take a Single Question JSON and Validate its Contents
"""
validated_data = {}
......@@ -253,7 +270,14 @@ class SingleQuestionSerializer(serializers.BaseSerializer):
class QuestionOrderSerializer(serializers.BaseSerializer):
"""
Serializer for Question Order Lists
"""
def to_representation(self, question_order_list):
"""
Take an ordered Set of QuestionOrderEntry Objects and represent them in JSON
"""
json_list = []
......
......@@ -348,7 +348,11 @@ class SmallQuestionListView(viewsets.ViewSet):
question = get_object_or_404(Question, pk=pk)
try:
if (
"text_de" in new_question_data.keys()
and "text_em" in new_question_data.keys()
and "criterion" in new_question_data.keys()
):
# Check if another Criterion with the wanted name already exists
queryset = Criterion.objects.filter(
name=new_question_data["criterion"]
......@@ -366,7 +370,7 @@ class SmallQuestionListView(viewsets.ViewSet):
question.text_de = new_question_data["text_de"]
question.text_en = new_question_data["text_en"]
except:
else:
return Response(status=400)
question.save()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment