mirror of
https://github.com/ae-utbm/sith.git
synced 2025-09-13 11:35:44 +00:00
Compare commits
12 Commits
master
...
subscripti
Author | SHA1 | Date | |
---|---|---|---|
|
3ad40b7383 | ||
|
3709b5c221 | ||
|
171a3f4d92 | ||
|
84e2f1b45a | ||
|
fdf5e4fbe9 | ||
|
4e08591721 | ||
|
27b98f4a48 | ||
|
cb454935ad | ||
|
17c50934bb | ||
|
5646f22968 | ||
|
03759fd83e | ||
|
83c96884d8 |
@@ -1,6 +1,14 @@
|
|||||||
{% extends "core/base.jinja" %}
|
{% extends "core/base.jinja" %}
|
||||||
{% from 'core/macros.jinja' import user_profile_link %}
|
{% from 'core/macros.jinja' import user_profile_link %}
|
||||||
|
|
||||||
|
{% block title -%}
|
||||||
|
{{ club.name }}
|
||||||
|
{%- endblock %}
|
||||||
|
|
||||||
|
{% block description -%}
|
||||||
|
{{ club.short_description }}
|
||||||
|
{%- endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div id="club_detail">
|
<div id="club_detail">
|
||||||
{% if club.logo %}
|
{% if club.logo %}
|
||||||
|
@@ -1,8 +1,12 @@
|
|||||||
{% extends "core/base.jinja" %}
|
{% extends "core/base.jinja" %}
|
||||||
|
|
||||||
{% block title %}
|
{% block title -%}
|
||||||
{% trans %}Club list{% endtrans %}
|
{% trans %}Club list{% endtrans %}
|
||||||
{% endblock %}
|
{%- endblock %}
|
||||||
|
|
||||||
|
{% block description -%}
|
||||||
|
{% trans %}The list of all clubs existing at UTBM.{% endtrans %}
|
||||||
|
{%- endblock %}
|
||||||
|
|
||||||
{% macro display_club(club) -%}
|
{% macro display_club(club) -%}
|
||||||
|
|
||||||
@@ -21,7 +25,7 @@
|
|||||||
|
|
||||||
{%- if club.children.all()|length != 0 %}
|
{%- if club.children.all()|length != 0 %}
|
||||||
<ul>
|
<ul>
|
||||||
{%- for c in club.children.order_by('name') %}
|
{%- for c in club.children.order_by('name').prefetch_related("children") %}
|
||||||
{{ display_club(c) }}
|
{{ display_club(c) }}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
@@ -36,8 +40,8 @@
|
|||||||
{% if club_list %}
|
{% if club_list %}
|
||||||
<h3>{% trans %}Club list{% endtrans %}</h3>
|
<h3>{% trans %}Club list{% endtrans %}</h3>
|
||||||
<ul>
|
<ul>
|
||||||
{%- for c in club_list.all().order_by('name') if c.parent is none %}
|
{%- for club in club_list %}
|
||||||
{{ display_club(c) }}
|
{{ display_club(club) }}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@@ -171,6 +171,10 @@ class ClubListView(ListView):
|
|||||||
|
|
||||||
model = Club
|
model = Club
|
||||||
template_name = "club/club_list.jinja"
|
template_name = "club/club_list.jinja"
|
||||||
|
queryset = (
|
||||||
|
Club.objects.filter(parent=None).order_by("name").prefetch_related("children")
|
||||||
|
)
|
||||||
|
context_object_name = "club_list"
|
||||||
|
|
||||||
|
|
||||||
class ClubView(ClubTabsMixin, DetailView):
|
class ClubView(ClubTabsMixin, DetailView):
|
||||||
|
@@ -68,7 +68,7 @@ class IcsCalendar:
|
|||||||
start=news_date.start_date,
|
start=news_date.start_date,
|
||||||
end=news_date.end_date,
|
end=news_date.end_date,
|
||||||
url=as_absolute_url(
|
url=as_absolute_url(
|
||||||
reverse("com:news_detail", kwargs={"news_id": news_date.news.id})
|
reverse("com:news_detail", kwargs={"news_id": news_date.news_id})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
calendar.events.append(event)
|
calendar.events.append(event)
|
||||||
|
@@ -27,7 +27,7 @@ from django.conf import settings
|
|||||||
from django.core.exceptions import ValidationError
|
from django.core.exceptions import ValidationError
|
||||||
from django.core.mail import EmailMultiAlternatives
|
from django.core.mail import EmailMultiAlternatives
|
||||||
from django.db import models, transaction
|
from django.db import models, transaction
|
||||||
from django.db.models import F, Q
|
from django.db.models import Exists, F, OuterRef, Q
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
from django.templatetags.static import static
|
from django.templatetags.static import static
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
@@ -55,9 +55,17 @@ class Sith(models.Model):
|
|||||||
|
|
||||||
|
|
||||||
class NewsQuerySet(models.QuerySet):
|
class NewsQuerySet(models.QuerySet):
|
||||||
def moderated(self) -> Self:
|
def published(self) -> Self:
|
||||||
return self.filter(is_published=True)
|
return self.filter(is_published=True)
|
||||||
|
|
||||||
|
def waiting_moderation(self) -> Self:
|
||||||
|
"""Filter all non-finished non-published news"""
|
||||||
|
# Because of the way News and NewsDates are created,
|
||||||
|
# there may be some cases where this method is called before
|
||||||
|
# the NewsDates linked to a Date are actually persisted in db.
|
||||||
|
# Thus, it's important to filter by "not past date" rather than by "future date"
|
||||||
|
return self.filter(~Q(dates__start_date__lt=timezone.now()), is_published=False)
|
||||||
|
|
||||||
def viewable_by(self, user: User) -> Self:
|
def viewable_by(self, user: User) -> Self:
|
||||||
"""Filter news that the given user can view.
|
"""Filter news that the given user can view.
|
||||||
|
|
||||||
@@ -127,20 +135,28 @@ class News(models.Model):
|
|||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
if self.is_published:
|
if not self.is_published:
|
||||||
return
|
admins_without_notif = User.objects.filter(
|
||||||
for user in User.objects.filter(
|
~Exists(
|
||||||
groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID]
|
Notification.objects.filter(
|
||||||
):
|
user=OuterRef("pk"), type="NEWS_MODERATION"
|
||||||
Notification.objects.create(
|
|
||||||
user=user, url=reverse("com:news_admin_list"), type="NEWS_MODERATION"
|
|
||||||
)
|
)
|
||||||
|
),
|
||||||
|
groups__id=settings.SITH_GROUP_COM_ADMIN_ID,
|
||||||
|
)
|
||||||
|
notif_url = reverse("com:news_admin_list")
|
||||||
|
new_notifs = [
|
||||||
|
Notification(user=user, url=notif_url, type="NEWS_MODERATION")
|
||||||
|
for user in admins_without_notif
|
||||||
|
]
|
||||||
|
Notification.objects.bulk_create(new_notifs)
|
||||||
|
self.update_moderation_notifs()
|
||||||
|
|
||||||
def get_absolute_url(self):
|
def get_absolute_url(self):
|
||||||
return reverse("com:news_detail", kwargs={"news_id": self.id})
|
return reverse("com:news_detail", kwargs={"news_id": self.id})
|
||||||
|
|
||||||
def get_full_url(self):
|
def get_full_url(self):
|
||||||
return "https://%s%s" % (settings.SITH_URL, self.get_absolute_url())
|
return f"https://{settings.SITH_URL}{self.get_absolute_url()}"
|
||||||
|
|
||||||
def is_owned_by(self, user):
|
def is_owned_by(self, user):
|
||||||
if user.is_anonymous:
|
if user.is_anonymous:
|
||||||
@@ -159,19 +175,16 @@ class News(models.Model):
|
|||||||
or (user.is_authenticated and self.author_id == user.id)
|
or (user.is_authenticated and self.author_id == user.id)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
def news_notification_callback(notif: Notification):
|
def update_moderation_notifs():
|
||||||
# the NewsDate linked to the News
|
count = News.objects.waiting_moderation().count()
|
||||||
# which creation triggered this callback may not exist yet,
|
notifs_qs = Notification.objects.filter(
|
||||||
# so it's important to filter by "not past date" rather than by "future date"
|
type="NEWS_MODERATION", user__groups__id=settings.SITH_GROUP_COM_ADMIN_ID
|
||||||
count = News.objects.filter(
|
)
|
||||||
~Q(dates__start_date__gt=timezone.now()), is_published=False
|
|
||||||
).count()
|
|
||||||
if count:
|
if count:
|
||||||
notif.viewed = False
|
notifs_qs.update(viewed=False, param=str(count))
|
||||||
notif.param = str(count)
|
|
||||||
else:
|
else:
|
||||||
notif.viewed = True
|
notifs_qs.update(viewed=True)
|
||||||
|
|
||||||
|
|
||||||
class NewsDateQuerySet(models.QuerySet):
|
class NewsDateQuerySet(models.QuerySet):
|
||||||
|
@@ -1,10 +1,6 @@
|
|||||||
{% extends "core/base.jinja" %}
|
{% extends "core/base.jinja" %}
|
||||||
{% from "com/macros.jinja" import news_moderation_alert %}
|
{% from "com/macros.jinja" import news_moderation_alert %}
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
{% trans %}News{% endtrans %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block additional_css %}
|
{% block additional_css %}
|
||||||
<link rel="stylesheet" href="{{ static('com/css/news-list.scss') }}">
|
<link rel="stylesheet" href="{{ static('com/css/news-list.scss') }}">
|
||||||
<link rel="stylesheet" href="{{ static('com/components/ics-calendar.scss') }}">
|
<link rel="stylesheet" href="{{ static('com/components/ics-calendar.scss') }}">
|
||||||
|
@@ -1,13 +1,22 @@
|
|||||||
|
from datetime import timedelta
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.utils.timezone import now
|
||||||
from model_bakery import baker
|
from model_bakery import baker
|
||||||
|
|
||||||
from com.models import News
|
from com.models import News, NewsDate
|
||||||
|
from core.baker_recipes import subscriber_user
|
||||||
from core.models import Group, Notification, User
|
from core.models import Group, Notification, User
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_notification_created():
|
def test_notification_created():
|
||||||
|
# this news is unpublished, but is set in the past
|
||||||
|
# it shouldn't be taken into account when counting the number
|
||||||
|
# of news that are to be moderated
|
||||||
|
past_news = baker.make(News, is_published=False)
|
||||||
|
baker.make(NewsDate, news=past_news, start_date=now() - timedelta(days=1))
|
||||||
com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
|
com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
|
||||||
com_admin_group.users.all().delete()
|
com_admin_group.users.all().delete()
|
||||||
Notification.objects.all().delete()
|
Notification.objects.all().delete()
|
||||||
@@ -15,9 +24,28 @@ def test_notification_created():
|
|||||||
for i in range(2):
|
for i in range(2):
|
||||||
# news notifications are permanent, so the notification created
|
# news notifications are permanent, so the notification created
|
||||||
# during the first iteration should be reused during the second one.
|
# during the first iteration should be reused during the second one.
|
||||||
baker.make(News)
|
baker.make(News, is_published=False)
|
||||||
notifications = list(Notification.objects.all())
|
notifications = list(Notification.objects.all())
|
||||||
assert len(notifications) == 1
|
assert len(notifications) == 1
|
||||||
assert notifications[0].user == com_admin
|
assert notifications[0].user == com_admin
|
||||||
assert notifications[0].type == "NEWS_MODERATION"
|
assert notifications[0].type == "NEWS_MODERATION"
|
||||||
assert notifications[0].param == str(i + 1)
|
assert notifications[0].param == str(i + 1)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_notification_edited_when_moderating_news():
|
||||||
|
com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
|
||||||
|
com_admins = subscriber_user.make(_quantity=3)
|
||||||
|
com_admin_group.users.set(com_admins)
|
||||||
|
Notification.objects.all().delete()
|
||||||
|
news = baker.make(News, is_published=False)
|
||||||
|
assert Notification.objects.count() == 3
|
||||||
|
assert Notification.objects.filter(viewed=False).count() == 3
|
||||||
|
|
||||||
|
news.is_published = True
|
||||||
|
news.moderator = com_admins[0]
|
||||||
|
news.save()
|
||||||
|
# when the news is moderated, the notification should be marked as read
|
||||||
|
# for all admins
|
||||||
|
assert Notification.objects.count() == 3
|
||||||
|
assert Notification.objects.filter(viewed=False).count() == 0
|
||||||
|
11
core/api.py
11
core/api.py
@@ -25,6 +25,7 @@ from core.schemas import (
|
|||||||
UserFamilySchema,
|
UserFamilySchema,
|
||||||
UserFilterSchema,
|
UserFilterSchema,
|
||||||
UserProfileSchema,
|
UserProfileSchema,
|
||||||
|
UserSchema,
|
||||||
)
|
)
|
||||||
from core.templatetags.renderer import markdown
|
from core.templatetags.renderer import markdown
|
||||||
|
|
||||||
@@ -69,16 +70,22 @@ class MailingListController(ControllerBase):
|
|||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
@api_controller("/user", permissions=[CanAccessLookup])
|
@api_controller("/user")
|
||||||
class UserController(ControllerBase):
|
class UserController(ControllerBase):
|
||||||
@route.get("", response=list[UserProfileSchema])
|
@route.get("", response=list[UserProfileSchema], permissions=[CanAccessLookup])
|
||||||
def fetch_profiles(self, pks: Query[set[int]]):
|
def fetch_profiles(self, pks: Query[set[int]]):
|
||||||
return User.objects.filter(pk__in=pks)
|
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(
|
@route.get(
|
||||||
"/search",
|
"/search",
|
||||||
response=PaginatedResponseSchema[UserProfileSchema],
|
response=PaginatedResponseSchema[UserProfileSchema],
|
||||||
url_name="search_users",
|
url_name="search_users",
|
||||||
|
permissions=[CanAccessLookup],
|
||||||
)
|
)
|
||||||
@paginate(PageNumberPaginationExtra, page_size=20)
|
@paginate(PageNumberPaginationExtra, page_size=20)
|
||||||
def search_users(self, filters: Query[UserFilterSchema]):
|
def search_users(self, filters: Query[UserFilterSchema]):
|
||||||
|
@@ -94,7 +94,11 @@ class Command(BaseCommand):
|
|||||||
username=self.faker.user_name(),
|
username=self.faker.user_name(),
|
||||||
first_name=self.faker.first_name(),
|
first_name=self.faker.first_name(),
|
||||||
last_name=self.faker.last_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(),
|
email=self.faker.email(),
|
||||||
phone=self.faker.phone_number(),
|
phone=self.faker.phone_number(),
|
||||||
address=self.faker.address(),
|
address=self.faker.address(),
|
||||||
|
@@ -34,6 +34,22 @@ class SimpleUserSchema(ModelSchema):
|
|||||||
fields = ["id", "nick_name", "first_name", "last_name"]
|
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):
|
class UserProfileSchema(ModelSchema):
|
||||||
"""The necessary information to show a user profile"""
|
"""The necessary information to show a user profile"""
|
||||||
|
|
||||||
|
@@ -2,8 +2,14 @@
|
|||||||
<html lang="fr">
|
<html lang="fr">
|
||||||
<head>
|
<head>
|
||||||
{% block head %}
|
{% block head %}
|
||||||
<title>{% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM</title>
|
<title>{% block title %}Association des Étudiants de l'UTBM{% endblock %}</title>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<meta name="description" content="{% block description -%}
|
||||||
|
{% trans trimmed %}
|
||||||
|
AE UTBM is a voluntary organisation run by UTBM students.
|
||||||
|
It organises student life at UTBM and manages its student facilities.
|
||||||
|
{% endtrans %}
|
||||||
|
{%- endblock %}">
|
||||||
<link rel="shortcut icon" href="{{ static('core/img/favicon.ico') }}">
|
<link rel="shortcut icon" href="{{ static('core/img/favicon.ico') }}">
|
||||||
<link rel="stylesheet" href="{{ static('core/base.css') }}">
|
<link rel="stylesheet" href="{{ static('core/base.css') }}">
|
||||||
<link rel="stylesheet" href="{{ static('core/style.scss') }}">
|
<link rel="stylesheet" href="{{ static('core/style.scss') }}">
|
||||||
|
@@ -1,8 +1,12 @@
|
|||||||
{% extends "core/base.jinja" %}
|
{% extends "core/base.jinja" %}
|
||||||
|
|
||||||
{% block title %}
|
{% block title -%}
|
||||||
{% trans %}Eboutic{% endtrans %}
|
{% trans %}Eboutic{% endtrans %}
|
||||||
{% endblock %}
|
{%- endblock %}
|
||||||
|
|
||||||
|
{% block description -%}
|
||||||
|
{% trans %}The online shop of the association.{% endtrans %}
|
||||||
|
{%- endblock %}
|
||||||
|
|
||||||
{% block additional_js %}
|
{% block additional_js %}
|
||||||
{# This script contains the code to perform requests to manipulate the
|
{# This script contains the code to perform requests to manipulate the
|
||||||
|
@@ -2,9 +2,13 @@
|
|||||||
{% from 'core/macros.jinja' import user_profile_link %}
|
{% from 'core/macros.jinja' import user_profile_link %}
|
||||||
{% from 'forum/macros.jinja' import display_forum, display_search_bar %}
|
{% from 'forum/macros.jinja' import display_forum, display_search_bar %}
|
||||||
|
|
||||||
{% block title %}
|
{% block title -%}
|
||||||
{% trans %}Forum{% endtrans %}
|
{% trans %}Forum{% endtrans %}
|
||||||
{% endblock %}
|
{%- endblock %}
|
||||||
|
|
||||||
|
{% block description -%}
|
||||||
|
{% trans %}A forum dedicated to the UTBM students.{% endtrans %}
|
||||||
|
{%- endblock %}
|
||||||
|
|
||||||
{% block additional_css %}
|
{% block additional_css %}
|
||||||
<link rel="stylesheet" href="{{ static('forum/css/forum.scss') }}">
|
<link rel="stylesheet" href="{{ static('forum/css/forum.scss') }}">
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2025-08-23 15:30+0200\n"
|
"POT-Creation-Date: 2025-09-02 15:56+0200\n"
|
||||||
"PO-Revision-Date: 2016-07-18\n"
|
"PO-Revision-Date: 2016-07-18\n"
|
||||||
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
|
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
|
||||||
"Language-Team: AE info <ae.info@utbm.fr>\n"
|
"Language-Team: AE info <ae.info@utbm.fr>\n"
|
||||||
@@ -306,6 +306,10 @@ msgstr "Utilisateur non enregistré"
|
|||||||
msgid "Club list"
|
msgid "Club list"
|
||||||
msgstr "Liste des clubs"
|
msgstr "Liste des clubs"
|
||||||
|
|
||||||
|
#: club/templates/club/club_list.jinja
|
||||||
|
msgid "The list of all clubs existing at UTBM."
|
||||||
|
msgstr "La liste de tous les clubs existants à l'UTBM"
|
||||||
|
|
||||||
#: club/templates/club/club_list.jinja
|
#: club/templates/club/club_list.jinja
|
||||||
msgid "inactive"
|
msgid "inactive"
|
||||||
msgstr "inactif"
|
msgstr "inactif"
|
||||||
@@ -901,7 +905,7 @@ msgid "News admin"
|
|||||||
msgstr "Administration des nouvelles"
|
msgstr "Administration des nouvelles"
|
||||||
|
|
||||||
#: com/templates/com/news_admin_list.jinja com/templates/com/news_detail.jinja
|
#: com/templates/com/news_admin_list.jinja com/templates/com/news_detail.jinja
|
||||||
#: com/templates/com/news_list.jinja com/views.py
|
#: com/views.py
|
||||||
msgid "News"
|
msgid "News"
|
||||||
msgstr "Nouvelles"
|
msgstr "Nouvelles"
|
||||||
|
|
||||||
@@ -1035,7 +1039,7 @@ msgstr "Liens"
|
|||||||
msgid "Our services"
|
msgid "Our services"
|
||||||
msgstr "Nos services"
|
msgstr "Nos services"
|
||||||
|
|
||||||
#: com/templates/com/news_list.jinja pedagogy/templates/pedagogy/guide.jinja
|
#: com/templates/com/news_list.jinja
|
||||||
msgid "UV Guide"
|
msgid "UV Guide"
|
||||||
msgstr "Guide des UVs"
|
msgstr "Guide des UVs"
|
||||||
|
|
||||||
@@ -1705,8 +1709,12 @@ msgid "500, Server Error"
|
|||||||
msgstr "500, Erreur Serveur"
|
msgstr "500, Erreur Serveur"
|
||||||
|
|
||||||
#: core/templates/core/base.jinja
|
#: core/templates/core/base.jinja
|
||||||
msgid "Welcome!"
|
msgid ""
|
||||||
msgstr "Bienvenue !"
|
"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."
|
||||||
|
|
||||||
#: core/templates/core/base/footer.jinja core/templates/core/base/navbar.jinja
|
#: core/templates/core/base/footer.jinja core/templates/core/base/navbar.jinja
|
||||||
msgid "Contacts"
|
msgid "Contacts"
|
||||||
@@ -3819,6 +3827,10 @@ msgstr ""
|
|||||||
msgid "Pay with Sith account"
|
msgid "Pay with Sith account"
|
||||||
msgstr "Payer avec un compte AE"
|
msgstr "Payer avec un compte AE"
|
||||||
|
|
||||||
|
#: eboutic/templates/eboutic/eboutic_main.jinja
|
||||||
|
msgid "The online shop of the association."
|
||||||
|
msgstr "La boutique en ligne de l'association."
|
||||||
|
|
||||||
#: eboutic/templates/eboutic/eboutic_main.jinja
|
#: eboutic/templates/eboutic/eboutic_main.jinja
|
||||||
msgid "Clear"
|
msgid "Clear"
|
||||||
msgstr "Vider"
|
msgstr "Vider"
|
||||||
@@ -4148,6 +4160,10 @@ msgstr "Message supprimé ou non-visible."
|
|||||||
msgid "Order by date"
|
msgid "Order by date"
|
||||||
msgstr "Trier par date"
|
msgstr "Trier par date"
|
||||||
|
|
||||||
|
#: forum/templates/forum/main.jinja
|
||||||
|
msgid "A forum dedicated to the UTBM students."
|
||||||
|
msgstr "Un forum dédié aux étudiants de l'UTBM."
|
||||||
|
|
||||||
#: forum/templates/forum/main.jinja
|
#: forum/templates/forum/main.jinja
|
||||||
msgid "View last unread messages"
|
msgid "View last unread messages"
|
||||||
msgstr "Voir les derniers messages non lus"
|
msgstr "Voir les derniers messages non lus"
|
||||||
@@ -4374,6 +4390,14 @@ msgstr "signaler"
|
|||||||
msgid "reporter"
|
msgid "reporter"
|
||||||
msgstr "signalant"
|
msgstr "signalant"
|
||||||
|
|
||||||
|
#: pedagogy/templates/pedagogy/guide.jinja
|
||||||
|
msgid "UE Guide"
|
||||||
|
msgstr "Guide des UEs"
|
||||||
|
|
||||||
|
#: pedagogy/templates/pedagogy/guide.jinja
|
||||||
|
msgid "A guide of courses available at UTBM."
|
||||||
|
msgstr "Un guide de tous les cours disponibles à l'UTBM."
|
||||||
|
|
||||||
#: pedagogy/templates/pedagogy/guide.jinja
|
#: pedagogy/templates/pedagogy/guide.jinja
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(display_name)s"
|
msgid "%(display_name)s"
|
||||||
@@ -4666,6 +4690,11 @@ msgstr "Demande de retrait d'image"
|
|||||||
msgid "Request removal"
|
msgid "Request removal"
|
||||||
msgstr "Demander le retrait"
|
msgstr "Demander le retrait"
|
||||||
|
|
||||||
|
#: sas/templates/sas/main.jinja
|
||||||
|
msgid "See all the photos taken during events organised by the AE."
|
||||||
|
msgstr ""
|
||||||
|
"Retrouvez toutes les photos prises lors des événements organisés par l'AE."
|
||||||
|
|
||||||
#: sas/templates/sas/main.jinja
|
#: sas/templates/sas/main.jinja
|
||||||
msgid "You must be logged in to see the SAS."
|
msgid "You must be logged in to see the SAS."
|
||||||
msgstr "Vous devez être connecté pour voir les photos."
|
msgstr "Vous devez être connecté pour voir les photos."
|
||||||
@@ -5106,6 +5135,10 @@ msgstr "Tee-shirt AE"
|
|||||||
msgid "A user with that email address already exists"
|
msgid "A user with that email address already exists"
|
||||||
msgstr "Un utilisateur avec cette adresse email existe déjà"
|
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
|
#: subscription/models.py
|
||||||
msgid "Bad subscription type"
|
msgid "Bad subscription type"
|
||||||
msgstr "Mauvais type de cotisation"
|
msgstr "Mauvais type de cotisation"
|
||||||
@@ -5145,7 +5178,7 @@ msgid ""
|
|||||||
"%(user)s received its new %(type)s subscription. It will be active until "
|
"%(user)s received its new %(type)s subscription. It will be active until "
|
||||||
"%(end)s included."
|
"%(end)s included."
|
||||||
msgstr ""
|
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."
|
"%(end)s inclu."
|
||||||
|
|
||||||
#: subscription/templates/subscription/fragments/creation_success.jinja
|
#: subscription/templates/subscription/fragments/creation_success.jinja
|
||||||
|
@@ -2,9 +2,13 @@
|
|||||||
{% from 'core/macros.jinja' import paginate_alpine %}
|
{% from 'core/macros.jinja' import paginate_alpine %}
|
||||||
|
|
||||||
{% block title %}
|
{% block title %}
|
||||||
{% trans %}UV Guide{% endtrans %}
|
{% trans %}UE Guide{% endtrans %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block description -%}
|
||||||
|
{% trans %}A guide of courses available at UTBM.{% endtrans %}
|
||||||
|
{%- endblock %}
|
||||||
|
|
||||||
{% block additional_css %}
|
{% block additional_css %}
|
||||||
<link rel="stylesheet" href="{{ static('pedagogy/css/pedagogy.scss') }}">
|
<link rel="stylesheet" href="{{ static('pedagogy/css/pedagogy.scss') }}">
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@@ -8,6 +8,10 @@
|
|||||||
{% trans %}SAS{% endtrans %}
|
{% trans %}SAS{% endtrans %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block description -%}
|
||||||
|
{% trans %}See all the photos taken during events organised by the AE.{% endtrans %}
|
||||||
|
{%- endblock %}
|
||||||
|
|
||||||
{% set is_sas_admin = user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
|
{% set is_sas_admin = user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
|
||||||
|
|
||||||
{% from "sas/macros.jinja" import display_album %}
|
{% from "sas/macros.jinja" import display_album %}
|
||||||
|
@@ -99,9 +99,10 @@ INSTALLED_APPS = (
|
|||||||
"django.contrib.auth",
|
"django.contrib.auth",
|
||||||
"django.contrib.contenttypes",
|
"django.contrib.contenttypes",
|
||||||
"django.contrib.sessions",
|
"django.contrib.sessions",
|
||||||
|
"django.contrib.sitemaps",
|
||||||
|
"django.contrib.sites",
|
||||||
"django.contrib.messages",
|
"django.contrib.messages",
|
||||||
"staticfiles",
|
"staticfiles",
|
||||||
"django.contrib.sites",
|
|
||||||
"honeypot",
|
"honeypot",
|
||||||
"django_jinja",
|
"django_jinja",
|
||||||
"ninja_extra",
|
"ninja_extra",
|
||||||
@@ -686,8 +687,10 @@ SITH_NOTIFICATIONS = [
|
|||||||
# The keys are the notification names as found in SITH_NOTIFICATIONS, and the
|
# The keys are the notification names as found in SITH_NOTIFICATIONS, and the
|
||||||
# values are the callback function to update the notifs.
|
# values are the callback function to update the notifs.
|
||||||
# The callback must take the notif object as first and single argument.
|
# The callback must take the notif object as first and single argument.
|
||||||
|
# If a notification is permanent but requires no post-action, set the
|
||||||
|
# callback import string as None
|
||||||
SITH_PERMANENT_NOTIFICATIONS = {
|
SITH_PERMANENT_NOTIFICATIONS = {
|
||||||
"NEWS_MODERATION": "com.models.news_notification_callback",
|
"NEWS_MODERATION": None,
|
||||||
"SAS_MODERATION": "sas.models.sas_notification_callback",
|
"SAS_MODERATION": "sas.models.sas_notification_callback",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
46
sith/sitemap.py
Normal file
46
sith/sitemap.py
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
from django.conf import settings
|
||||||
|
from django.contrib.sitemaps import Sitemap
|
||||||
|
from django.db.models import OuterRef, Subquery
|
||||||
|
from django.urls import reverse
|
||||||
|
|
||||||
|
from club.models import Club
|
||||||
|
from core.models import Page, PageRev
|
||||||
|
|
||||||
|
|
||||||
|
class SithSitemap(Sitemap):
|
||||||
|
def items(self):
|
||||||
|
return [
|
||||||
|
"core:index",
|
||||||
|
"eboutic:main",
|
||||||
|
"sas:main",
|
||||||
|
"forum:main",
|
||||||
|
"club:club_list",
|
||||||
|
"election:list",
|
||||||
|
]
|
||||||
|
|
||||||
|
def location(self, item):
|
||||||
|
return reverse(item)
|
||||||
|
|
||||||
|
|
||||||
|
class PagesSitemap(Sitemap):
|
||||||
|
def items(self):
|
||||||
|
return (
|
||||||
|
Page.objects.filter(view_groups=settings.SITH_GROUP_PUBLIC_ID)
|
||||||
|
.exclude(revisions=None, _full_name__startswith="club")
|
||||||
|
.annotate(
|
||||||
|
lastmod=Subquery(
|
||||||
|
PageRev.objects.filter(page=OuterRef("pk"))
|
||||||
|
.values("date")
|
||||||
|
.order_by("-date")[:1]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
|
||||||
|
def lastmod(self, item: Page):
|
||||||
|
return item.lastmod
|
||||||
|
|
||||||
|
|
||||||
|
class ClubSitemap(Sitemap):
|
||||||
|
def items(self):
|
||||||
|
return Club.objects.filter(is_active=True)
|
@@ -15,20 +15,24 @@
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.conf.urls.static import static
|
from django.conf.urls.static import static
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
from django.contrib.sitemaps.views import sitemap
|
||||||
from django.http import Http404
|
from django.http import Http404
|
||||||
from django.urls import include, path
|
from django.urls import include, path
|
||||||
|
from django.views.decorators.cache import cache_page
|
||||||
from django.views.i18n import JavaScriptCatalog
|
from django.views.i18n import JavaScriptCatalog
|
||||||
|
|
||||||
from api.urls import api
|
from api.urls import api
|
||||||
|
from sith.sitemap import ClubSitemap, PagesSitemap, SithSitemap
|
||||||
|
|
||||||
js_info_dict = {"packages": ("sith",)}
|
js_info_dict = {"packages": ("sith",)}
|
||||||
|
|
||||||
handler403 = "core.views.forbidden"
|
handler403 = "core.views.forbidden"
|
||||||
handler404 = "core.views.not_found"
|
handler404 = "core.views.not_found"
|
||||||
handler500 = "core.views.internal_servor_error"
|
handler500 = "core.views.internal_servor_error"
|
||||||
|
sitemaps = {"sith": SithSitemap, "pages": PagesSitemap, "clubs": ClubSitemap}
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("", include(("core.urls", "core"), namespace="core")),
|
path("", include(("core.urls", "core"), namespace="core")),
|
||||||
|
path("sitemap.xml", cache_page(86400)(sitemap), {"sitemaps": sitemaps}),
|
||||||
path("api/", api.urls),
|
path("api/", api.urls),
|
||||||
path("rootplace/", include(("rootplace.urls", "rootplace"), namespace="rootplace")),
|
path("rootplace/", include(("rootplace.urls", "rootplace"), namespace="rootplace")),
|
||||||
path(
|
path(
|
||||||
|
@@ -23,8 +23,8 @@ class SelectionDateForm(forms.Form):
|
|||||||
|
|
||||||
|
|
||||||
class SubscriptionForm(forms.ModelForm):
|
class SubscriptionForm(forms.ModelForm):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, initial=None, **kwargs):
|
||||||
initial = kwargs.pop("initial", {})
|
initial = initial or {}
|
||||||
if "subscription_type" not in initial:
|
if "subscription_type" not in initial:
|
||||||
initial["subscription_type"] = "deux-semestres"
|
initial["subscription_type"] = "deux-semestres"
|
||||||
if "payment_method" not in initial:
|
if "payment_method" not in initial:
|
||||||
@@ -131,8 +131,57 @@ class SubscriptionExistingUserForm(SubscriptionForm):
|
|||||||
"""Form to add a subscription to an existing user."""
|
"""Form to add a subscription to an existing user."""
|
||||||
|
|
||||||
template_name = "subscription/forms/create_existing_user.html"
|
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:
|
class Meta:
|
||||||
model = Subscription
|
model = Subscription
|
||||||
fields = ["member", "subscription_type", "payment_method", "location"]
|
fields = ["member", "subscription_type", "payment_method", "location"]
|
||||||
widgets = {"member": AutoCompleteSelectUser}
|
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)
|
||||||
|
@@ -1,3 +1,5 @@
|
|||||||
|
import { userFetchUser } from "#openapi";
|
||||||
|
|
||||||
document.addEventListener("alpine:init", () => {
|
document.addEventListener("alpine:init", () => {
|
||||||
Alpine.data("existing_user_subscription_form", () => ({
|
Alpine.data("existing_user_subscription_form", () => ({
|
||||||
loading: false,
|
loading: false,
|
||||||
@@ -12,13 +14,24 @@ document.addEventListener("alpine:init", () => {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async loadProfile(userId: number) {
|
async loadProfile(userId: number) {
|
||||||
|
const birthdayInput = document.getElementById("id_birthdate") as HTMLInputElement;
|
||||||
if (!Number.isInteger(userId)) {
|
if (!Number.isInteger(userId)) {
|
||||||
this.profileFragment = "";
|
this.profileFragment = "";
|
||||||
|
birthdayInput.hidden = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
const response = await fetch(`/user/${userId}/mini/`);
|
const [miniProfile, userInfos] = await Promise.all([
|
||||||
this.profileFragment = await response.text();
|
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;
|
this.loading = false;
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
|
@@ -1,4 +1,14 @@
|
|||||||
#subscription-form form {
|
#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 {
|
.form-content.existing-user {
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -13,6 +23,11 @@
|
|||||||
* then display the user profile right in the middle of the remaining space. */
|
* then display the user profile right in the middle of the remaining space. */
|
||||||
fieldset {
|
fieldset {
|
||||||
flex: 0 1 auto;
|
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 {
|
#subscription-form-user-mini-profile {
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
"""Tests focused on testing subscription creation"""
|
"""Tests focused on testing subscription creation"""
|
||||||
|
|
||||||
from datetime import timedelta
|
from datetime import date, timedelta
|
||||||
from typing import Callable
|
from typing import Callable
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
@@ -31,6 +31,26 @@ def test_form_existing_user_valid(
|
|||||||
):
|
):
|
||||||
"""Test `SubscriptionExistingUserForm`"""
|
"""Test `SubscriptionExistingUserForm`"""
|
||||||
user = user_factory()
|
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 = {
|
data = {
|
||||||
"member": user,
|
"member": user,
|
||||||
"subscription_type": "deux-semestres",
|
"subscription_type": "deux-semestres",
|
||||||
@@ -38,11 +58,15 @@ def test_form_existing_user_valid(
|
|||||||
"payment_method": settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0],
|
"payment_method": settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0],
|
||||||
}
|
}
|
||||||
form = SubscriptionExistingUserForm(data)
|
form = SubscriptionExistingUserForm(data)
|
||||||
|
assert not form.is_valid()
|
||||||
|
|
||||||
|
data |= {"birthdate": date(year=1967, month=3, day=14)}
|
||||||
|
form = SubscriptionExistingUserForm(data)
|
||||||
assert form.is_valid()
|
assert form.is_valid()
|
||||||
form.save()
|
form.save()
|
||||||
user.refresh_from_db()
|
user.refresh_from_db()
|
||||||
assert user.is_subscribed
|
assert user.is_subscribed
|
||||||
|
assert user.date_of_birth == date(year=1967, month=3, day=14)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
@@ -132,6 +156,14 @@ def test_page_access(
|
|||||||
assert res.status_code == status_code
|
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
|
@pytest.mark.django_db
|
||||||
def test_submit_form_existing_user(client: Client, settings: SettingsWrapper):
|
def test_submit_form_existing_user(client: Client, settings: SettingsWrapper):
|
||||||
client.force_login(
|
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_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(
|
response = client.post(
|
||||||
reverse("subscription:fragment-existing-user"),
|
reverse("subscription:fragment-existing-user"),
|
||||||
{
|
{
|
||||||
"member": user.id,
|
"member": user.id,
|
||||||
|
"birthdate": user.date_of_birth,
|
||||||
"subscription_type": "deux-semestres",
|
"subscription_type": "deux-semestres",
|
||||||
"location": settings.SITH_SUBSCRIPTION_LOCATIONS[0][0],
|
"location": settings.SITH_SUBSCRIPTION_LOCATIONS[0][0],
|
||||||
"payment_method": settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0],
|
"payment_method": settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0],
|
||||||
|
Reference in New Issue
Block a user