move apps to own dir

apps/member/__init__.py

@@ -0,0 +1,5 @@
+# -*- mode: python; coding: utf-8 -*-
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+default_app_config = 'member.apps.MemberConfig'

apps/member/admin.py

@@ -0,0 +1,43 @@
+# -*- mode: python; coding: utf-8 -*-
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import User
+
+from .forms import CustomUserChangeForm
+from .models import Club, Membership, Profile, Role
+
+
+class ProfileInline(admin.StackedInline):
+    """
+    Inline user profile in user admin
+    """
+    model = Profile
+    can_delete = False
+
+
+class CustomUserAdmin(UserAdmin):
+    inlines = (ProfileInline,)
+    list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
+    list_select_related = ('profile',)
+    form = CustomUserChangeForm
+
+    def get_inline_instances(self, request, obj=None):
+        """
+        When creating a new user don't show profile one the first step
+        """
+        if not obj:
+            return list()
+        return super().get_inline_instances(request, obj)
+
+
+# Update Django User with profile
+admin.site.unregister(User)
+admin.site.register(User, CustomUserAdmin)
+
+# Add other models
+admin.site.register(Club)
+admin.site.register(Membership)
+admin.site.register(Role)

apps/member/apps.py

@@ -0,0 +1,11 @@
+# -*- mode: python; coding: utf-8 -*-
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+
+class MemberConfig(AppConfig):
+    name = 'member'
+    verbose_name = _('member')

apps/member/forms.py

