format files with black

This commit is contained in:
Aarni Halinen
2022-01-13 22:10:24 +02:00
parent a0f062c697
commit 11efcdd579
178 changed files with 3763 additions and 2324 deletions
+77 -25
View File
@@ -4,8 +4,7 @@ from webapp.models import *
class SignupSerializer(serializers.ModelSerializer):
signupForm_id = serializers.PrimaryKeyRelatedField(
source="signupForm",
queryset=SignupForm.objects.all()
source="signupForm", queryset=SignupForm.objects.all()
)
list_name = serializers.CharField(read_only=True)
@@ -15,12 +14,12 @@ class SignupSerializer(serializers.ModelSerializer):
email_ids = list(filter(lambda x: x["type"] == "email", questions))
# Send email to first email field in the form
if (len(email_ids) > 0):
if len(email_ids) > 0:
id = email_ids[0]["id"]
email_value = validated_data["answer"].get(id)
validated_data["email"] = email_value
# Combine all name fields to list_name
if (len(name_ids) > 0):
if len(name_ids) > 0:
# name_value = validated_data["answer"].get(name_fields[0]["id"], None)
all_names = map(lambda x: validated_data["answer"].get(x["id"]), name_ids)
validated_data["list_name"] = " ".join(all_names)
@@ -35,10 +34,10 @@ class SignupSerializer(serializers.ModelSerializer):
class Meta:
model = Signup
fields = ('id', 'signupForm_id', 'answer', 'list_name')
fields = ("id", "signupForm_id", "answer", "list_name")
extra_kwargs = {
'url': {
'view_name': 'signup-detail',
"url": {
"view_name": "signup-detail",
}
}
@@ -53,12 +52,25 @@ class SignupFormSerializer(serializers.ModelSerializer):
class Meta:
model = SignupForm
fields = ('id', 'title_fi', 'title_en', 'visible', 'isOpen', 'start_time', 'end_time', 'email_content', 'questions', 'schema', 'signups', 'quota')
fields = (
"id",
"title_fi",
"title_en",
"visible",
"isOpen",
"start_time",
"end_time",
"email_content",
"questions",
"schema",
"signups",
"quota",
)
class EventSerializer(serializers.ModelSerializer):
signupForm = SignupFormSerializer(
source='filtered_signup_forms',
source="filtered_signup_forms",
many=True,
read_only=True,
)
@@ -76,14 +88,31 @@ class EventSerializer(serializers.ModelSerializer):
class Meta:
model = Event
fields = ('id', 'tag_id', 'tags', 'visible', 'image', 'title_fi', 'title_en', 'description_fi', 'description_en',
'content_fi', 'content_en', 'start_time', 'end_time', 'location_fi', 'location_en', 'signup_id', 'signupForm')
read_only_fields = ['tags', 'signupForm']
fields = (
"id",
"tag_id",
"tags",
"visible",
"image",
"title_fi",
"title_en",
"description_fi",
"description_en",
"content_fi",
"content_en",
"start_time",
"end_time",
"location_fi",
"location_en",
"signup_id",
"signupForm",
)
read_only_fields = ["tags", "signupForm"]
depth = 1
def create(self, validated_data):
signupForms = validated_data.pop('signup_id', [])
tags = validated_data.pop('tag_id')
signupForms = validated_data.pop("signup_id", [])
tags = validated_data.pop("tag_id")
event = Event.objects.create(**validated_data)
for form in signupForms:
event.signupForm.add(form)
@@ -93,8 +122,8 @@ class EventSerializer(serializers.ModelSerializer):
return event
def update(self, instance, validated_data):
signupForms = validated_data.pop('signup_id', [])
tags = validated_data.pop('tag_id')
signupForms = validated_data.pop("signup_id", [])
tags = validated_data.pop("tag_id")
instance.signupForm.clear()
instance.tags.clear()
for form in signupForms:
@@ -110,30 +139,42 @@ class SavedQuestionsSerializer(serializers.ModelSerializer):
class Meta:
model = TemplateQuestion
fields = ('id', 'name', 'questions')
fields = ("id", "name", "questions")
class TagSerializer(serializers.ModelSerializer):
class Meta:
model = Tag
fields = ('id', 'slug', 'name_fi', 'name_en', 'icon')
fields = ("id", "slug", "name_fi", "name_en", "icon")
class FeedSerializer(serializers.ModelSerializer):
tag_id = serializers.PrimaryKeyRelatedField(
many=True,
source="tags",
queryset=Tag.objects.all()
many=True, source="tags", queryset=Tag.objects.all()
)
class Meta:
model = Feed
fields = ('id', 'tags', 'tag_id', 'visible', 'image', 'title_fi', 'title_en', 'description_fi', 'description_en',
'content_fi', 'content_en', 'publish_time', 'autohide', 'autohide_enabled')
fields = (
"id",
"tags",
"tag_id",
"visible",
"image",
"title_fi",
"title_en",
"description_fi",
"description_en",
"content_fi",
"content_en",
"publish_time",
"autohide",
"autohide_enabled",
)
depth = 1
def create(self, validated_data):
tags_data = validated_data.pop('tags')
tags_data = validated_data.pop("tags")
feed = Feed.objects.create(**validated_data)
for tag in tags_data:
feed.tags.add(tag)
@@ -144,4 +185,15 @@ class FeedSerializer(serializers.ModelSerializer):
class JobAdSerializer(serializers.ModelSerializer):
class Meta:
model = JobAd
fields = ('id', 'title_fi', 'title_en', 'description_fi', 'description_en', 'content_fi', 'content_en', 'visible', 'autohide_at', 'autohide_enabled')
fields = (
"id",
"title_fi",
"title_en",
"description_fi",
"description_en",
"content_fi",
"content_en",
"visible",
"autohide_at",
"autohide_enabled",
)