change birthdate only if user didn't have it previously

require birthday when creating subscriptions for users that didn't give it previously
make some users not having birthday in populate_more.py
2025-09-13 03:25:49 +00:00 · 2025-09-04 11:03:02 +02:00 · 2025-09-04 11:02:59 +02:00 · 2025-09-04 11:02:48 +02:00 · 2025-09-04 11:02:48 +02:00
28 changed files with 186 additions and 421 deletions
--- a/com/static/com/css/news-list.scss
+++ b/com/static/com/css/news-list.scss
@@ -83,8 +83,7 @@
    #links_content {
      overflow: auto;
      box-shadow: $shadow-color 1px 1px 1px;
-      min-height: 20em;
-      padding-bottom: 1em;
+      height: 20em;

      h4 {
        margin-left: 5px;
--- a/com/templates/com/news_list.jinja
+++ b/com/templates/com/news_list.jinja
@@ -205,10 +205,6 @@
              <i class="fa-solid fa-graduation-cap fa-xl"></i>
              <a href="{{ url("pedagogy:guide") }}">{% trans %}UV Guide{% endtrans %}</a>
            </li>
-            <li>
-              <i class="fa-solid fa-calendar-days fa-xl"></i>
-              <a href="{{ url("timetable:generator") }}">{% trans %}Timetable{% endtrans %}</a>
-            </li>
            <li>
              <i class="fa-solid fa-magnifying-glass fa-xl"></i>
              <a href="{{ url("matmat:search_clear") }}">{% trans %}Matmatronch{% endtrans %}</a>
--- a/core/api.py
+++ b/core/api.py
@@ -25,6 +25,7 @@ from core.schemas import (
    UserFamilySchema,
    UserFilterSchema,
    UserProfileSchema,
+    UserSchema,
 )
 from core.templatetags.renderer import markdown

@@ -69,16 +70,22 @@ class MailingListController(ControllerBase):
        return data


-@api_controller("/user", permissions=[CanAccessLookup])
+@api_controller("/user")
 class UserController(ControllerBase):
-    @route.get("", response=list[UserProfileSchema])
+    @route.get("", response=list[UserProfileSchema], permissions=[CanAccessLookup])
    def fetch_profiles(self, pks: Query[set[int]]):
        return User.objects.filter(pk__in=pks)

+    @route.get("/{int:user_id}", response=UserSchema, permissions=[CanView])
+    def fetch_user(self, user_id: int):
+        """Fetch a single user"""
+        return self.get_object_or_exception(User, id=user_id)
+
    @route.get(
        "/search",
        response=PaginatedResponseSchema[UserProfileSchema],
        url_name="search_users",
+        permissions=[CanAccessLookup],
    )
    @paginate(PageNumberPaginationExtra, page_size=20)
    def search_users(self, filters: Query[UserFilterSchema]):
--- a/core/management/commands/populate_more.py
+++ b/core/management/commands/populate_more.py
@@ -94,7 +94,11 @@ class Command(BaseCommand):
                username=self.faker.user_name(),
                first_name=self.faker.first_name(),
                last_name=self.faker.last_name(),
-                date_of_birth=self.faker.date_of_birth(minimum_age=15, maximum_age=25),
+                date_of_birth=(
+                    None
+                    if random.random() < 0.2
+                    else self.faker.date_of_birth(minimum_age=15, maximum_age=25)
+                ),
                email=self.faker.email(),
                phone=self.faker.phone_number(),
                address=self.faker.address(),
--- a/core/models.py
+++ b/core/models.py
@@ -560,7 +560,7 @@ class User(AbstractUser):
        """Determine if the object is owned by the user."""
        if hasattr(obj, "is_owned_by") and obj.is_owned_by(self):
            return True
-        if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group_id):
+        if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group.id):
            return True
        return self.is_root

@@ -569,15 +569,9 @@ class User(AbstractUser):
        if hasattr(obj, "can_be_edited_by") and obj.can_be_edited_by(self):
            return True
        if hasattr(obj, "edit_groups"):
-            if (
-                hasattr(obj, "_prefetched_objects_cache")
-                and "edit_groups" in obj._prefetched_objects_cache
-            ):
-                pks = [g.id for g in obj.edit_groups.all()]
-            else:
-                pks = list(obj.edit_groups.values_list("id", flat=True))
-            if any(self.is_in_group(pk=pk) for pk in pks):
-                return True
+            for pk in obj.edit_groups.values_list("pk", flat=True):
+                if self.is_in_group(pk=pk):
+                    return True
        if isinstance(obj, User) and obj == self:
            return True
        return self.is_owner(obj)
