diff --git a/aws/conf.py b/aws/conf.py
index e7bf2e4b334a0b07d0c3026201e4a9c191fbeb3d..0553c51c57746e8cebf67e9db75664491bc22bf4 100644
--- a/aws/conf.py
+++ b/aws/conf.py
@@ -51,3 +51,7 @@ MEDIA_URL = 'https://' + AWS_S3_CUSTOM_DOMAIN + 'media/'
# Direct the MEDIA_ROOT to the media/ directory inside the bucket
MEDIA_ROOT = 'media'
+
+# ACL for public read
+AWS_DEFAULT_ACL = "public-read"
+ACL = 'public-read'
diff --git a/projects/admin.py b/projects/admin.py
index e43c198933a4a26170dc30281e0b5bcfc49817f1..cbac65e30ce2d43c7965480269b872f43b3d00ba 100644
--- a/projects/admin.py
+++ b/projects/admin.py
@@ -7,6 +7,11 @@ from dynamicforms.models import Form
from .models import Edition, Participation, Project, EditionForm
from django.contrib.admin import SimpleListFilter
from profiles.models import Student
+from django.http import HttpResponse
+import csv
+from users.models import User
+import codecs
+
@admin.register(Project)
@@ -106,6 +111,36 @@ class EditionFormAdmin(admin.ModelAdmin):
class ParticipationAdmin(admin.ModelAdmin):
"""Participation admin panel."""
+ def export_as_csv(self, request, queryset):
+ meta = self.model._meta
+ field_names = [field.name for field in meta.fields]
+ response = HttpResponse(content_type='text/csv')
+ response['Content-Disposition'] = 'attachment; filename={}.csv'.format(
+ meta)
+ response.write(codecs.BOM_UTF8) # force response to be UTF-8
+ writer = csv.writer(response, delimiter=';')
+
+ writer.writerow(['first_name', 'last_name', 'school', 'grade',
+ 'phone_number', 'scholarship'] + field_names)
+
+ list_email = queryset.values_list("user__email", flat=True)
+ nb_user = 0
+ for obj in queryset:
+
+ name = User.objects.filter(
+ email=str(list_email[nb_user])).values('first_name', 'last_name', 'phone_number')
+ school = Student.objects.filter(
+ user__email=str(list_email[nb_user])).values('school', 'grade', 'scholarship')
+
+ row = writer.writerow([name[0]['first_name'], name[0]['last_name'], school[0]['school'], school[0]['grade'], name[0]['phone_number'], school[0]['scholarship']] + [getattr(obj, field)
+ for field in field_names])
+ nb_user += 1
+ return response
+
+ export_as_csv.short_description = "Exporter sélection (en .csv)"
+
+ actions = ["export_as_csv"]
+
list_display = ('user', 'edition', 'submitted', 'state')
list_filter = (SchoolFilter,
'edition', 'submitted', 'state',)
diff --git a/tests/test_visits/test_visit.py b/tests/test_visits/test_visit.py
index 8ed10cd00dbe3d39fa9886bde31a2192d6861e38..f46d8065fa8a3dda586f30a49a513d04d3286ea1 100644
--- a/tests/test_visits/test_visit.py
+++ b/tests/test_visits/test_visit.py
@@ -54,6 +54,11 @@ class VisitTest(ModelTestCase):
'blank': True,
'null': True,
},
+ 'context_sheet': {
+ 'verbose_name': 'fiche contexte',
+ 'blank': True,
+ 'null': True,
+ },
'permission': {
'verbose_name': 'autorisation de sortie',
'blank': True,
diff --git a/tests/test_visits/test_visit_api.py b/tests/test_visits/test_visit_api.py
index 5dba15e1647d33053d9128e906005ee58e78043c..e1a02a82956ea21a21179bdfedaf2a0d871e9de9 100644
--- a/tests/test_visits/test_visit_api.py
+++ b/tests/test_visits/test_visit_api.py
@@ -63,5 +63,5 @@ class VisitSerializerTestCase(SerializerTestCaseMixin, TestCase):
'place', 'date', 'start_time', 'end_time', 'meeting',
'passed', 'deadline', 'registrations_open',
'participants', 'organizers',
- 'image', 'fact_sheet', 'permission',
+ 'image', 'fact_sheet', 'context_sheet', 'permission',
)
diff --git a/visits/admin.py b/visits/admin.py
index 6ca578ef60731b680f62f5abb7fff972ed1ac553..682f5703a2b423ba54313dd374645de7b6b9f52b 100644
--- a/visits/admin.py
+++ b/visits/admin.py
@@ -110,6 +110,8 @@ class ParticipationInline(admin.TabularInline):
school = Student.objects.get(user = participation.user).school
return school
school.short_description = "Établissement"
+
+
def name(self, participation: Participation):
"""Returns the participation's user's name"""
return participation.user.first_name + " " + participation.user.last_name
@@ -166,7 +168,6 @@ class ParticipationAdmin(admin.ModelAdmin):
actions = ["export_as_csv"]
-
def school(self, participation: Participation):
"""Return a link to the participation's user's school."""
school = Student.objects.get(user=participation.user).school
@@ -182,7 +183,8 @@ class ParticipationAdmin(admin.ModelAdmin):
response.write(codecs.BOM_UTF8) # force response to be UTF-8
writer = csv.writer(response, delimiter=';')
- writer.writerow(['first_name', 'last_name', 'school',
+
+ writer.writerow(['first_name', 'last_name', 'school', 'grade',
'phone_number', 'scholarship'] + field_names)
list_email = queryset.values_list("user__email", flat=True)
@@ -196,6 +198,7 @@ class ParticipationAdmin(admin.ModelAdmin):
row = writer.writerow([name[0]['first_name'], name[0]['last_name'], school[0]['school'], name[0]['phone_number'], school[0]['scholarship']] + [getattr(obj, field)
for field in field_names])
+
nb_user += 1
return response
@@ -235,6 +238,7 @@ class VisitAdmin(admin.ModelAdmin):
return obj.participants.count()
num_participants.short_description = 'Participants'
+
@ admin.register(Place)
class PlaceAdmin(admin.ModelAdmin):
"""Admin panel for places."""
diff --git a/visits/migrations/0002_visit_context_sheet.py b/visits/migrations/0002_visit_context_sheet.py
new file mode 100644
index 0000000000000000000000000000000000000000..bd96e25ddf3fdd2e6715396c6d5b284815be9d54
--- /dev/null
+++ b/visits/migrations/0002_visit_context_sheet.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2021-05-14 16:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('visits', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='visit',
+ name='context_sheet',
+ field=models.FileField(blank=True, help_text='Informe le lycéen de détails sur le contexte. Tout format supporté, PDF recommandé.', null=True, upload_to='visits/context_sheets/', verbose_name='fiche contexte'),
+ ),
+ ]
diff --git a/visits/models.py b/visits/models.py
index 31944309f7d678cdb6268db0838c68a559e6126c..7c5a8f8885b8a2393d9ddc967addbb506327996e 100644
--- a/visits/models.py
+++ b/visits/models.py
@@ -169,11 +169,17 @@ class Visit(models.Model):
upload_to='visits/fact_sheets/',
help_text=('Informe le lycéen de détails sur la sortie. '
'Tous formats supportés, PDF recommandé.'))
+ context_sheet = models.FileField(
+ 'fiche contexte', blank=True, null=True,
+ upload_to='visits/context_sheets/',
+ help_text=('Informe le lycéen de détails sur le contexte. '
+ 'Tout format supporté, PDF recommandé.'))
permission = models.FileField(
'autorisation de sortie', blank=True, null=True,
upload_to='visits/visit_permissions/',
help_text=('À mettre à disposition pour que le lycéen la remplisse. '
'Tout format supporté, PDF recommandé.'))
+
participants = models.ManyToManyField('users.User',
through='Participation')
organizers = models.ManyToManyField('profiles.Tutor',
diff --git a/visits/serializers.py b/visits/serializers.py
index 201aeecd3cca1f8c093c8d0ff00c7fa81e3e0758..4bd93a652c67e0a49c274ca79eb653b2a961d6ba 100644
--- a/visits/serializers.py
+++ b/visits/serializers.py
@@ -94,7 +94,7 @@ class VisitSerializer(VisitListSerializer):
'place', 'date', 'start_time', 'end_time', 'meeting',
'deadline', 'passed', 'registrations_open',
'participants', 'organizers',
- 'image', 'fact_sheet', 'permission',
+ 'image', 'fact_sheet', 'context_sheet', 'permission',
'url',)