From 7ce93a095ad91ec52680990ad5e015c677863794 Mon Sep 17 00:00:00 2001
From: Yoan Le Clanche <yoanl@pilotsystems.net>
Date: Tue, 30 Jun 2020 15:08:13 +0200
Subject: [PATCH] Fix issue with webclass not visible in admin & improve admin
 filters for correctors

---
 teleforma/admin.py           |  1 +
 teleforma/views/crfpa.py     | 30 ++++++++++++++++++------------
 teleforma/webclass/admin.py  |  4 ++--
 teleforma/webclass/models.py |  4 ++--
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/teleforma/admin.py b/teleforma/admin.py
index ae9a3a2c..19824b88 100644
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -162,6 +162,7 @@ class CorrectorAdmin(admin.ModelAdmin):
     list_display = ['__unicode__', 'period', 'pay_status',
                     'date_registered']
     actions = ['export_xls']
+    search_fields = ['user__username', 'user__first_name', 'user__last_name', 'user__email']
 
     def export_xls(self, request, queryset):
         book = CorrectorXLSBook(correctors = queryset)
diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 7497970a..50ddb3b1 100644
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -413,28 +413,31 @@ class CorrectorXLSBook(object):
         row = self.sheet.row(counter + self.first_row)
         row.write(0, user.last_name)
         row.write(1, user.first_name)
-        row.write(2, user.email)
+        row.write(2, user.username)
+        row.write(3, user.email)
 
         profile = Profile.objects.filter(user=user)
         if profile:
             profile = profile[0]
-            row.write(3, profile.address)
-            row.write(4, profile.address_detail)
-            row.write(5, profile.postal_code)
-            row.write(6, profile.city)
-            row.write(7, profile.telephone)
+            row.write(4, profile.address)
+            row.write(5, profile.address_detail)
+            row.write(6, profile.postal_code)
+            row.write(7, profile.city)
+            row.write(8, profile.telephone)
             if profile.birthday:
                 try:
-                    row.write(8, profile.birthday.strftime("%d/%m/%Y"))
+                    row.write(9, profile.birthday.strftime("%d/%m/%Y"))
                 except ValueError:
-                    row.write(8, 'erreur')
+                    row.write(9, 'erreur')
+            row.write(10, profile.birthday_place)
+            row.write(11, profile.ss_number)
 
             if corrector.date_registered:
-                row.write(9, corrector.date_registered.strftime("%d/%m/%Y"))
+                row.write(12, corrector.date_registered.strftime("%d/%m/%Y"))
             else:
-                row.write(9, "")
-            row.write(10, str(corrector.period))
-            row.write(11, corrector.pay_status)
+                row.write(12, "")
+            row.write(13, str(corrector.period))
+            row.write(14, corrector.pay_status)
                 
         return counter + 1
 
@@ -442,6 +445,7 @@ class CorrectorXLSBook(object):
         row = self.sheet.row(0)
         cols = [{'name':'NOM', 'width':5000},
                 {'name':'PRENOM', 'width':5000},
+                {'name':'ID', 'width':5000},
                 {'name':'MAIL', 'width':7500},
                 {'name':'ADRESSE', 'width':7500},
                 {'name':'ADRESSE (suite)', 'width': 7500},
@@ -449,6 +453,8 @@ class CorrectorXLSBook(object):
                 {'name':'VILLE', 'width':5000},
                 {'name':'TEL', 'width':5000},
                 {'name': 'Date de naissance', 'width': 5000},
+                {'name': 'Lieu de naissance', 'width': 5000},
+                {'name': 'Numero SS', 'width': 5000},
                 {'name':"Date inscription", 'width':5000},
                 {'name':"Periode", 'width':5000},
                 {'name':"Statut", 'width':5000},
diff --git a/teleforma/webclass/admin.py b/teleforma/webclass/admin.py
index 87e9ab5c..6e69c7ba 100644
--- a/teleforma/webclass/admin.py
+++ b/teleforma/webclass/admin.py
@@ -15,8 +15,8 @@ class WebclassSlotInline(admin.StackedInline):
 
 class WebclassAdmin(admin.ModelAdmin):
     inlines = [WebclassSlotInline]
-    list_filter = ('course', 'period', 'iej')
-    list_display = ('course', 'period')
+    list_filter = ('course', 'period', 'iej', 'bbb_server', 'status')
+    list_display = ('course', 'period', 'bbb_server', 'status')
     filter_horizontal = ('iej',)
     search_fields = ['id', 'course__code', 'course__title']
 
diff --git a/teleforma/webclass/models.py b/teleforma/webclass/models.py
index cacbbf00..c3f05956 100644
--- a/teleforma/webclass/models.py
+++ b/teleforma/webclass/models.py
@@ -127,8 +127,8 @@ class Webclass(models.Model):
     max_participants        = models.IntegerField('Nombre maxium de participants par créneau', blank=True, null=True, default=80)
     status                  = models.IntegerField(_('status'), choices=STATUS_CHOICES, default=2)
 
-    published = PublishedManager()
     objects = models.Manager()
+    published = PublishedManager()
 
     class Meta(MetaCore):
         db_table = app_label + '_' + 'webclass'
@@ -161,8 +161,8 @@ class WebclassSlot(models.Model):
     room_id         = models.CharField('id de la conférence BBB (généré automatiquement)', blank=True, null=True, max_length=255)
     room_password   = models.CharField('password du modérateur (généré automatiquement)', blank=True, null=True, max_length=255)
 
-    published = SlotPublishedManager()
     objects = models.Manager()
+    published = SlotPublishedManager()
 
     class Meta(MetaCore):
         db_table = app_label + '_' + 'webclass_slot'
-- 
2.39.5