Merge branch 'dev'

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',
+        ]
+

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

export/templates/export/export.html

@@ -45,6 +45,15 @@
                        href="{% url 'export:activity' %}">Export</a>
                 </td>
             </tr>
+
+            <tr>
+                <td>Activity Attendance</td>
+                <td></td>
+                <td>
+                    <a class="btn btn-info"
+                       href="{% url 'export:activity-attendance' %}">Export</a>
+                </td>
+            </tr>
         </tbody>
     </table>
 

export/urls.py

@@ -21,4 +21,8 @@ urlpatterns = [
     path('export/activities',
          views.activities.ActivityExportView.as_view(),
          name='activity'),
+
+    path('export/activity-attendance',
+         views.activities.ActivityAttendanceExportView.as_view(),
+         name='activity-attendance'),
 ]

export/views/activities.py

@@ -7,3 +7,8 @@ from activities import models
 class ActivityExportView(base.CsvExportView):
     model = models.Activity
     serializer_class = serializers.activities.ActivitySerializer
+
+
+class ActivityAttendanceExportView(base.CsvExportView):
+    model = models.Activity.attendance_list.through
+    serializer_class = serializers.activities.ActivityAttendanceSerializer