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

Adhere to Linter and Formatter

parent 4e2bb002
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
unisportomat/quiz/migrations/0013_auto_20210628_1751.py
+ 32
− 11
View file @ 216d9d7e
......@@ -7,25 +7,46 @@ import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('quiz', '0012_merge_20210627_2254'),
("quiz", "0012_merge_20210627_2254"),
]
operations = [
migrations.CreateModel(
name='GreetingEndTexts',
name="GreetingEndTexts",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('greeting', models.TextField(default='Willkommen zum Uni-Sport-O-Mat!')),
('greeting_de', models.TextField(default='Willkommen zum Uni-Sport-O-Mat!', null=True)),
('greeting_en', models.TextField(default='Willkommen zum Uni-Sport-O-Mat!', null=True)),
('end', models.TextField(default='Wähle deinen Sport!')),
('end_de', models.TextField(default='Wähle deinen Sport!', null=True)),
('end_en', models.TextField(default='Wähle deinen Sport!', null=True)),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"greeting",
models.TextField(default="Willkommen zum Uni-Sport-O-Mat!"),
),
(
"greeting_de",
models.TextField(
default="Willkommen zum Uni-Sport-O-Mat!", null=True
),
),
(
"greeting_en",
models.TextField(
default="Willkommen zum Uni-Sport-O-Mat!", null=True
),
),
("end", models.TextField(default="Wähle deinen Sport!")),
("end_de", models.TextField(default="Wähle deinen Sport!", null=True)),
("end_en", models.TextField(default="Wähle deinen Sport!", null=True)),
],
),
migrations.AlterField(
model_name='sport',
name='last_used',
model_name="sport",
name="last_used",
field=models.DateField(default=django.utils.timezone.localdate),
),
]
unisportomat/quiz/migrations/0014_auto_20210628_1850.py
+ 38
− 12
View file @ 216d9d7e
......@@ -6,29 +6,55 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('quiz', '0013_auto_20210628_1751'),
("quiz", "0013_auto_20210628_1751"),
]
operations = [
migrations.CreateModel(
name='EndText',
name="EndText",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('text', models.TextField(default='Wähle deinen Sport!')),
('text_de', models.TextField(default='Wähle deinen Sport!', null=True)),
('text_en', models.TextField(default='Wähle deinen Sport!', null=True)),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("text", models.TextField(default="Wähle deinen Sport!")),
("text_de", models.TextField(default="Wähle deinen Sport!", null=True)),
("text_en", models.TextField(default="Wähle deinen Sport!", null=True)),
],
),
migrations.CreateModel(
name='GreetingText',
name="GreetingText",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('text', models.TextField(default='Willkommen zum Uni-Sport-O-Mat!')),
('text_de', models.TextField(default='Willkommen zum Uni-Sport-O-Mat!', null=True)),
('text_en', models.TextField(default='Willkommen zum Uni-Sport-O-Mat!', null=True)),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("text", models.TextField(default="Willkommen zum Uni-Sport-O-Mat!")),
(
"text_de",
models.TextField(
default="Willkommen zum Uni-Sport-O-Mat!", null=True
),
),
(
"text_en",
models.TextField(
default="Willkommen zum Uni-Sport-O-Mat!", null=True
),
),
],
),
migrations.DeleteModel(
name='GreetingEndTexts',
name="GreetingEndTexts",
),
]
unisportomat/quiz/models.py
+ 2
− 2
View file @ 216d9d7e
......@@ -312,7 +312,7 @@ class GreetingText(models.Model):
text = models.TextField(default="Willkommen zum Uni-Sport-O-Mat!")
def __str__(self):
return f"{self.greeting}"
return f"{self.text}"
class EndText(models.Model):
......@@ -324,4 +324,4 @@ class EndText(models.Model):
text = models.TextField(default="Wähle deinen Sport!")
def __str__(self):
return f"{self.end}"
return f"{self.text}"
unisportomat/quiz/serializers.py
+ 7
− 0
View file @ 216d9d7e
......@@ -207,7 +207,14 @@ class CriteriaSerializer(serializers.BaseSerializer):
class GreetingEndSerializer(serializers.BaseSerializer):
"""
Serializer for GreetingText and EndText
"""
def to_representation(self, obj):
"""
Represents the Object with german and english text
"""
json_obj = {
"text_de": obj.text_de,
......
unisportomat/quiz/views.py
+ 16
− 8
View file @ 216d9d7e
......@@ -300,7 +300,7 @@ class GreetingEndView(APIView):
if self.given_object.objects.count() > 0:
return self.put(request)
sentence = self.given_object()
sentence = self.given_object() # pylint: disable=not-callable
if "text_de" in request.data.keys():
sentence.text_de = request.data["text_de"]
......@@ -321,7 +321,7 @@ class GreetingEndView(APIView):
sentence = self.given_object.objects.all()
if sentence.count() == 0:
sentence = self.given_object()
sentence = self.given_object() # pylint: disable=not-callable
else:
sentence = sentence.first()
......@@ -337,8 +337,8 @@ class GreetingEndView(APIView):
if sentence.count() == 0:
return Response(status=404)
else:
sentence = sentence.first()
sentence = sentence.first()
sentence.text_de = request.data["text_de"]
sentence.text_en = request.data["text_en"]
......@@ -357,8 +357,8 @@ class GreetingEndView(APIView):
if sentence.count() == 0:
return Response(status=404)
else:
sentence = sentence.first()
sentence = sentence.first()
if "text_de" in request.data.keys():
sentence.text_de = request.data["text_de"]
......@@ -379,8 +379,8 @@ class GreetingEndView(APIView):
if sentence.count() == 0:
return Response(status=404)
else:
sentence = sentence.first()
sentence = sentence.first()
sentence.text_de = self.given_object._meta.get_field("text").get_default()
sentence.text_en = self.given_object._meta.get_field("text").get_default()
......@@ -391,10 +391,18 @@ class GreetingEndView(APIView):
class GreetingView(GreetingEndView):
"""
View For the Greeting Strings
Inherited CRUD from GreetingEndView
"""
given_object = GreetingText
class EndView(GreetingEndView):
"""
View For the End Strings
Inherited CRUD from GreetingEndView
"""
given_object = EndText
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment