diff --git a/export/serializers/activities.py b/export/serializers/activities.py index a2069cd..db91387 100644 --- a/export/serializers/activities.py +++ b/export/serializers/activities.py @@ -3,6 +3,7 @@ from rest_framework import serializers from activities import models from . import base +from . import people as people_serializers class ActivityTypeSerializer(serializers.ModelSerializer): @@ -45,8 +46,32 @@ class ActivitySerializer(base.FlattenedModelSerializer): class Meta: model = models.Activity fields = [ - 'name', - 'series', - 'type', - 'medium', + 'pk', + 'name', + 'series', + 'type', + 'medium', ] + + +class SimpleActivitySerializer(serializers.ModelSerializer): + class Meta: + model = models.Activity + fields = [ + 'pk', + 'name', + ] + + +class ActivityAttendanceSerializer(base.FlattenedModelSerializer): + activity = SimpleActivitySerializer() + person = people_serializers.SimplePersonSerializer() + + class Meta: + model = models.Activity.attendance_list.through + fields = [ + 'pk', + 'activity', + 'person', + ] + diff --git a/export/serializers/people.py b/export/serializers/people.py index baed3bb..8c84ccb 100644 --- a/export/serializers/people.py +++ b/export/serializers/people.py @@ -48,7 +48,7 @@ class RelationshipSerializer(base.FlattenedModelSerializer): # Add relationship questions to columns for question in models.RelationshipQuestion.objects.all(): - headers.append(question.slug) + headers.append(question.slug.replace('-', '_')) return headers @@ -58,7 +58,7 @@ class RelationshipSerializer(base.FlattenedModelSerializer): try: # Add relationship question answers to data for answer in instance.current_answers.question_answers.all(): - rep[answer.question.slug] = answer.slug + rep[answer.question.slug.replace('-', '_')] = answer.slug.replace('-', '_') except AttributeError: pass diff --git a/export/templates/export/export.html b/export/templates/export/export.html index e4aa7f0..47ce026 100644 --- a/export/templates/export/export.html +++ b/export/templates/export/export.html @@ -45,6 +45,15 @@ href="{% url 'export:activity' %}">Export + +