@@ -587,18 +581,9 @@ class User(AbstractUser):
        if hasattr(obj, "can_be_viewed_by") and obj.can_be_viewed_by(self):
            return True
        if hasattr(obj, "view_groups"):
-            # if "view_groups" has already been prefetched, use
-            # the prefetch cache, else fetch only the ids, to make
-            # the query lighter.
-            if (
-                hasattr(obj, "_prefetched_objects_cache")
-                and "view_groups" in obj._prefetched_objects_cache
-            ):
-                pks = [g.id for g in obj.view_groups.all()]
-            else:
-                pks = list(obj.view_groups.values_list("id", flat=True))
-            if any(self.is_in_group(pk=pk) for pk in pks):
-                return True
+            for pk in obj.view_groups.values_list("pk", flat=True):
+                if self.is_in_group(pk=pk):
+                    return True
        return self.can_edit(obj)

    def can_be_edited_by(self, user):
@@ -651,6 +636,9 @@ class User(AbstractUser):


 class AnonymousUser(AuthAnonymousUser):
+    def __init__(self):
+        super().__init__()
+
    @property
    def was_subscribed(self):
        return False
@@ -659,6 +647,10 @@ class AnonymousUser(AuthAnonymousUser):
    def is_subscribed(self):
        return False

+    @property
+    def subscribed(self):
+        return False
+
    @property
    def is_root(self):
        return False
@@ -1392,9 +1384,9 @@ class Page(models.Model):

    @cached_property
    def is_club_page(self):
-        return (
-            self.name == settings.SITH_CLUB_ROOT_PAGE
-            or settings.SITH_CLUB_ROOT_PAGE in [p.name for p in self.get_parent_list()]
+        club_root_page = Page.objects.filter(name=settings.SITH_CLUB_ROOT_PAGE).first()
+        return club_root_page is not None and (
+            self == club_root_page or club_root_page in self.get_parent_list()
        )

    @cached_property
--- a/core/schemas.py
+++ b/core/schemas.py
@@ -34,6 +34,22 @@ class SimpleUserSchema(ModelSchema):
        fields = ["id", "nick_name", "first_name", "last_name"]


+class UserSchema(ModelSchema):
+    class Meta:
+        model = User
+        fields = [
+            "id",
+            "nick_name",
+            "first_name",
+            "last_name",
+            "date_of_birth",
+            "email",
+            "role",
+            "quote",
+            "promo",
+        ]
+
+
 class UserProfileSchema(ModelSchema):
    """The necessary information to show a user profile"""

--- a/core/templates/core/page_list.jinja
+++ b/core/templates/core/page_list.jinja
@@ -5,12 +5,16 @@
 {% endblock %}

 {% block content %}
-  <h3>{% trans %}Page list{% endtrans %}</h3>
-  <ul>
-    {% for p in page_list %}
-      <li><a href="{{ p.get_absolute_url() }}">{{ p.display_name }}</a></li>
-    {% endfor %}
-  </ul>
+  {% if page_list %}
+    <h3>{% trans %}Page list{% endtrans %}</h3>
+    <ul>
+      {% for p in page_list %}
+        <li><a href="{{ p.get_absolute_url() }}">{{ p.get_display_name() }}</a></li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no page in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}


--- a/core/views/page.py
+++ b/core/views/page.py
@@ -12,10 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.db.models import F, OuterRef, Subquery
-from django.db.models.functions import Coalesce

 # This file contains all the views that concern the page model
 from django.forms.models import modelform_factory
@@ -46,20 +43,6 @@ class CanEditPagePropMixin(CanEditPropMixin):
 class PageListView(CanViewMixin, ListView):
    model = Page
    template_name = "core/page_list.jinja"
-    queryset = (
-        Page.objects.annotate(
-            display_name=Coalesce(
-                Subquery(
-                    PageRev.objects.filter(page=OuterRef("id"))
-                    .order_by("-date")
-                    .values("title")[:1]
-                ),
-                F("name"),
-            )
-        )
-        .prefetch_related("view_groups")
-        .select_related("parent")
-    )


 class PageView(CanViewMixin, DetailView):
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-13 00:17+0200\n"
+"POT-Creation-Date: 2025-09-02 15:56+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -1043,10 +1043,6 @@ msgstr "Nos services"
 msgid "UV Guide"
 msgstr "Guide des UVs"

