typos + renamings + other MR changes

gestion/migrations/0003_association_and_events.py

@@ -17,8 +17,8 @@ def create_apps(apps, schema_editor):
     bds_b = Group.objects.get(name="bds_buro")
 
     Association.objects.bulk_create([
-        Association(name="COF", staff_group=cof_b, members_group=cof_m),
+        Association(id=1, name="COF", staff_group=cof_b, members_group=cof_m),
-        Association(name="BDS", staff_group=bds_b, members_group=bds_m),
+        Association(id=2, name="BDS", staff_group=bds_b, members_group=bds_m),
     ])
 
 
@@ -85,9 +85,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Association',
             fields=[
-                ('name', models.CharField(max_length=30, primary_key=True, serialize=False, verbose_name="nom de l'association")),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('members_group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='member_groups', to='auth.Group', verbose_name='groupe des membres')),
+                ('name', models.CharField(max_length=30, verbose_name="nom de l'association")),
-                ('staff_group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='staff_groups', to='auth.Group', verbose_name='groupe des membre du bureau')),
+                ('members_group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='member_group_of', to='auth.Group', verbose_name='groupe des membres')),
+                ('staff_group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='staff_group_of', to='auth.Group', verbose_name='groupe des membres du bureau')),
             ],
             options={
                 'verbose_name': 'association',
@@ -103,7 +104,7 @@ class Migration(migrations.Migration):
                 ('end_date', models.DateTimeField(blank=True, null=True, verbose_name="fin de l'événement")),
                 ('description', models.TextField(blank=True, verbose_name='description')),
                 ('image', models.ImageField(blank=True, null=True, upload_to='public/imgs/events/', verbose_name='image')),
-                ('registration_open', models.BooleanField(default=True, verbose_name='les inscriptions sont ouvertes')),
+                ('registration_open', models.NullBooleanField(default=True, help_text="Indéfini signifie « l'inscription n'est pas requise\xa0»", verbose_name='les inscriptions sont ouvertes')),
                 ('old', models.BooleanField(default=False, verbose_name='archiver (événement fini)')),
                 ('associations', models.ManyToManyField(related_name='events', to='gestion.Association', verbose_name='associations')),
             ],
@@ -168,7 +169,7 @@ class Migration(migrations.Migration):
                 ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion.Event', verbose_name='événement')),
                 ('filledcomments', models.ManyToManyField(through='gestion.EventCommentValue', to='gestion.EventCommentField', verbose_name='commentaires')),
                 ('options', models.ManyToManyField(to='gestion.EventOptionChoice', verbose_name='choix')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='utilisateur')),
+                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='utilisateur')),
             ],
             options={
                 'verbose_name': 'inscription',
@@ -179,7 +180,7 @@ class Migration(migrations.Migration):
             name='Location',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200, verbose_name='nom du lieux')),
+                ('name', models.CharField(max_length=200, verbose_name='nom du lieu')),
             ],
             options={
                 'verbose_name': 'lieu',
@@ -272,7 +273,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='club',
             name='association',
-            field=models.ForeignKey(default='COF', on_delete=django.db.models.deletion.PROTECT, related_name='clubs', to='gestion.Association', verbose_name='association'),
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.PROTECT, related_name='clubs', to='gestion.Association', verbose_name='association'),
             preserve_default=False,
         ),
         migrations.AlterUniqueTogether(

gestion/models.py

@@ -69,20 +69,19 @@ def post_delete_user(sender, instance, *args, **kwargs):
 class Association(models.Model):
     name = models.CharField(
         _("nom de l'association"),
-        primary_key=True,
         max_length=30
     )
     staff_group = models.ForeignKey(
         Group,
         on_delete=models.PROTECT,
-        related_name="staff_groups",
+        related_name="staff_group_of",
         blank=True, null=True,
-        verbose_name=_("groupe des membre du bureau"),
+        verbose_name=_("groupe des membres du bureau"),
     )
     members_group = models.ForeignKey(
         Group,
         on_delete=models.PROTECT,
-        related_name="member_groups",
+        related_name="member_group_of",
         blank=True, null=True,
         verbose_name=_("groupe des membres"),
     )
@@ -117,7 +116,7 @@ class Club(models.Model):
         verbose_name=_("association"),
     )
     name = models.CharField(_("nom"), max_length=200, unique=True)
-    description = models.TextField("description", blank=True)
+    description = models.TextField(_("description"), blank=True)
     members = models.ManyToManyField(
         User,
         through="ClubUser",
@@ -161,7 +160,7 @@ class ClubUser(models.Model):
 # ---
 
 class Location(models.Model):
-    name = models.CharField(_("nom du lieux"), max_length=200)
+    name = models.CharField(_("nom du lieu"), max_length=200)
 
     class Meta:
         verbose_name = _("lieu")
@@ -197,9 +196,10 @@ class Event(models.Model):
         blank=True, null=True,
         upload_to="public/imgs/events/",
     )
-    registration_open = models.BooleanField(
+    registration_open = models.NullBooleanField(
         _("les inscriptions sont ouvertes"),
-        default=True
+        help_text=_("Indéfini signifie « l'inscription n'est pas requise »"),
+        default=True,
     )
     old = models.BooleanField(_("archiver (événement fini)"), default=False)
 
@@ -208,7 +208,15 @@ class Event(models.Model):
         verbose_name_plural = _("événements")
 
     def __str__(self):
-        return self.title
+        title, location = self.title, self.location
+        start = self.start_date.date()
+        end = self.end_date.date()
+        if not self.start_date.date():
+            return "{} @ {}".format(title, location)
+        elif start == end:
+            return "{} @ {} ({})".format(title, location, start)
+        else:
+            return "{} @ {} ({} → {})".format(title, location, start, end)
 
 
 class EventCommentField(models.Model):
@@ -311,7 +319,8 @@ class EventOptionChoice(models.Model):
 class EventRegistration(models.Model):
     user = models.ForeignKey(
         User,
-        on_delete=models.CASCADE,
+        on_delete=models.SET_NULL,
+        null=True,
         verbose_name=_("utilisateur"),
     )
     event = models.ForeignKey(