@@ -0,0 +1,18 @@
+# -*- mode: python; coding: utf-8 -*-
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.contrib.auth.forms import UserChangeForm
+
+
+class CustomUserChangeForm(UserChangeForm):
+    """
+    Make first name, last name and email required
+    in the default Django Auth User model
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['first_name'].required = True
+        self.fields['last_name'].required = True
+        self.fields['email'].required = True

apps/member/locale/fr/LC_MESSAGES/django.po

@@ -0,0 +1,116 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-07-16 15:21+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: apps.py:11
+msgid "member"
+msgstr "adhérent"
+
+#: models.py:24
+msgid "phone number"
+msgstr "numéro de téléphone"
+
+#: models.py:30
+msgid "section"
+msgstr "section"
+
+#: models.py:31
+msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
+msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
+
+#: models.py:37
+msgid "address"
+msgstr "adresse"
+
+#: models.py:43
+msgid "paid"
+msgstr "payé"
+
+#: models.py:48 models.py:49
+msgid "user profile"
+msgstr "profil utilisateur"
+
+#: models.py:57 models.py:102
+msgid "name"
+msgstr "nom"
+
+#: models.py:62
+msgid "email"
+msgstr "courriel"
+
+#: models.py:67
+msgid "membership fee"
+msgstr "cotisation pour adhérer"
+
+#: models.py:71
+msgid "membership duration"
+msgstr "durée de l'adhésion"
+
+#: models.py:72
+msgid "The longest time a membership can last (NULL = infinite)."
+msgstr "La durée maximale d'une adhésion (NULL = infinie)."
+
+#: models.py:77
+msgid "membership start"
+msgstr "début de l'adhésion"
+
+#: models.py:78
+msgid "How long after January 1st the members can renew their membership."
+msgstr ""
+
+#: models.py:83
+msgid "membership end"
+msgstr "fin de l'adhésion"
+
+#: models.py:84
+msgid ""
+"How long the membership can last after January 1st of the next year after "
+"members can renew their membership."
+msgstr ""
+
+#: models.py:90
+msgid "club"
+msgstr "club"
+
+#: models.py:91
+msgid "clubs"
+msgstr "clubs"
+
+#: models.py:108
+msgid "role"
+msgstr "rôle"
+
+#: models.py:109
+msgid "roles"
+msgstr "rôles"
+
+#: models.py:126
+msgid "membership starts on"
+msgstr "l'adhésion commence le"
+
+#: models.py:129
+msgid "membership ends on"
+msgstr "l'adhésion finie le"
+
+#: models.py:133
+msgid "fee"
+msgstr "cotisation"
+
+#: models.py:137
+msgid "membership"
+msgstr "adhésion"
+
+#: models.py:138
+msgid "memberships"
+msgstr "adhésions"

apps/member/models.py

@@ -0,0 +1,148 @@
+# -*- mode: python; coding: utf-8 -*-
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.conf import settings
+from django.db import models
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+from django.utils.translation import gettext_lazy as _
+
+
+class Profile(models.Model):
+    """
+    An user profile
+
+    We do not want to patch the Django Contrib Auth User class
+    so this model add an user profile with additional information.
+    """
+    user = models.OneToOneField(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+    )
+    phone_number = models.CharField(
+        verbose_name=_('phone number'),
+        max_length=50,
+        blank=True,
+        null=True,
+    )
+    section = models.CharField(
+        verbose_name=_('section'),
+        help_text=_('e.g. "1A0", "9A♥", "SAPHIRE"'),
+        max_length=255,
+        blank=True,
+        null=True,
+    )
+    address = models.CharField(
+        verbose_name=_('address'),
+        max_length=255,
+        blank=True,
+        null=True,
+    )
+    paid = models.BooleanField(
+        verbose_name=_("paid"),
+        default=False,
+    )
+
+    class Meta:
+        verbose_name = _('user profile')
+        verbose_name_plural = _('user profile')
+
+
+class Club(models.Model):
+    """
+    A student club
+    """
+    name = models.CharField(
+        verbose_name=_('name'),
+        max_length=255,
+        unique=True,
+    )
+    email = models.EmailField(
+        verbose_name=_('email'),
+    )
+
+    # Memberships
+    membership_fee = models.PositiveIntegerField(
+        verbose_name=_('membership fee'),
+    )
+    membership_duration = models.DurationField(
+        null=True,
+        verbose_name=_('membership duration'),
+        help_text=_('The longest time a membership can last '
+                    '(NULL = infinite).'),
+    )
+    membership_start = models.DurationField(
+        null=True,
+        verbose_name=_('membership start'),
+        help_text=_('How long after January 1st the members can renew '
+                    'their membership.'),
+    )
+    membership_end = models.DurationField(
+        null=True,
+        verbose_name=_('membership end'),
+        help_text=_('How long the membership can last after January 1st '
+                    'of the next year after members can renew their '
+                    'membership.'),
+    )
+
+    class Meta:
+        verbose_name = _("club")
+        verbose_name_plural = _("clubs")
+
+    def __str__(self):
+        return self.name
+
+
+class Role(models.Model):
+    """
+    Role that an user can have in a club
+    """
+    name = models.CharField(
+        verbose_name=_('name'),
+        max_length=255,
+        unique=True,
+    )
+
+    class Meta:
+        verbose_name = _('role')
+        verbose_name_plural = _('roles')
+
+
+class Membership(models.Model):
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.PROTECT
+    )
+    club = models.ForeignKey(
+        Club,
+        on_delete=models.PROTECT
+    )
+    roles = models.ForeignKey(
+        Role,
+        on_delete=models.PROTECT
+    )
+    date_start = models.DateField(
+        verbose_name=_('membership starts on'),
+    )
+    date_end = models.DateField(
+        verbose_name=_('membership ends on'),
+        null=True,
+    )
+    fee = models.PositiveIntegerField(
+        verbose_name=_('fee'),
+    )
+
+    class Meta:
+        verbose_name = _('membership')
+        verbose_name_plural = _('memberships')
+
+
+@receiver(post_save, sender=settings.AUTH_USER_MODEL)
+def save_user_profile(instance, created, **_kwargs):
+    """
+    Hook to save an user profile when an user is updated
+    """
+    if created:
+        Profile.objects.create(user=instance)
+    instance.profile.save()

apps/member/views.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.utils.translation import gettext_lazy as _
+from django.views.generic.edit import CreateView
+
+from .models import