-#: com/templates/com/news_list.jinja
-msgid "Timetable"
-msgstr "Emploi du temps"
-
 #: com/templates/com/news_list.jinja core/templates/core/base/navbar.jinja
 msgid "Matmatronch"
 msgstr "Matmatronch"
@@ -1717,8 +1713,8 @@ msgid ""
 "AE UTBM is a voluntary organisation run by UTBM students. It organises "
 "student life at UTBM and manages its student facilities."
 msgstr ""
-"L'AE UTBM est une association bénévole gérée par les étudiants de l'UTBM. "
-"Elle organise la vie étudiante de l'UTBM et gère ses lieux de vie."
+"L'AE UTBM est une association bénévole gérée par les étudiants de "
+"l'UTBM. Elle organise la vie étudiante de l'UTBM et gère ses lieux de vie."

 #: core/templates/core/base/footer.jinja core/templates/core/base/navbar.jinja
 msgid "Contacts"
@@ -2161,6 +2157,10 @@ msgstr ""
 msgid "Page history"
 msgstr "Historique de la page"

+#: core/templates/core/page_list.jinja
+msgid "There is no page in this website."
+msgstr "Il n'y a pas de page sur ce site web."
+
 #: core/templates/core/page_prop.jinja
 msgid "Page properties"
 msgstr "Propriétés de la page"
@@ -5135,6 +5135,10 @@ msgstr "Tee-shirt AE"
 msgid "A user with that email address already exists"
 msgstr "Un utilisateur avec cette adresse email existe déjà"

+#: subscription/forms.py
+msgid "This user didn't fill its birthdate yet."
+msgstr "Cet utilisateur n'a pas encore renseigné sa date de naissance"
+
 #: subscription/models.py
 msgid "Bad subscription type"
 msgstr "Mauvais type de cotisation"
@@ -5174,7 +5178,7 @@ msgid ""
 "%(user)s received its new %(type)s subscription. It will be active until "
 "%(end)s included."
 msgstr ""
-"%(user)s a reçu sa nouvelle cotisaton %(type)s. Elle sert active jusqu'au "
+"%(user)s a reçu sa nouvelle cotisaton %(type)s. Elle sera active jusqu'au "
 "%(end)s inclu."

 #: subscription/templates/subscription/fragments/creation_success.jinja
@@ -5201,18 +5205,6 @@ msgstr "Membre existant"
 msgid "the groups that can create subscriptions"
 msgstr "les groupes pouvant créer des cotisations"

-#: timetable/templates/timetable/generator.jinja
-msgid "Timetable generator"
-msgstr "Générateur d'emploi du temps"
-
-#: timetable/templates/timetable/generator.jinja
-msgid "Generate"
-msgstr "Générer"
-
-#: timetable/templates/timetable/generator.jinja
-msgid "Save to PNG"
-msgstr "Sauver en PNG"
-
 #: trombi/models.py
 msgid "subscription deadline"
 msgstr "fin des inscriptions"
@@ -5510,9 +5502,3 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée."
 #, python-format
 msgid "Maximum characters: %(max_length)s"
 msgstr "Nombre de caractères max: %(max_length)s"
-
-#~ msgid "Timeplan generator"
-#~ msgstr "Temps de génération du template : "
-
-#~ msgid "There is no page in this website."
-#~ msgstr "Il n'y a pas de page sur ce site web."
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,6 @@
        "d3-force-3d": "^3.0.5",
        "easymde": "^2.19.0",
        "glob": "^11.0.0",
-        "html2canvas": "^1.4.1",
        "htmx.org": "^2.0.3",
        "jquery": "^3.7.1",
        "js-cookie": "^3.0.5",
@@ -3125,15 +3124,6 @@
        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
      }
    },
-    "node_modules/base64-arraybuffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
    "node_modules/binary-extensions": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -3522,15 +3512,6 @@
        "node": ">= 8"
      }
    },
-    "node_modules/css-line-break": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
-      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
-      "license": "MIT",
-      "dependencies": {
-        "utrie": "^1.0.2"
-      }
-    },
    "node_modules/cytoscape": {
      "version": "3.33.1",
      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.1.tgz",
@@ -4203,19 +4184,6 @@
        "node": ">= 0.4"
      }
    },
