Erreurs dans visits/admin résolus

profiles/admin.py

@@ -7,6 +7,8 @@ import codecs
 
 import csv
 from django.http import HttpResponse
+
+
 class ExportCsvMixin:
     def export_as_csv(self, request, queryset):
 
@@ -14,13 +16,15 @@ class ExportCsvMixin:
         field_names = [field.name for field in meta.fields]
 
         response = HttpResponse(content_type='text/csv')
-        response['Content-Disposition'] = 'attachment; filename={}.csv'.format(meta)
+        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(field_names)
         for obj in queryset:
-            row = writer.writerow([getattr(obj, field) for field in field_names])
+            row = writer.writerow([getattr(obj, field)
+                                   for field in field_names])
 
         return response
 
@@ -33,6 +37,7 @@ class ProfileAdminMixin:
     search_fields = ('user__email', 'user__first_name', 'user__last_name',)
     actions = ["export_as_csv"]
 
+
 @admin.register(Tutor)
 class TutorAdmin(ProfileAdminMixin, admin.ModelAdmin, ExportCsvMixin):
     """Tutor admin panel."""
@@ -47,7 +52,9 @@ class TutorAdmin(ProfileAdminMixin, admin.ModelAdmin,ExportCsvMixin):
 @admin.register(Student)
 class StudentAdmin(ProfileAdminMixin, admin.ModelAdmin, ExportCsvMixin):
     """Student admin panel."""
-    list_filter = (('school',MultiSelectFieldListFilter), 'year', 'registration__validated')
+    list_filter = (('school', MultiSelectFieldListFilter),
+                   'year', 'registration__validated')
+
     class Meta:  # noqa
         model = Student
         ordering = ['updated_date']

profiles/models.py

@@ -80,7 +80,6 @@ class Student(ProfileMixin, models.Model):
                                verbose_name="code postal",
                                )
 
-
     gender = models.CharField(max_length=20,
                               null=True,
                               blank=True,
@@ -123,49 +122,42 @@ class Student(ProfileMixin, models.Model):
                                      verbose_name="adresse mail parentale"
                                      )
 
-
     school = models.CharField(max_length=70,
                               null=True,
                               blank=True,
                               verbose_name="établissement"
                               )
 
-
     grade = models.CharField(max_length=20,
                              null=True,
                              blank=True,
                              verbose_name="niveau de la classe"
                              )
 
-
     scholarship = models.CharField(max_length=50,
                                    null=True,
                                    blank=True,
                                    verbose_name="boursier"
                                    )
 
-
     fatherActivity = models.CharField(max_length=70,
                                       null=True,
                                       blank=True,
                                       verbose_name="métier du père"
                                       )
 
-
     motherActivity = models.CharField(max_length=70,
                                       null=True,
                                       blank=True,
                                       verbose_name="métier de la mère"
                                       )
 
-
     parentsStatus = models.CharField(max_length=70,
                                      null=True,
                                      blank=True,
                                      verbose_name="statut des parents"
                                      )
 
-
     dependantsNumber = models.IntegerField(
         null=True,
         blank=True,
@@ -194,7 +186,8 @@ class Student(ProfileMixin, models.Model):
             else:
                 self.year = f"{date_now.year-1}/{date_now.year}"
 
-            SendDocs(user=self.user).send() # send email with link to registration docs
+            # send email with link to registration docs
+            SendDocs(user=self.user).send()
 
         return super(Student, self).save(*args, **kwargs)
 

visits/admin.py

@@ -202,12 +202,6 @@ class ParticipationAdmin(admin.ModelAdmin):
     export_as_csv.short_description = "Exporter sélection (en .csv)"
 
 
-<< << << < HEAD
-== == == =
-
->>>>>> > f3728719809bca5d0418070e56327751d8f7a3aa
-
-
 @ admin.register(Visit.organizers.through)
 class VisitOrganizersAdmin(admin.ModelAdmin):
     """Admin panel for visit organizers."""