-    "node_modules/html2canvas": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
-      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
-      "license": "MIT",
-      "dependencies": {
-        "css-line-break": "^2.1.0",
-        "text-segmentation": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
    "node_modules/htmx.org": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.6.tgz",
@@ -5511,15 +5479,6 @@
      "dev": true,
      "license": "ISC"
    },
-    "node_modules/text-segmentation": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
-      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
-      "license": "MIT",
-      "dependencies": {
-        "utrie": "^1.0.2"
-      }
-    },
    "node_modules/three": {
      "version": "0.177.0",
      "resolved": "https://registry.npmjs.org/three/-/three-0.177.0.tgz",
@@ -5777,15 +5736,6 @@
        "browserslist": ">= 4.21.0"
      }
    },
-    "node_modules/utrie": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
-      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
-      "license": "MIT",
-      "dependencies": {
-        "base64-arraybuffer": "^1.0.2"
-      }
-    },
    "node_modules/vite": {
      "version": "6.3.5",
      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
--- a/package.json
+++ b/package.json
@@ -60,7 +60,6 @@
    "d3-force-3d": "^3.0.5",
    "easymde": "^2.19.0",
    "glob": "^11.0.0",
-    "html2canvas": "^1.4.1",
    "htmx.org": "^2.0.3",
    "jquery": "^3.7.1",
    "js-cookie": "^3.0.5",
--- a/sith/settings.py
+++ b/sith/settings.py
@@ -125,7 +125,6 @@ INSTALLED_APPS = (
    "pedagogy",
    "galaxy",
    "antispam",
-    "timetable",
    "api",
 )

--- a/sith/urls.py
+++ b/sith/urls.py
@@ -53,7 +53,6 @@ urlpatterns = [
    path("i18n/", include("django.conf.urls.i18n")),
    path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"),
    path("captcha/", include("captcha.urls")),
-    path("edt/", include(("timetable.urls", "timetable"), namespace="timetable")),
 ]

 if settings.DEBUG:
--- a/subscription/forms.py
+++ b/subscription/forms.py
@@ -23,8 +23,8 @@ class SelectionDateForm(forms.Form):


 class SubscriptionForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        initial = kwargs.pop("initial", {})
+    def __init__(self, *args, initial=None, **kwargs):
+        initial = initial or {}
        if "subscription_type" not in initial:
            initial["subscription_type"] = "deux-semestres"
        if "payment_method" not in initial:
@@ -131,8 +131,57 @@ class SubscriptionExistingUserForm(SubscriptionForm):
    """Form to add a subscription to an existing user."""

    template_name = "subscription/forms/create_existing_user.html"
+    required_css_class = "required"
+
+    birthdate = forms.fields_for_model(
+        User,
+        ["date_of_birth"],
+        widgets={"date_of_birth": SelectDate(attrs={"hidden": True})},
+        help_texts={"date_of_birth": _("This user didn't fill its birthdate yet.")},
+    )["date_of_birth"]

    class Meta:
        model = Subscription
        fields = ["member", "subscription_type", "payment_method", "location"]
        widgets = {"member": AutoCompleteSelectUser}
+
+    field_order = [
+        "member",
+        "birthdate",
+        "subscription_type",
+        "payment_method",
+        "location",
+    ]
+
+    def __init__(self, *args, initial=None, **kwargs):
+        super().__init__(*args, initial=initial, **kwargs)
+        self.fields["birthdate"].required = True
+        if not initial:
+            return
+        member: str | None = initial.get("member")
+        if member and member.isdigit():
+            member: User | None = User.objects.filter(id=int(member)).first()
+        else:
+            member = None
+        if member and member.date_of_birth:
+            # if there is an initial member with a birthdate,
+            # there is no need to ask this to the user
+            self.fields["birthdate"].initial = member.date_of_birth
+        elif member:
+            # if there is an initial member without a birthdate,
+            # then the field must be displayed
+            self.fields["birthdate"].widget.attrs.update({"hidden": False})
+        # if there is no initial member, it means that it will be
+        # dynamically selected using the AutoCompleteSelectUser widget.
+        # JS will take care of un-hiding the field if necessary
+
+    def save(self, *args, **kwargs):
+        if self.errors:
+            return super().save(*args, **kwargs)
+        if (
+            self.cleaned_data["birthdate"] is not None
+            and self.instance.member.date_of_birth is None
+        ):
+            self.instance.member.date_of_birth = self.cleaned_data["birthdate"]
+            self.instance.member.save()
+        return super().save(*args, **kwargs)
--- a/subscription/static/bundled/subscription/creation-form-existing-user-index.ts
+++ b/subscription/static/bundled/subscription/creation-form-existing-user-index.ts
@@ -1,3 +1,5 @@
+import { userFetchUser } from "#openapi";
+
 document.addEventListener("alpine:init", () => {
  Alpine.data("existing_user_subscription_form", () => ({
    loading: false,
@@ -12,13 +14,24 @@ document.addEventListener("alpine:init", () => {
    },

    async loadProfile(userId: number) {
+      const birthdayInput = document.getElementById("id_birthdate") as HTMLInputElement;
      if (!Number.isInteger(userId)) {
        this.profileFragment = "";
+        birthdayInput.hidden = true;
        return;
      }
      this.loading = true;
-      const response = await fetch(`/user/${userId}/mini/`);
-      this.profileFragment = await response.text();
+      const [miniProfile, userInfos] = await Promise.all([
+        fetch(`/user/${userId}/mini/`),
+        // biome-ignore lint/style/useNamingConvention: api is snake_case
+        userFetchUser({ path: { user_id: userId } }),
+      ]);
+      this.profileFragment = await miniProfile.text();
+      // If the user has no birthdate yet, show the form input
+      // to fill this info.
+      // Else keep the input hidden and change its value to the user birthdate
+      birthdayInput.value = userInfos.data.date_of_birth;
+      birthdayInput.hidden = userInfos.data.date_of_birth !== null;
      this.loading = false;
    },
  }));
--- a/subscription/static/subscription/css/subscription.scss
+++ b/subscription/static/subscription/css/subscription.scss
@@ -1,4 +1,14 @@
 #subscription-form form {
+  margin-top: 0;
+
+  .form-content {
+    margin-top: 0;
+  }
+
+  fieldset p:first-of-type, & > p:first-of-type {
+    margin-top: 0;
+  }
+
  .form-content.existing-user {
    max-height: 100%;
    display: flex;
@@ -13,6 +23,11 @@
     * then display the user profile right in the middle of the remaining space. */
    fieldset {
      flex: 0 1 auto;
+
+      p:has(input[hidden]) {
+        // when the input is hidden, hide the whole label+input+help text group
+        display: none;
+      }
    }

    #subscription-form-user-mini-profile {
--- a/subscription/tests/test_new_subscription.py
+++ b/subscription/tests/test_new_subscription.py
@@ -1,6 +1,6 @@
 """Tests focused on testing subscription creation"""

-from datetime import timedelta
+from datetime import date, timedelta
 from typing import Callable

 import pytest
@@ -31,6 +31,26 @@ def test_form_existing_user_valid(
 ):
    """Test `SubscriptionExistingUserForm`"""
    user = user_factory()
+    user.date_of_birth = date(year=1967, month=3, day=14)
+    user.save()
+    data = {
+        "member": user,
+        "birthdate": user.date_of_birth,
+        "subscription_type": "deux-semestres",
+        "location": settings.SITH_SUBSCRIPTION_LOCATIONS[0][0],
+        "payment_method": settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0],
+    }
+    form = SubscriptionExistingUserForm(data)
+    assert form.is_valid()
+    form.save()
+    user.refresh_from_db()
+    assert user.is_subscribed
+
+
+@pytest.mark.django_db
+def test_form_existing_user_with_birthdate(settings: SettingsWrapper):
+    """Test `SubscriptionExistingUserForm`"""
+    user = baker.make(User, date_of_birth=None)
    data = {
        "member": user,
        "subscription_type": "deux-semestres",
@@ -38,11 +58,15 @@ def test_form_existing_user_valid(
        "payment_method": settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0],
    }
    form = SubscriptionExistingUserForm(data)
+    assert not form.is_valid()

+    data |= {"birthdate": date(year=1967, month=3, day=14)}
+    form = SubscriptionExistingUserForm(data)
    assert form.is_valid()
    form.save()
    user.refresh_from_db()
    assert user.is_subscribed
+    assert user.date_of_birth == date(year=1967, month=3, day=14)


@pytest.mark.django_db
@@ -132,6 +156,14 @@ def test_page_access(
    assert res.status_code == status_code


+@pytest.mark.django_db
+def test_page_access_with_get_data(client: Client):
+    user = old_subscriber_user.make()
+    client.force_login(baker.make(User, is_superuser=True))
+    res = client.get(reverse("subscription:subscription", query={"member": user.id}))
+    assert res.status_code == 200
+
+
@pytest.mark.django_db
 def test_submit_form_existing_user(client: Client, settings: SettingsWrapper):
    client.force_login(
@@ -140,11 +172,12 @@ def test_submit_form_existing_user(client: Client, settings: SettingsWrapper):
            user_permissions=Permission.objects.filter(codename="add_subscription"),
        )
    )
-    user = old_subscriber_user.make()
+    user = old_subscriber_user.make(date_of_birth=date(year=1967, month=3, day=14))
    response = client.post(
        reverse("subscription:fragment-existing-user"),
        {
            "member": user.id,
+            "birthdate": user.date_of_birth,
            "subscription_type": "deux-semestres",
            "location": settings.SITH_SUBSCRIPTION_LOCATIONS[0][0],
            "payment_method": settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0],
--- a/timetable/init.py
+++ b/timetable/init.py
--- a/timetable/admin.py
+++ b/timetable/admin.py
@@ -1 +0,0 @@
-# Register your models here.
--- a/timetable/apps.py
+++ b/timetable/apps.py
@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class TimetableConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "timetable"
--- a/timetable/migrations/init.py
+++ b/timetable/migrations/init.py
--- a/timetable/models.py
+++ b/timetable/models.py
@@ -1 +0,0 @@
-# Create your models here.
--- a/timetable/static/bundled/timetable/generator-index.ts
+++ b/timetable/static/bundled/timetable/generator-index.ts
@@ -1,164 +0,0 @@
-import html2canvas from "html2canvas";
-
-// see https://regex101.com/r/QHSaPM/2
-const TIMETABLE_ROW_RE: RegExp =
-  /^(?<ueCode>\w.+\w)\s+(?<courseType>[A-Z]{2}\d)\s+((?<weekGroup>[AB])\s+)?(?<weekday>(lundi)|(mardi)|(mercredi)|(jeudi)|(vendredi)|(samedi)|(dimanche))\s+(?<startHour>\d{2}:\d{2})\s+(?<endHour>\d{2}:\d{2})\s+[\dA-B]\s+((?<attendance>[\wé]*)\s+)?(?<room>\w+(?:, \w+)?)$/;
-
-const DEFAULT_TIMETABLE: string = `DS52\t\tCM1\t\tlundi\t08:00\t10:00\t1\tPrésentiel\tA113
-DS53\t\tCM1\t\tlundi\t10:15\t12:15\t1\tPrésentiel\tA101
-DS53\t\tTP1\t\tlundi\t13:00\t16:00\t1\tPrésentiel\tH010
-SO03\t\tCM1\t\tlundi\t16:15\t17:45\t1\tPrésentiel\tA103
-SO03\t\tTD1\t\tlundi\t17:45\t19:45\t1\tPrésentiel\tA103
-DS50\t\tTP1\t\tmardi\t08:00\t10:00\t1\tPrésentiel\tA216
-DS51\t\tCM1\t\tmardi\t10:15\t12:15\t1\tPrésentiel\tA216
-DS51\t\tTP1\t\tmardi\t14:00\t18:00\t1\tPrésentiel\tH010
-DS52\t\tTP2\tA\tjeudi\t08:00\t10:00\tA\tPrésentiel\tA110a, A110b
-DS52\t\tTD1\t\tjeudi\t10:15\t12:15\t1\tPrésentiel\tA110a, A110b
-LC02\t\tTP1\t\tjeudi\t15:00\t16:00\t1\tPrésentiel\tA209
-LC02\t\tTD1\t\tjeudi\t16:15\t18:15\t1\tPrésentiel\tA206`;
-
-type WeekDay =
-  | "lundi"
-  | "mardi"
-  | "mercredi"
-  | "jeudi"
-  | "vendredi"
-  | "samedi"
-  | "dimanche";
-
-const WEEKDAYS = [
-  "lundi",
-  "mardi",
-  "mercredi",
-  "jeudi",
-  "vendredi",
-  "samedi",
-  "dimanche",
-] as const;
-
-const SLOT_HEIGHT = 20 as const; // Each 15min has a height of 20px in the timetable
-const SLOT_WIDTH = 250 as const; // Each weekday ha a width of 400px in the timetable
-const MINUTES_PER_SLOT = 15 as const;
-
-interface TimetableSlot {
-  courseType: string;
-  room: string;
-  startHour: string;
-  endHour: string;
-  startSlot: number;
-  endSlot: number;
-  ueCode: string;
-  weekGroup?: string;
-  weekday: WeekDay;
-}
-
-function parseSlots(s: string): TimetableSlot[] {
-  return s
-    .split("\n")
-    .filter((s: string) => s.length > 0)
-    .map((row: string) => {
-      const parsed = TIMETABLE_ROW_RE.exec(row);
-      if (!parsed) {
-        throw new Error(`Couldn't parse row ${row}`);
-      }
-      const [startHour, startMin] = parsed.groups.startHour
-        .split(":")
-        .map((i) => Number.parseInt(i));
-      const [endHour, endMin] = parsed.groups.endHour
-        .split(":")
-        .map((i) => Number.parseInt(i));
-      return {
-        ...parsed.groups,
-        startSlot: Math.floor((startHour * 60 + startMin) / MINUTES_PER_SLOT),
-        endSlot: Math.floor((endHour * 60 + endMin) / MINUTES_PER_SLOT),
-      } as unknown as TimetableSlot;
-    });
-}
-
-document.addEventListener("alpine:init", () => {
-  Alpine.data("timetableGenerator", () => ({
-    content: DEFAULT_TIMETABLE,
-    error: "",
-    displayedWeekdays: [] as WeekDay[],
-    courses: [] as TimetableSlot[],
-    startSlot: 0,
-    table: {
-      height: 0,
-      width: 0,
-    },
-
-    colors: {} as Record<string, string>,
-    colorPalette: [
-      "#27ae60",
-      "#2980b9",
-      "#c0392b",
-      "#7f8c8d",
-      "#f1c40f",
-      "#1abc9c",
-      "#95a5a6",
-      "#26C6DA",
-      "#c2185b",
-      "#e64a19",
-      "#1b5e20",
-    ],
-
-    generate() {
-      try {
-        this.courses = parseSlots(this.content);
-      } catch {
-        this.error = gettext(
-          "Wrong timetable format. Make sure you copied if from your student folder.",
-        );
-        return;
-      }
-
-      // color each UE
-      let colorIndex = 0;
-      for (const slot of this.courses) {
-        if (!this.colors[slot.ueCode]) {
-          this.colors[slot.ueCode] =
-            this.colorPalette[colorIndex % this.colorPalette.length];
-          colorIndex++;
-        }
-      }
-
-      this.displayedWeekdays = WEEKDAYS.filter((day) =>
-        this.courses.some((slot: TimetableSlot) => slot.weekday === day),
-      );
-      this.startSlot = this.courses.reduce(
-        (acc: number, curr: TimetableSlot) => Math.min(acc, curr.startSlot),
-        25 * 4,
-      );
-      this.endSlot = this.courses.reduce(
-        (acc: number, curr: TimetableSlot) => Math.max(acc, curr.endSlot),
-        1,
-      );
-      this.table.height = SLOT_HEIGHT * (this.endSlot - this.startSlot);
-      this.table.width = SLOT_WIDTH * this.displayedWeekdays.length;
-    },
-
-    getStyle(slot: TimetableSlot) {
-      const hasWeekGroup = slot.weekGroup !== undefined;
-      const width = hasWeekGroup ? SLOT_WIDTH / 2 : SLOT_WIDTH;
-      const leftOffset = slot.weekGroup === "B" ? SLOT_WIDTH / 2 : 0;
-      return {
-        height: `${(slot.endSlot - slot.startSlot) * SLOT_HEIGHT}px`,
-        width: `${width}px`,
-        top: `${(slot.startSlot - this.startSlot) * SLOT_HEIGHT}px`,
-        left: `${this.displayedWeekdays.indexOf(slot.weekday) * SLOT_WIDTH + leftOffset}px`,
-        backgroundColor: this.colors[slot.ueCode],
-      };
-    },
-
-    async savePng() {
-      const elem = document.getElementById("timetable");
-      const img = (await html2canvas(elem)).toDataURL();
-      const downloadLink = document.createElement("a");
-      downloadLink.href = img;
-      downloadLink.download = "edt.png";
-      document.body.appendChild(downloadLink);
-      downloadLink.click();
-      downloadLink.remove();
-    },
-  }));
-});
--- a/timetable/static/timetable/css/generator.scss
+++ b/timetable/static/timetable/css/generator.scss
@@ -1,35 +0,0 @@
-#timetable {
-  display: block;
-  margin: 2em auto ;
-  .header {
-    background-color: white;
-    box-shadow: none;
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    gap: 0;
-    span {
-      flex: 1;
-      text-align: center;
-    }
-  }
-  .content {
-    position: relative;
-    text-align: center;
-
-    .slot {
-      background-color: cadetblue;
-      position: absolute;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-
-      .course-type {
-        position: absolute;
-        top: 0;
-        right: 0;
-        padding: 10px;
-      }
-    }
-  }
-}
--- a/timetable/templates/timetable/generator.jinja
+++ b/timetable/templates/timetable/generator.jinja
@@ -1,58 +0,0 @@
-{% extends 'core/base.jinja' %}
-
-{%- block additional_css -%}
-  <link rel="stylesheet" href="{{ static('timetable/css/generator.scss') }}">
-{%- endblock -%}
-
-{%- block additional_js -%}
-  <script type="module" src="{{ static('bundled/timetable/generator-index.ts') }}"></script>
-{%- endblock -%}
-
-{% block title %}
-  {% trans %}Timetable generator{% endtrans %}
-{% endblock %}
-
-{% block content %}
-  <div x-data="timetableGenerator">
-    <form @submit.prevent="generate()">
-      <h1>Générateur d'emploi du temps</h1>
-      <div class="alert alert-red" x-show="!!error" x-cloak>
-        <span class="alert-main" x-text="error"></span>
-      </div>
-      <div class="form-group">
-        <label for="timetable-input">Colle ton emploi du temps (sans l'entête)</label>
-        <textarea id="timetable-input" cols="30" rows="15" x-model="content"></textarea>
-      </div>
-      <input type="submit" class="btn btn-blue" value="{% trans %}Generate{% endtrans %}">
-    </form>
-    <div
-      id="timetable"
-      x-show="table.height > 0 && table.width > 0"
-      :style="{width: `${table.width}px`, height: `${table.height+40}px`}"
-    >
-      <div class="header">
-        <template x-for="weekday in displayedWeekdays">
-          <span x-text="weekday"></span>
-        </template>
-      </div>
-      <div class="content">
-        <template x-for="course in courses">
-          <div class="slot" :style="getStyle(course)">
-            <span class="course-type" x-text="course.courseType"></span>
-            <span x-text="course.ueCode"></span>
-            <span x-text="`${course.startHour} - ${course.endHour}`"></span>
-            <span x-text="(course.weekGroup ? `\nGroupe ${course.weekGroup}` : '')"></span>
-            <span x-text="course.room"></span>
-          </div>
-        </template>
-      </div>
-    </div>
-    <button
-      class="margin-bottom btn btn-blue"
-      @click="savePng"
-      x-show="table.height > 0 && table.width > 0"
-    >
-      {% trans %}Save to PNG{% endtrans %}
-    </button>
-  </div>
-{% endblock content %}
--- a/timetable/tests.py
+++ b/timetable/tests.py
@@ -1 +0,0 @@
-# Create your tests here.
--- a/timetable/urls.py
+++ b/timetable/urls.py
@@ -1,5 +0,0 @@
-from django.urls import path
-
-from timetable.views import GeneratorView
-
-urlpatterns = [path("", GeneratorView.as_view(), name="generator")]
--- a/timetable/views.py
+++ b/timetable/views.py
@@ -1,8 +0,0 @@
-# Create your views here.
-from django.views.generic import TemplateView
-
-from core.auth.mixins import FormerSubscriberMixin
-
-
-class GeneratorView(FormerSubscriberMixin, TemplateView):
-    template_name = "timetable/generator.jinja"
Author	SHA1	Message	Date
imperosol	3ad40b7383	change birthdate only if user didn't have it previously	2025-09-04 11:03:02 +02:00
imperosol	3709b5c221	require birthday when creating subscriptions for users that didn't give it previously	2025-09-04 11:02:59 +02:00
imperosol	171a3f4d92	make some users not having birthday in populate_more.py	2025-09-04 11:02:48 +02:00
imperosol	84e2f1b45a	fix: subscription form alignment	2025-09-04 11:02:48 +02:00