mirror of
https://github.com/ae-utbm/sith.git
synced 2026-10-05 18:34:15 +00:00
Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f4a70e006e | ||
|
|
2d91526708 | ||
|
|
d54e32321e | ||
|
|
4bbe049dcc | ||
|
|
6114184daa | ||
|
|
3f3add0482 | ||
|
|
e2a417bdac | ||
|
|
e973b013c6 | ||
|
|
b86ad5e936 | ||
|
|
c1084f1ac0 | ||
|
|
2c23e00c94 | ||
|
|
b6f25bf895 | ||
|
|
28551f87d2 |
No files matched your search
@@ -1,7 +1,7 @@
|
|||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
# Ruff version.
|
# Ruff version.
|
||||||
rev: v0.16.0
|
rev: v0.15.13
|
||||||
hooks:
|
hooks:
|
||||||
- id: ruff-check # just check the code, and print the errors
|
- id: ruff-check # just check the code, and print the errors
|
||||||
- id: ruff-check # actually fix the fixable errors, but print nothing
|
- id: ruff-check # actually fix the fixable errors, but print nothing
|
||||||
@@ -12,7 +12,7 @@ repos:
|
|||||||
rev: v0.6.1
|
rev: v0.6.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: biome-check
|
- id: biome-check
|
||||||
additional_dependencies: ["@biomejs/biome@2.5.1"]
|
additional_dependencies: ["@biomejs/biome@2.4.6"]
|
||||||
- repo: https://github.com/rtts/djhtml
|
- repo: https://github.com/rtts/djhtml
|
||||||
rev: 3.0.11
|
rev: 3.0.11
|
||||||
hooks:
|
hooks:
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
3.14
|
3.12
|
||||||
+2
-15
@@ -1,15 +1,11 @@
|
|||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
from django.contrib import admin, messages
|
from django.contrib import admin, messages
|
||||||
|
from django.db.models import QuerySet
|
||||||
|
from django.http import HttpRequest
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from api.hashers import generate_key
|
from api.hashers import generate_key
|
||||||
from api.models import ApiClient, ApiKey
|
from api.models import ApiClient, ApiKey
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.db.models import QuerySet
|
|
||||||
from django.http import HttpRequest
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(ApiClient)
|
@admin.register(ApiClient)
|
||||||
class ApiClientAdmin(admin.ModelAdmin):
|
class ApiClientAdmin(admin.ModelAdmin):
|
||||||
@@ -21,15 +17,6 @@ class ApiClientAdmin(admin.ModelAdmin):
|
|||||||
"owner__nick_name",
|
"owner__nick_name",
|
||||||
)
|
)
|
||||||
autocomplete_fields = ("owner", "groups", "client_permissions")
|
autocomplete_fields = ("owner", "groups", "client_permissions")
|
||||||
readonly_fields = ("hmac_key",)
|
|
||||||
actions = ("reset_hmac_key",)
|
|
||||||
|
|
||||||
@admin.action(permissions=["change"], description=_("Reset HMAC key"))
|
|
||||||
def reset_hmac_key(self, _request: HttpRequest, queryset: QuerySet[ApiClient]):
|
|
||||||
objs = list(queryset)
|
|
||||||
for obj in objs:
|
|
||||||
obj.reset_hmac(commit=False)
|
|
||||||
ApiClient.objects.bulk_update(objs, fields=["hmac_key"])
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(ApiKey)
|
@admin.register(ApiKey)
|
||||||
|
|||||||
-16
@@ -1,16 +0,0 @@
|
|||||||
from ninja_extra import ControllerBase, api_controller, route
|
|
||||||
|
|
||||||
from api.auth import ApiKeyAuth
|
|
||||||
from api.schemas import ApiClientSchema
|
|
||||||
|
|
||||||
|
|
||||||
@api_controller("/client")
|
|
||||||
class ApiClientController(ControllerBase):
|
|
||||||
@route.get(
|
|
||||||
"/me",
|
|
||||||
auth=[ApiKeyAuth()],
|
|
||||||
response=ApiClientSchema,
|
|
||||||
url_name="api-client-infos",
|
|
||||||
)
|
|
||||||
def get_client_info(self):
|
|
||||||
return self.context.request.auth
|
|
||||||
+1
-5
@@ -1,13 +1,9 @@
|
|||||||
from typing import TYPE_CHECKING
|
from django.http import HttpRequest
|
||||||
|
|
||||||
from ninja.security import APIKeyHeader
|
from ninja.security import APIKeyHeader
|
||||||
|
|
||||||
from api.hashers import get_hasher
|
from api.hashers import get_hasher
|
||||||
from api.models import ApiClient, ApiKey
|
from api.models import ApiClient, ApiKey
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.http import HttpRequest
|
|
||||||
|
|
||||||
|
|
||||||
class ApiKeyAuth(APIKeyHeader):
|
class ApiKeyAuth(APIKeyHeader):
|
||||||
"""Authentication through client api keys."""
|
"""Authentication through client api keys."""
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
from django import forms
|
|
||||||
from django.forms import HiddenInput
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
|
||||||
|
|
||||||
|
|
||||||
class ThirdPartyAuthForm(forms.Form):
|
|
||||||
"""Form to complete to authenticate on the sith from a third-party app.
|
|
||||||
|
|
||||||
For the form to be valid, the user approve the EULA (french: CGU)
|
|
||||||
and give its username from the third-party app.
|
|
||||||
"""
|
|
||||||
|
|
||||||
cgu_accepted = forms.BooleanField(
|
|
||||||
required=True,
|
|
||||||
label=_("I have read and I accept the terms and conditions of use"),
|
|
||||||
error_messages={
|
|
||||||
"required": _("You must approve the terms and conditions of use.")
|
|
||||||
},
|
|
||||||
)
|
|
||||||
is_username_valid = forms.BooleanField(
|
|
||||||
required=True,
|
|
||||||
error_messages={"required": _("You must confirm that this is your username.")},
|
|
||||||
)
|
|
||||||
client_id = forms.IntegerField(widget=HiddenInput())
|
|
||||||
third_party_app = forms.CharField(widget=HiddenInput())
|
|
||||||
privacy_link = forms.URLField(widget=HiddenInput())
|
|
||||||
username = forms.CharField(widget=HiddenInput())
|
|
||||||
callback_url = forms.URLField(widget=HiddenInput())
|
|
||||||
signature = forms.CharField(widget=HiddenInput())
|
|
||||||
|
|
||||||
def __init__(self, *args, label_suffix: str = "", initial, **kwargs):
|
|
||||||
super().__init__(*args, label_suffix=label_suffix, initial=initial, **kwargs)
|
|
||||||
self.fields["is_username_valid"].label = _(
|
|
||||||
"I confirm that %(username)s is my username on %(app)s"
|
|
||||||
) % {"username": initial.get("username"), "app": initial.get("third_party_app")}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
# Generated by Django 5.2.3 on 2025-10-26 10:15
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
import api.models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [("api", "0001_initial")]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name="apiclient",
|
|
||||||
name="hmac_key",
|
|
||||||
field=models.CharField(
|
|
||||||
default=api.models.get_hmac_key, max_length=128, verbose_name="HMAC Key"
|
|
||||||
),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
+22
-33
@@ -1,20 +1,13 @@
|
|||||||
import secrets
|
|
||||||
from typing import Iterable
|
from typing import Iterable
|
||||||
|
|
||||||
from django.contrib.auth.models import Permission
|
from django.contrib.auth.models import Permission
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models import Q
|
|
||||||
from django.utils.functional import cached_property
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from django.utils.translation import pgettext_lazy
|
from django.utils.translation import pgettext_lazy
|
||||||
|
|
||||||
from core.models import Group, User
|
from core.models import Group, User
|
||||||
|
|
||||||
|
|
||||||
def get_hmac_key():
|
|
||||||
return secrets.token_hex(64)
|
|
||||||
|
|
||||||
|
|
||||||
class ApiClient(models.Model):
|
class ApiClient(models.Model):
|
||||||
name = models.CharField(_("name"), max_length=64)
|
name = models.CharField(_("name"), max_length=64)
|
||||||
owner = models.ForeignKey(
|
owner = models.ForeignKey(
|
||||||
@@ -33,10 +26,11 @@ class ApiClient(models.Model):
|
|||||||
help_text=_("Specific permissions for this api client."),
|
help_text=_("Specific permissions for this api client."),
|
||||||
related_name="clients",
|
related_name="clients",
|
||||||
)
|
)
|
||||||
hmac_key = models.CharField(_("HMAC Key"), max_length=128, default=get_hmac_key)
|
|
||||||
created_at = models.DateTimeField(auto_now_add=True)
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
updated_at = models.DateTimeField(auto_now=True)
|
updated_at = models.DateTimeField(auto_now=True)
|
||||||
|
|
||||||
|
_perm_cache: set[str] | None = None
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _("api client")
|
verbose_name = _("api client")
|
||||||
verbose_name_plural = _("api clients")
|
verbose_name_plural = _("api clients")
|
||||||
@@ -44,38 +38,33 @@ class ApiClient(models.Model):
|
|||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
@cached_property
|
|
||||||
def all_permissions(self) -> set[str]:
|
|
||||||
permissions = (
|
|
||||||
Permission.objects.filter(
|
|
||||||
Q(group__group__in=self.groups.all()) | Q(clients=self)
|
|
||||||
)
|
|
||||||
.values_list("content_type__app_label", "codename")
|
|
||||||
.order_by()
|
|
||||||
)
|
|
||||||
return {f"{content_type}.{name}" for content_type, name in permissions}
|
|
||||||
|
|
||||||
def has_perm(self, perm: str):
|
def has_perm(self, perm: str):
|
||||||
"""Return True if the client has the specified permission."""
|
"""Return True if the client has the specified permission."""
|
||||||
return perm in self.all_permissions
|
|
||||||
|
|
||||||
def has_perms(self, perm_list: Iterable[str]) -> bool:
|
if self._perm_cache is None:
|
||||||
"""Return True if the client has each of the specified permissions."""
|
group_permissions = (
|
||||||
|
Permission.objects.filter(group__group__in=self.groups.all())
|
||||||
|
.values_list("content_type__app_label", "codename")
|
||||||
|
.order_by()
|
||||||
|
)
|
||||||
|
client_permissions = self.client_permissions.values_list(
|
||||||
|
"content_type__app_label", "codename"
|
||||||
|
).order_by()
|
||||||
|
self._perm_cache = {
|
||||||
|
f"{content_type}.{name}"
|
||||||
|
for content_type, name in (*group_permissions, *client_permissions)
|
||||||
|
}
|
||||||
|
return perm in self._perm_cache
|
||||||
|
|
||||||
|
def has_perms(self, perm_list):
|
||||||
|
"""
|
||||||
|
Return True if the client has each of the specified permissions. If
|
||||||
|
object is passed, check if the client has all required perms for it.
|
||||||
|
"""
|
||||||
if not isinstance(perm_list, Iterable) or isinstance(perm_list, str):
|
if not isinstance(perm_list, Iterable) or isinstance(perm_list, str):
|
||||||
raise ValueError("perm_list must be an iterable of permissions.")
|
raise ValueError("perm_list must be an iterable of permissions.")
|
||||||
return all(self.has_perm(perm) for perm in perm_list)
|
return all(self.has_perm(perm) for perm in perm_list)
|
||||||
|
|
||||||
def reset_hmac(self, *, commit: bool = True) -> str:
|
|
||||||
"""Reset and return the HMAC key for this client.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
commit: if True (the default), persist the new hmac in db.
|
|
||||||
"""
|
|
||||||
self.hmac_key = get_hmac_key()
|
|
||||||
if commit:
|
|
||||||
self.save()
|
|
||||||
return self.hmac_key
|
|
||||||
|
|
||||||
|
|
||||||
class ApiKey(models.Model):
|
class ApiKey(models.Model):
|
||||||
PREFIX_LENGTH = 5
|
PREFIX_LENGTH = 5
|
||||||
|
|||||||
+11
-8
@@ -39,16 +39,14 @@ Example:
|
|||||||
|
|
||||||
import operator
|
import operator
|
||||||
from functools import reduce
|
from functools import reduce
|
||||||
from typing import TYPE_CHECKING, Any, Callable
|
from typing import Any, Callable
|
||||||
|
|
||||||
|
from django.contrib.auth.models import Permission
|
||||||
|
from django.http import HttpRequest
|
||||||
|
from ninja_extra import ControllerBase
|
||||||
from ninja_extra.permissions import BasePermission
|
from ninja_extra.permissions import BasePermission
|
||||||
|
|
||||||
from counter.utils import is_logged_in_counter
|
from counter.models import Counter
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.contrib.auth.models import Permission
|
|
||||||
from django.http import HttpRequest
|
|
||||||
from ninja_extra import ControllerBase
|
|
||||||
|
|
||||||
|
|
||||||
class IsInGroup(BasePermission):
|
class IsInGroup(BasePermission):
|
||||||
@@ -188,7 +186,12 @@ class IsLoggedInCounter(BasePermission):
|
|||||||
"""Check that a user is logged in a counter."""
|
"""Check that a user is logged in a counter."""
|
||||||
|
|
||||||
def has_permission(self, request: HttpRequest, controller: ControllerBase) -> bool:
|
def has_permission(self, request: HttpRequest, controller: ControllerBase) -> bool:
|
||||||
return is_logged_in_counter(request)
|
if "/counter/" not in request.META.get("HTTP_REFERER", ""):
|
||||||
|
return False
|
||||||
|
token = request.session.get("counter_token")
|
||||||
|
if not token:
|
||||||
|
return False
|
||||||
|
return Counter.objects.filter(token=token).exists()
|
||||||
|
|
||||||
|
|
||||||
CanAccessLookup = IsLoggedInCounter | HasPerm("core.access_lookup")
|
CanAccessLookup = IsLoggedInCounter | HasPerm("core.access_lookup")
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
from ninja import ModelSchema, Schema
|
|
||||||
from pydantic import Field, HttpUrl
|
|
||||||
|
|
||||||
from api.models import ApiClient
|
|
||||||
from core.schemas import SimpleUserSchema
|
|
||||||
|
|
||||||
|
|
||||||
class ApiClientSchema(ModelSchema):
|
|
||||||
class Meta:
|
|
||||||
model = ApiClient
|
|
||||||
fields = ["id", "name"]
|
|
||||||
|
|
||||||
owner: SimpleUserSchema
|
|
||||||
permissions: list[str] = Field(alias="all_permissions")
|
|
||||||
|
|
||||||
|
|
||||||
class ThirdPartyAuthParamsSchema(Schema):
|
|
||||||
client_id: int
|
|
||||||
third_party_app: str
|
|
||||||
privacy_link: HttpUrl
|
|
||||||
username: str
|
|
||||||
callback_url: HttpUrl
|
|
||||||
signature: str
|
|
||||||
-32
@@ -1,32 +0,0 @@
|
|||||||
{% extends "core/base.jinja" %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<form method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
<h3>{% trans %}Confidentiality{% endtrans %}</h3>
|
|
||||||
<p>
|
|
||||||
{% trans trimmed app=third_party_app %}
|
|
||||||
By ticking this box and clicking on the send button, you
|
|
||||||
acknowledge and agree to provide {{ app }} with your
|
|
||||||
first name, last name, nickname and any other information
|
|
||||||
that was the third party app was explicitly authorized to fetch
|
|
||||||
and that it must have acknowledged to you, in a complete and accurate manner.
|
|
||||||
{% endtrans %}
|
|
||||||
</p>
|
|
||||||
<p class="margin-bottom">
|
|
||||||
{% trans trimmed app=third_party_app, privacy_link=third_party_cgu, sith_cgu_link=sith_cgu %}
|
|
||||||
The privacy policies of <a href="{{ privacy_link }}">{{ app }}</a>
|
|
||||||
and of <a href="{{ sith_cgu_link }}">the Students' Association</a>
|
|
||||||
applies as soon as the form is submitted.
|
|
||||||
{% endtrans %}
|
|
||||||
</p>
|
|
||||||
<div class="row">{{ form.cgu_accepted }} {{ form.cgu_accepted.label_tag() }}</div>
|
|
||||||
<br>
|
|
||||||
<h3 class="margin-bottom">{% trans %}Confirmation of identity{% endtrans %}</h3>
|
|
||||||
<div class="row margin-bottom">
|
|
||||||
{{ form.is_username_valid }} {{ form.is_username_valid.label_tag() }}
|
|
||||||
</div>
|
|
||||||
{% for field in form.hidden_fields() %}{{ field }}{% endfor %}
|
|
||||||
<input type="submit" class="btn btn-blue">
|
|
||||||
</form>
|
|
||||||
{% endblock %}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
import pytest
|
|
||||||
from django.contrib.admin import AdminSite
|
|
||||||
from django.http import HttpRequest
|
|
||||||
from model_bakery import baker
|
|
||||||
from pytest_django.asserts import assertNumQueries
|
|
||||||
|
|
||||||
from api.admin import ApiClientAdmin
|
|
||||||
from api.models import ApiClient
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
|
||||||
def test_reset_hmac_action():
|
|
||||||
client_admin = ApiClientAdmin(ApiClient, AdminSite())
|
|
||||||
api_clients = baker.make(ApiClient, _quantity=4, _bulk_create=True)
|
|
||||||
old_hmac_keys = [c.hmac_key for c in api_clients]
|
|
||||||
with assertNumQueries(2):
|
|
||||||
qs = ApiClient.objects.filter(id__in=[c.id for c in api_clients[2:4]])
|
|
||||||
client_admin.reset_hmac_key(HttpRequest(), qs)
|
|
||||||
for c in api_clients:
|
|
||||||
c.refresh_from_db()
|
|
||||||
assert api_clients[0].hmac_key == old_hmac_keys[0]
|
|
||||||
assert api_clients[1].hmac_key == old_hmac_keys[1]
|
|
||||||
assert api_clients[2].hmac_key != old_hmac_keys[2]
|
|
||||||
assert api_clients[3].hmac_key != old_hmac_keys[3]
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
from django.urls import reverse
|
|
||||||
from model_bakery import baker
|
|
||||||
|
|
||||||
from api.hashers import generate_key
|
|
||||||
from api.models import ApiClient, ApiKey
|
|
||||||
from api.schemas import ApiClientSchema
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.test import Client
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
|
||||||
def test_api_client_controller(client: Client):
|
|
||||||
key, hashed = generate_key()
|
|
||||||
api_client = baker.make(ApiClient)
|
|
||||||
baker.make(ApiKey, client=api_client, hashed_key=hashed)
|
|
||||||
res = client.get(reverse("api:api-client-infos"), headers={"X-APIKey": key})
|
|
||||||
assert res.status_code == 200
|
|
||||||
assert res.json() == ApiClientSchema.from_orm(api_client).model_dump()
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
import pytest
|
|
||||||
from django.contrib.auth.models import Permission
|
|
||||||
from django.test import TestCase
|
|
||||||
from model_bakery import baker
|
|
||||||
|
|
||||||
from api.models import ApiClient
|
|
||||||
from core.models import Group
|
|
||||||
|
|
||||||
|
|
||||||
class TestClientPermissions(TestCase):
|
|
||||||
@classmethod
|
|
||||||
def setUpTestData(cls):
|
|
||||||
cls.api_client = baker.make(ApiClient)
|
|
||||||
cls.perms = baker.make(Permission, _quantity=10, _bulk_create=True)
|
|
||||||
cls.api_client.groups.set(
|
|
||||||
[
|
|
||||||
baker.make(Group, permissions=cls.perms[0:3]),
|
|
||||||
baker.make(Group, permissions=cls.perms[3:5]),
|
|
||||||
]
|
|
||||||
)
|
|
||||||
cls.api_client.client_permissions.set(
|
|
||||||
[cls.perms[3], cls.perms[5], cls.perms[6], cls.perms[7]]
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_all_permissions(self):
|
|
||||||
assert self.api_client.all_permissions == {
|
|
||||||
f"{p.content_type.app_label}.{p.codename}" for p in self.perms[0:8]
|
|
||||||
}
|
|
||||||
|
|
||||||
def test_has_perm(self):
|
|
||||||
assert self.api_client.has_perm(
|
|
||||||
f"{self.perms[1].content_type.app_label}.{self.perms[1].codename}"
|
|
||||||
)
|
|
||||||
assert not self.api_client.has_perm(
|
|
||||||
f"{self.perms[9].content_type.app_label}.{self.perms[9].codename}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_has_perms(self):
|
|
||||||
assert self.api_client.has_perms(
|
|
||||||
[
|
|
||||||
f"{self.perms[1].content_type.app_label}.{self.perms[1].codename}",
|
|
||||||
f"{self.perms[2].content_type.app_label}.{self.perms[2].codename}",
|
|
||||||
]
|
|
||||||
)
|
|
||||||
assert not self.api_client.has_perms(
|
|
||||||
[
|
|
||||||
f"{self.perms[1].content_type.app_label}.{self.perms[1].codename}",
|
|
||||||
f"{self.perms[9].content_type.app_label}.{self.perms[9].codename}",
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
|
||||||
def test_reset_hmac_key():
|
|
||||||
client = baker.make(ApiClient)
|
|
||||||
original_key = client.hmac_key
|
|
||||||
client.reset_hmac(commit=True)
|
|
||||||
assert len(client.hmac_key) == len(original_key)
|
|
||||||
assert client.hmac_key != original_key
|
|
||||||
@@ -1,140 +0,0 @@
|
|||||||
from unittest import mock
|
|
||||||
from unittest.mock import Mock
|
|
||||||
|
|
||||||
from django.contrib.messages import Message, get_messages
|
|
||||||
from django.db.models import Max
|
|
||||||
from django.test import TestCase
|
|
||||||
from django.urls import reverse
|
|
||||||
from model_bakery import baker
|
|
||||||
from pytest_django.asserts import assertRedirects
|
|
||||||
|
|
||||||
from api.models import ApiClient, get_hmac_key
|
|
||||||
from core.baker_recipes import subscriber_user
|
|
||||||
from core.schemas import UserProfileSchema
|
|
||||||
from core.utils import hmac_hexdigest
|
|
||||||
|
|
||||||
|
|
||||||
def mocked_post(*, ok: bool):
|
|
||||||
class MockedResponse(Mock):
|
|
||||||
@property
|
|
||||||
def ok(self):
|
|
||||||
return ok
|
|
||||||
|
|
||||||
def mocked():
|
|
||||||
return MockedResponse()
|
|
||||||
|
|
||||||
return mocked
|
|
||||||
|
|
||||||
|
|
||||||
class TestThirdPartyAuth(TestCase):
|
|
||||||
@classmethod
|
|
||||||
def setUpTestData(cls):
|
|
||||||
cls.user = subscriber_user.make()
|
|
||||||
cls.api_client = baker.make(ApiClient)
|
|
||||||
|
|
||||||
def setUp(self):
|
|
||||||
self.query = {
|
|
||||||
"client_id": self.api_client.id,
|
|
||||||
"third_party_app": "app",
|
|
||||||
"privacy_link": "https://foobar.fr/",
|
|
||||||
"username": "bibou",
|
|
||||||
"callback_url": "https://callback.fr/",
|
|
||||||
}
|
|
||||||
self.query["signature"] = hmac_hexdigest(self.api_client.hmac_key, self.query)
|
|
||||||
self.callback_data = {
|
|
||||||
"user": UserProfileSchema.from_orm(self.user).model_dump()
|
|
||||||
}
|
|
||||||
self.callback_data["signature"] = hmac_hexdigest(
|
|
||||||
self.api_client.hmac_key, self.callback_data["user"]
|
|
||||||
)
|
|
||||||
self.url = reverse("api-link:third-party-auth", query=self.query)
|
|
||||||
|
|
||||||
def test_auth_ok(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
res = self.client.get(self.url)
|
|
||||||
assert res.status_code == 200
|
|
||||||
with mock.patch("requests.post", new_callable=mocked_post(ok=True)) as mocked:
|
|
||||||
res = self.client.post(
|
|
||||||
self.url,
|
|
||||||
data={"cgu_accepted": True, "is_username_valid": True, **self.query},
|
|
||||||
)
|
|
||||||
mocked.assert_called_once_with(
|
|
||||||
self.query["callback_url"], json=self.callback_data
|
|
||||||
)
|
|
||||||
assertRedirects(
|
|
||||||
res,
|
|
||||||
reverse("api-link:third-party-auth-result", kwargs={"result": "success"}),
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_callback_error(self):
|
|
||||||
"""Test that the user see the failure page if the callback request failed."""
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
with mock.patch("requests.post", new_callable=mocked_post(ok=False)) as mocked:
|
|
||||||
res = self.client.post(
|
|
||||||
self.url,
|
|
||||||
data={"cgu_accepted": True, "is_username_valid": True, **self.query},
|
|
||||||
)
|
|
||||||
mocked.assert_called_once_with(
|
|
||||||
self.query["callback_url"], json=self.callback_data
|
|
||||||
)
|
|
||||||
assertRedirects(
|
|
||||||
res,
|
|
||||||
reverse("api-link:third-party-auth-result", kwargs={"result": "failure"}),
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_wrong_signature(self):
|
|
||||||
"""Test that a 403 is raised if the signature of the query is wrong."""
|
|
||||||
self.client.force_login(subscriber_user.make())
|
|
||||||
new_key = get_hmac_key()
|
|
||||||
del self.query["signature"]
|
|
||||||
self.query["signature"] = hmac_hexdigest(new_key, self.query)
|
|
||||||
res = self.client.get(reverse("api-link:third-party-auth", query=self.query))
|
|
||||||
assert list(get_messages(res.wsgi_request)) == [
|
|
||||||
Message(
|
|
||||||
level=40,
|
|
||||||
message=(
|
|
||||||
"La signature est incorrecte. "
|
|
||||||
"Nous ne pouvons pas garantir l'authenticité de la requête."
|
|
||||||
),
|
|
||||||
)
|
|
||||||
]
|
|
||||||
|
|
||||||
res = self.client.post(self.url, data=self.query)
|
|
||||||
assert res.status_code == 200
|
|
||||||
|
|
||||||
def test_cgu_not_accepted(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
res = self.client.get(self.url)
|
|
||||||
assert res.status_code == 200
|
|
||||||
res = self.client.post(self.url, data=self.query)
|
|
||||||
assert res.status_code == 200 # no redirect means invalid form
|
|
||||||
res = self.client.post(
|
|
||||||
self.url,
|
|
||||||
data={"cgu_accepted": False, "is_username_valid": False, **self.query},
|
|
||||||
)
|
|
||||||
assert res.status_code == 200
|
|
||||||
|
|
||||||
def test_invalid_client(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
self.query["client_id"] = ApiClient.objects.aggregate(res=Max("id"))["res"] + 1
|
|
||||||
res = self.client.get(reverse("api-link:third-party-auth", query=self.query))
|
|
||||||
assert list(get_messages(res.wsgi_request)) == [
|
|
||||||
Message(
|
|
||||||
level=40,
|
|
||||||
message="Les données fournies pour l'authentification sont incorrectes.",
|
|
||||||
)
|
|
||||||
]
|
|
||||||
|
|
||||||
def test_missing_parameter(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
del self.query["username"]
|
|
||||||
self.query["signature"] = hmac_hexdigest(self.api_client.hmac_key, self.query)
|
|
||||||
res = self.client.get(reverse("api-link:third-party-auth", query=self.query))
|
|
||||||
assert list(get_messages(res.wsgi_request)) == [
|
|
||||||
Message(
|
|
||||||
level=40,
|
|
||||||
message="Les données fournies pour l'authentification sont incorrectes.",
|
|
||||||
)
|
|
||||||
]
|
|
||||||
res = self.client.post(self.url, data=self.query)
|
|
||||||
assert res.status_code == 200
|
|
||||||
-15
@@ -1,10 +1,6 @@
|
|||||||
from django.urls import path, register_converter
|
|
||||||
from ninja.security import SessionAuth
|
from ninja.security import SessionAuth
|
||||||
from ninja_extra import NinjaExtraAPI
|
from ninja_extra import NinjaExtraAPI
|
||||||
|
|
||||||
from api.views import ThirdPartyAuthResultView, ThirdPartyAuthView
|
|
||||||
from core.converters import ResultConverter
|
|
||||||
|
|
||||||
api = NinjaExtraAPI(
|
api = NinjaExtraAPI(
|
||||||
title="PICON",
|
title="PICON",
|
||||||
description="Portail Interactif de Communication avec les Outils Numériques",
|
description="Portail Interactif de Communication avec les Outils Numériques",
|
||||||
@@ -13,14 +9,3 @@ api = NinjaExtraAPI(
|
|||||||
auth=[SessionAuth()],
|
auth=[SessionAuth()],
|
||||||
)
|
)
|
||||||
api.auto_discover_controllers()
|
api.auto_discover_controllers()
|
||||||
|
|
||||||
register_converter(ResultConverter, "res")
|
|
||||||
|
|
||||||
urlpatterns = [
|
|
||||||
path("auth/", ThirdPartyAuthView.as_view(), name="third-party-auth"),
|
|
||||||
path(
|
|
||||||
"auth/<res:result>/",
|
|
||||||
ThirdPartyAuthResultView.as_view(),
|
|
||||||
name="third-party-auth-result",
|
|
||||||
),
|
|
||||||
]
|
|
||||||
-146
@@ -1,146 +0,0 @@
|
|||||||
import hmac
|
|
||||||
from urllib.parse import unquote
|
|
||||||
|
|
||||||
import pydantic
|
|
||||||
import requests
|
|
||||||
import sentry_sdk
|
|
||||||
from django.conf import settings
|
|
||||||
from django.contrib import messages
|
|
||||||
from django.contrib.auth.mixins import AccessMixin, LoginRequiredMixin
|
|
||||||
from django.shortcuts import render
|
|
||||||
from django.urls import reverse, reverse_lazy
|
|
||||||
from django.utils.translation import gettext as _
|
|
||||||
from django.views.generic import FormView, TemplateView
|
|
||||||
from ninja_extra.shortcuts import get_object_or_none
|
|
||||||
|
|
||||||
from api.forms import ThirdPartyAuthForm
|
|
||||||
from api.models import ApiClient
|
|
||||||
from api.schemas import ThirdPartyAuthParamsSchema
|
|
||||||
from core.models import Page
|
|
||||||
from core.schemas import UserProfileSchema
|
|
||||||
from core.utils import hmac_hexdigest
|
|
||||||
|
|
||||||
|
|
||||||
class ThirdPartyAuthView(AccessMixin, FormView):
|
|
||||||
form_class = ThirdPartyAuthForm
|
|
||||||
template_name = "api/third_party/auth.jinja"
|
|
||||||
success_url = reverse_lazy("core:index")
|
|
||||||
|
|
||||||
def parse_params(self) -> ThirdPartyAuthParamsSchema | None:
|
|
||||||
"""Parse and check the authentication parameters.
|
|
||||||
|
|
||||||
If parsing fails, messages will be created using the django message
|
|
||||||
infrastructure.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
The parses parameters, or None if the parsing failed.
|
|
||||||
"""
|
|
||||||
# This is here rather than in ThirdPartyAuthForm because
|
|
||||||
# the given parameters and their signature are checked during both
|
|
||||||
# POST (for obvious reasons) and GET (in order not to make
|
|
||||||
# the user fill a form just to get an error he won't understand)
|
|
||||||
params = self.request.GET if self.request.method == "GET" else self.request.POST
|
|
||||||
params = {key: unquote(val) for key, val in params.dict().items()}
|
|
||||||
try:
|
|
||||||
params = ThirdPartyAuthParamsSchema(**params)
|
|
||||||
except pydantic.ValidationError:
|
|
||||||
messages.error(
|
|
||||||
self.request, _("The data provided for authentication is incorrect")
|
|
||||||
)
|
|
||||||
return None
|
|
||||||
client: ApiClient | None = get_object_or_none(ApiClient, id=params.client_id)
|
|
||||||
if not client:
|
|
||||||
messages.error(
|
|
||||||
self.request, _("The data provided for authentication is incorrect")
|
|
||||||
)
|
|
||||||
return None
|
|
||||||
if not hmac.compare_digest(
|
|
||||||
hmac_hexdigest(client.hmac_key, params.model_dump(exclude={"signature"})),
|
|
||||||
params.signature,
|
|
||||||
):
|
|
||||||
messages.error(
|
|
||||||
self.request,
|
|
||||||
_(
|
|
||||||
"The signature is incorrect. "
|
|
||||||
"We cannot ensure the provenance of the request."
|
|
||||||
),
|
|
||||||
)
|
|
||||||
return None
|
|
||||||
return params
|
|
||||||
|
|
||||||
def dispatch(self, request, *args, **kwargs):
|
|
||||||
if not request.user.is_authenticated:
|
|
||||||
return self.handle_no_permission()
|
|
||||||
if (params := self.parse_params()) is None:
|
|
||||||
# if parameters parsing failed, shortcut the operation and display
|
|
||||||
# an empty page with just the error messages.
|
|
||||||
return render(request, "core/base.jinja")
|
|
||||||
self.params = params
|
|
||||||
return super().dispatch(request, *args, **kwargs)
|
|
||||||
|
|
||||||
def get(self, *args, **kwargs):
|
|
||||||
messages.warning(
|
|
||||||
self.request,
|
|
||||||
_(
|
|
||||||
"You are going to link your AE account and your %(app)s account. "
|
|
||||||
"Continue only if this page was opened from %(app)s."
|
|
||||||
)
|
|
||||||
% {"app": self.params.third_party_app},
|
|
||||||
)
|
|
||||||
return super().get(*args, **kwargs)
|
|
||||||
|
|
||||||
def get_initial(self):
|
|
||||||
return self.params.model_dump()
|
|
||||||
|
|
||||||
def form_valid(self, form):
|
|
||||||
client = ApiClient.objects.get(id=form.cleaned_data["client_id"])
|
|
||||||
user = UserProfileSchema.from_orm(self.request.user).model_dump()
|
|
||||||
data = {"user": user, "signature": hmac_hexdigest(client.hmac_key, user)}
|
|
||||||
try:
|
|
||||||
ok = requests.post(form.cleaned_data["callback_url"], json=data).ok
|
|
||||||
except requests.RequestException as e:
|
|
||||||
sentry_sdk.capture_exception(e)
|
|
||||||
ok = False
|
|
||||||
self.success_url = reverse(
|
|
||||||
"api-link:third-party-auth-result",
|
|
||||||
kwargs={"result": "success" if ok else "failure"},
|
|
||||||
)
|
|
||||||
return super().form_valid(form)
|
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
|
||||||
return super().get_context_data(**kwargs) | {
|
|
||||||
"third_party_app": self.params.third_party_app,
|
|
||||||
"third_party_cgu": self.params.privacy_link,
|
|
||||||
"sith_cgu": Page.objects.get(_full_name=settings.SITH_CGU_PAGE),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class ThirdPartyAuthResultView(LoginRequiredMixin, TemplateView):
|
|
||||||
"""View that the user will see if its authentication on sith was successful.
|
|
||||||
|
|
||||||
This can show either a success or a failure message :
|
|
||||||
- success : everything is good, the user is successfully authenticated
|
|
||||||
and can close the page
|
|
||||||
- failure : the authentication has been processed on the sith side,
|
|
||||||
but the request to the callback url received an error.
|
|
||||||
In such a case, there is nothing much we can do but to advice
|
|
||||||
the user to contact the developers of the third-party app.
|
|
||||||
"""
|
|
||||||
|
|
||||||
template_name = "core/base.jinja"
|
|
||||||
success_message = _(
|
|
||||||
"You have been successfully authenticated. You can now close this page."
|
|
||||||
)
|
|
||||||
error_message = _(
|
|
||||||
"Your authentication on the AE website was successful, "
|
|
||||||
"but an error happened during the interaction "
|
|
||||||
"with the third-party application. "
|
|
||||||
"Please contact the managers of the latter."
|
|
||||||
)
|
|
||||||
|
|
||||||
def get(self, request, *args, **kwargs):
|
|
||||||
if self.kwargs.get("result") == "success":
|
|
||||||
messages.success(request, self.success_message)
|
|
||||||
else:
|
|
||||||
messages.error(request, self.error_message)
|
|
||||||
return super().get(request, *args, **kwargs)
|
|
||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
"linter": {
|
"linter": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"rules": {
|
"rules": {
|
||||||
"preset": "recommended",
|
"recommended": true,
|
||||||
"style": {
|
"style": {
|
||||||
"useNamingConvention": "error"
|
"useNamingConvention": "error"
|
||||||
},
|
},
|
||||||
|
|||||||
+4
-8
@@ -12,16 +12,12 @@
|
|||||||
# OR WITHIN THE LOCAL FILE "LICENSE"
|
# OR WITHIN THE LOCAL FILE "LICENSE"
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
from django.forms.models import ModelForm
|
||||||
|
from django.http import HttpRequest
|
||||||
|
|
||||||
from club.models import Club, ClubLink, ClubRole, LinkType, Membership
|
from club.models import Club, ClubLink, ClubRole, LinkType, Membership
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.forms.models import ModelForm
|
|
||||||
from django.http import HttpRequest
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(Club)
|
@admin.register(Club)
|
||||||
class ClubAdmin(admin.ModelAdmin):
|
class ClubAdmin(admin.ModelAdmin):
|
||||||
@@ -50,8 +46,8 @@ class ClubAdmin(admin.ModelAdmin):
|
|||||||
@admin.register(ClubRole)
|
@admin.register(ClubRole)
|
||||||
class ClubRoleAdmin(admin.ModelAdmin):
|
class ClubRoleAdmin(admin.ModelAdmin):
|
||||||
list_display = ("name", "club", "is_board", "is_presidency")
|
list_display = ("name", "club", "is_board", "is_presidency")
|
||||||
search_fields = ("name", "club__name")
|
search_fields = ("name",)
|
||||||
autocomplete_fields = ("club", "linked_groups")
|
autocomplete_fields = ("club",)
|
||||||
list_select_related = ("club",)
|
list_select_related = ("club",)
|
||||||
list_filter = (
|
list_filter = (
|
||||||
"is_board",
|
"is_board",
|
||||||
|
|||||||
-41
@@ -11,7 +11,6 @@ from club.models import Club, Membership
|
|||||||
from club.schemas import (
|
from club.schemas import (
|
||||||
ClubSchema,
|
ClubSchema,
|
||||||
ClubSearchFilterSchema,
|
ClubSearchFilterSchema,
|
||||||
MembershipFilterSchema,
|
|
||||||
SimpleClubSchema,
|
SimpleClubSchema,
|
||||||
UserMembershipSchema,
|
UserMembershipSchema,
|
||||||
)
|
)
|
||||||
@@ -63,43 +62,3 @@ class UserClubController(ControllerBase):
|
|||||||
.filter(user=user)
|
.filter(user=user)
|
||||||
.select_related("club", "user", "role")
|
.select_related("club", "user", "role")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@api_controller("/clubs/members/")
|
|
||||||
class ClubMembershipController(ControllerBase):
|
|
||||||
@route.get(
|
|
||||||
"/new",
|
|
||||||
response=list[UserMembershipSchema],
|
|
||||||
auth=[ApiKeyAuth(), SessionAuth()],
|
|
||||||
permissions=[HasPerm("club.view_club")],
|
|
||||||
url_name="get_new_clubs_members_since_date",
|
|
||||||
)
|
|
||||||
def fetch_new_club_members(self, filters: Query[MembershipFilterSchema]):
|
|
||||||
"""give all the members of all clubs that have joined since a given date"""
|
|
||||||
memberships = (
|
|
||||||
Membership.objects.ongoing()
|
|
||||||
.filter(start_date__gte=filters.since_date, end_date__isnull=True)
|
|
||||||
.select_related("user", "role", "club")
|
|
||||||
)
|
|
||||||
if filters.clubs_id:
|
|
||||||
memberships = memberships.filter(club_id__in=filters.clubs_id)
|
|
||||||
|
|
||||||
return memberships.order_by("start_date")
|
|
||||||
|
|
||||||
@route.get(
|
|
||||||
"/former",
|
|
||||||
response=list[UserMembershipSchema],
|
|
||||||
auth=[ApiKeyAuth(), SessionAuth()],
|
|
||||||
permissions=[HasPerm("club.view_club")],
|
|
||||||
url_name="get_former_clubs_members_since_date",
|
|
||||||
)
|
|
||||||
def fetch_former_club_members(self, filters: Query[MembershipFilterSchema]):
|
|
||||||
"""give all the former members of all clubs that have left since a given date"""
|
|
||||||
memberships = Membership.objects.filter(
|
|
||||||
start_date__lt=filters.since_date,
|
|
||||||
end_date__gte=filters.since_date,
|
|
||||||
).select_related("user", "role", "club")
|
|
||||||
if filters.clubs_id:
|
|
||||||
memberships = memberships.filter(club_id__in=filters.clubs_id)
|
|
||||||
|
|
||||||
return memberships.order_by("start_date")
|
|
||||||
@@ -21,13 +21,10 @@
|
|||||||
# Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
import itertools
|
|
||||||
from operator import attrgetter
|
|
||||||
|
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.db.models import Exists, OuterRef, Q, QuerySet
|
from django.db.models import Exists, OuterRef, Q, QuerySet
|
||||||
from django.db.models.functions import Lower
|
from django.db.models.functions import Lower
|
||||||
from django.forms.models import ModelChoiceField, ModelChoiceIterator
|
|
||||||
from django.utils.functional import cached_property
|
from django.utils.functional import cached_property
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
@@ -49,37 +46,6 @@ from counter.models import Counter, Selling
|
|||||||
from counter.schemas import SaleFilterSchema
|
from counter.schemas import SaleFilterSchema
|
||||||
|
|
||||||
|
|
||||||
class ClubRoleChoiceIterator(ModelChoiceIterator):
|
|
||||||
"""Custom `ModelChoiceIterator` for `ClubRoleChoiceField`"""
|
|
||||||
|
|
||||||
def __iter__(self):
|
|
||||||
if self.field.empty_label is not None:
|
|
||||||
yield "", self.field.empty_label
|
|
||||||
queryset = self.queryset.select_related("club").order_by("club", "order")
|
|
||||||
groups = [
|
|
||||||
(club, [self.choice(role) for role in roles])
|
|
||||||
for club, roles in itertools.groupby(queryset, key=attrgetter("club"))
|
|
||||||
]
|
|
||||||
if len(groups) == 1:
|
|
||||||
# there is only one club involved, no need to have optgroups
|
|
||||||
yield from groups[0][1]
|
|
||||||
else:
|
|
||||||
# there are multiple clubs, optgroups are necessary to differentiate
|
|
||||||
# roles having the same name
|
|
||||||
yield from groups
|
|
||||||
|
|
||||||
|
|
||||||
class ClubRoleChoiceField(ModelChoiceField):
|
|
||||||
"""Custom `ModelChoiceField` for `[ClubRole][club.models.ClubRole]`.
|
|
||||||
|
|
||||||
If only one club is involved, behave like the base `ModelChoiceField`.
|
|
||||||
If dealing with the roles of multiple clubs, group the roles
|
|
||||||
into a different `optgroup` for each club.
|
|
||||||
"""
|
|
||||||
|
|
||||||
iterator = ClubRoleChoiceIterator
|
|
||||||
|
|
||||||
|
|
||||||
class ClubLinkForm(forms.ModelForm):
|
class ClubLinkForm(forms.ModelForm):
|
||||||
error_css_class = "error"
|
error_css_class = "error"
|
||||||
required_css_class = "required"
|
required_css_class = "required"
|
||||||
@@ -426,30 +392,6 @@ class ClubRoleForm(forms.ModelForm):
|
|||||||
self.instance.order = cleaned_data["ORDER"] - 1
|
self.instance.order = cleaned_data["ORDER"] - 1
|
||||||
return cleaned_data
|
return cleaned_data
|
||||||
|
|
||||||
def save(self, commit=True): # noqa: FBT002
|
|
||||||
instance: ClubRole = super().save(commit=commit)
|
|
||||||
if commit and "is_board" in self.changed_data:
|
|
||||||
# if the role was moved from board to simple member,
|
|
||||||
# remove all users with that role from the club board group.
|
|
||||||
# If the role became a board role, add users with
|
|
||||||
# that role to the club board group.
|
|
||||||
group_id = instance.club.board_group_id
|
|
||||||
if self.cleaned_data["is_board"]:
|
|
||||||
User.groups.through.objects.bulk_create(
|
|
||||||
[
|
|
||||||
User.groups.through(user_id=u, group_id=group_id)
|
|
||||||
for u in Membership.objects.ongoing()
|
|
||||||
.filter(role=instance)
|
|
||||||
.values_list("user_id", flat=True)
|
|
||||||
],
|
|
||||||
ignore_conflicts=True,
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
User.groups.through.objects.filter(
|
|
||||||
user__memberships__role=instance, group_id=group_id
|
|
||||||
).delete()
|
|
||||||
return instance
|
|
||||||
|
|
||||||
|
|
||||||
class ClubRoleCreateForm(forms.ModelForm):
|
class ClubRoleCreateForm(forms.ModelForm):
|
||||||
"""Form to create a club role.
|
"""Form to create a club role.
|
||||||
@@ -479,13 +421,6 @@ class ClubRoleCreateForm(forms.ModelForm):
|
|||||||
class ClubRoleBaseFormSet(forms.BaseInlineFormSet):
|
class ClubRoleBaseFormSet(forms.BaseInlineFormSet):
|
||||||
ordering_widget = forms.HiddenInput()
|
ordering_widget = forms.HiddenInput()
|
||||||
|
|
||||||
def __init__(self, *args, queryset=None, **kwargs):
|
|
||||||
if queryset is None:
|
|
||||||
queryset = self.model._default_manager
|
|
||||||
super().__init__(
|
|
||||||
*args, queryset=queryset.prefetch_related("linked_groups"), **kwargs
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
ClubRoleFormSet = forms.inlineformset_factory(
|
ClubRoleFormSet = forms.inlineformset_factory(
|
||||||
Club,
|
Club,
|
||||||
|
|||||||
@@ -1,16 +1,12 @@
|
|||||||
# Generated by Django 4.2.16 on 2024-11-20 17:08
|
# Generated by Django 4.2.16 on 2024-11-20 17:08
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
import django.db.models.functions.datetime
|
import django.db.models.functions.datetime
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
|
from django.db.migrations.state import StateApps
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.utils.timezone import localdate
|
from django.utils.timezone import localdate
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.db.migrations.state import StateApps
|
|
||||||
|
|
||||||
# Before the club role rework, the maximum free role
|
# Before the club role rework, the maximum free role
|
||||||
# was the hardcoded highest non-board role
|
# was the hardcoded highest non-board role
|
||||||
MAXIMUM_FREE_ROLE = 1
|
MAXIMUM_FREE_ROLE = 1
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
# Generated by Django 5.2.3 on 2025-06-21 21:59
|
# Generated by Django 5.2.3 on 2025-06-21 21:59
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
|
from django.db.migrations.state import StateApps
|
||||||
from django.db.models import Case, When
|
from django.db.models import Case, When
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.db.migrations.state import StateApps
|
|
||||||
|
|
||||||
PRESIDENCY_ROLES = [10, 9]
|
PRESIDENCY_ROLES = [10, 9]
|
||||||
MAXIMUM_FREE_ROLE = 1
|
MAXIMUM_FREE_ROLE = 1
|
||||||
SITH_CLUB_ROLES = {
|
SITH_CLUB_ROLES = {
|
||||||
|
|||||||
@@ -25,7 +25,8 @@ class Migration(migrations.Migration):
|
|||||||
"url_base",
|
"url_base",
|
||||||
models.URLField(
|
models.URLField(
|
||||||
help_text=(
|
help_text=(
|
||||||
"The base url that links with this type must respect"
|
"The base url that links with this type "
|
||||||
|
"must respect (e.g. `https://www.instagram.com`)"
|
||||||
),
|
),
|
||||||
unique=True,
|
unique=True,
|
||||||
verbose_name="url base",
|
verbose_name="url base",
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
# Generated by Django 5.2.17 on 2026-09-01 14:36
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [
|
|
||||||
("club", "0017_linktype_clublink"),
|
|
||||||
("core", "0050_alter_sithfile_moderator"),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name="clubrole",
|
|
||||||
name="linked_groups",
|
|
||||||
field=models.ManyToManyField(
|
|
||||||
help_text=(
|
|
||||||
"Groups that are automatically given or removed "
|
|
||||||
"to user receiving or losing this club role"
|
|
||||||
),
|
|
||||||
related_name="linked_roles",
|
|
||||||
to="core.group",
|
|
||||||
verbose_name="Linked groups",
|
|
||||||
),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
+16
-34
@@ -23,8 +23,6 @@
|
|||||||
#
|
#
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import operator
|
|
||||||
from functools import reduce
|
|
||||||
from typing import Iterable, Self
|
from typing import Iterable, Self
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
@@ -284,15 +282,6 @@ class ClubRole(OrderedModel):
|
|||||||
"If the role is inactive, people joining the club won't be able to get it."
|
"If the role is inactive, people joining the club won't be able to get it."
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
linked_groups = models.ManyToManyField(
|
|
||||||
Group,
|
|
||||||
verbose_name=_("Linked groups"),
|
|
||||||
help_text=_(
|
|
||||||
"Groups that are automatically given or removed "
|
|
||||||
"to user receiving or losing this club role"
|
|
||||||
),
|
|
||||||
related_name="linked_roles",
|
|
||||||
)
|
|
||||||
|
|
||||||
order_with_respect_to = "club"
|
order_with_respect_to = "club"
|
||||||
|
|
||||||
@@ -545,7 +534,7 @@ class Membership(models.Model):
|
|||||||
def _remove_club_groups(
|
def _remove_club_groups(
|
||||||
memberships: Iterable[Membership],
|
memberships: Iterable[Membership],
|
||||||
) -> tuple[int, dict[str, int]]:
|
) -> tuple[int, dict[str, int]]:
|
||||||
"""Remove users of those memberships from the club and club role groups.
|
"""Remove users of those memberships from the club groups.
|
||||||
|
|
||||||
For example, if a user is in the Troll club board,
|
For example, if a user is in the Troll club board,
|
||||||
he is in the board group and the members group of the Troll.
|
he is in the board group and the members group of the Troll.
|
||||||
@@ -564,19 +553,15 @@ class Membership(models.Model):
|
|||||||
clubs = {m.club_id for m in memberships}
|
clubs = {m.club_id for m in memberships}
|
||||||
users = {m.user_id for m in memberships}
|
users = {m.user_id for m in memberships}
|
||||||
groups = Group.objects.filter(Q(club__in=clubs) | Q(club_board__in=clubs))
|
groups = Group.objects.filter(Q(club__in=clubs) | Q(club_board__in=clubs))
|
||||||
role_groups = [
|
|
||||||
Q(user_id=m.user_id, group__linked_roles=m.role_id) for m in memberships
|
|
||||||
]
|
|
||||||
return User.groups.through.objects.filter(
|
return User.groups.through.objects.filter(
|
||||||
(Q(group__in=groups) & Q(user__in=users))
|
Q(group__in=groups) & Q(user__in=users)
|
||||||
| reduce(operator.or_, role_groups)
|
|
||||||
).delete()
|
).delete()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _add_club_groups(
|
def _add_club_groups(
|
||||||
memberships: Iterable[Membership],
|
memberships: Iterable[Membership],
|
||||||
) -> list[User.groups.through]:
|
) -> list[User.groups.through]:
|
||||||
"""Add users of those memberships to the club and club role groups.
|
"""Add users of those memberships to the club groups.
|
||||||
|
|
||||||
For example, if a user just joined the Troll club board,
|
For example, if a user just joined the Troll club board,
|
||||||
he will be added in both the members group and the board group
|
he will be added in both the members group and the board group
|
||||||
@@ -597,40 +582,34 @@ class Membership(models.Model):
|
|||||||
memberships = [m for m in memberships if m.end_date is None]
|
memberships = [m for m in memberships if m.end_date is None]
|
||||||
if not memberships:
|
if not memberships:
|
||||||
return []
|
return []
|
||||||
nb_prefetched = sum(
|
|
||||||
1 for m in memberships if not hasattr(m, "club") or not hasattr(m, "role")
|
if sum(1 for m in memberships if not hasattr(m, "club")) > 1:
|
||||||
)
|
|
||||||
if nb_prefetched > 1:
|
|
||||||
# if more than one membership hasn't its `club` attribute set
|
# if more than one membership hasn't its `club` attribute set
|
||||||
# it's less expensive to reload the whole query with
|
# it's less expensive to reload the whole query with
|
||||||
# a select_related than perform a distinct query
|
# a select_related than perform a distinct query
|
||||||
# to fetch each club.
|
# to fetch each club.
|
||||||
ids = {m.id for m in memberships}
|
ids = {m.id for m in memberships}
|
||||||
memberships = list(
|
memberships = list(
|
||||||
Membership.objects.filter(id__in=ids)
|
Membership.objects.filter(id__in=ids).select_related("club")
|
||||||
.select_related("club", "role")
|
|
||||||
.prefetch_related("role__linked_groups")
|
|
||||||
)
|
)
|
||||||
groups = []
|
club_groups = []
|
||||||
for membership in memberships:
|
for membership in memberships:
|
||||||
groups.append(
|
club_groups.append(
|
||||||
User.groups.through(
|
User.groups.through(
|
||||||
user_id=membership.user_id,
|
user_id=membership.user_id,
|
||||||
group_id=membership.club.members_group_id,
|
group_id=membership.club.members_group_id,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
if membership.role.is_board:
|
if membership.role.is_board:
|
||||||
groups.append(
|
club_groups.append(
|
||||||
User.groups.through(
|
User.groups.through(
|
||||||
user_id=membership.user_id,
|
user_id=membership.user_id,
|
||||||
group_id=membership.club.board_group_id,
|
group_id=membership.club.board_group_id,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
groups.extend(
|
return User.groups.through.objects.bulk_create(
|
||||||
User.groups.through(user_id=membership.user_id, group_id=g.id)
|
club_groups, ignore_conflicts=True
|
||||||
for g in membership.role.linked_groups.all()
|
)
|
||||||
)
|
|
||||||
return User.groups.through.objects.bulk_create(groups, ignore_conflicts=True)
|
|
||||||
|
|
||||||
|
|
||||||
class Mailing(models.Model):
|
class Mailing(models.Model):
|
||||||
@@ -814,7 +793,10 @@ class LinkType(models.Model):
|
|||||||
url_base = models.URLField(
|
url_base = models.URLField(
|
||||||
"url base",
|
"url base",
|
||||||
unique=True,
|
unique=True,
|
||||||
help_text=_("The base url that links with this type must respect"),
|
help_text=_(
|
||||||
|
"The base url that links with this type must respect (e.g. `%(url)s`)"
|
||||||
|
)
|
||||||
|
% {"url": "https://www.instagram.com"},
|
||||||
)
|
)
|
||||||
icon = models.CharField(
|
icon = models.CharField(
|
||||||
_("icon"),
|
_("icon"),
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
from datetime import date
|
|
||||||
from typing import Annotated
|
from typing import Annotated
|
||||||
|
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
@@ -80,9 +79,3 @@ class UserMembershipSchema(ModelSchema):
|
|||||||
|
|
||||||
club: SimpleClubSchema
|
club: SimpleClubSchema
|
||||||
role: ClubRoleSchema
|
role: ClubRoleSchema
|
||||||
user: SimpleUserSchema
|
|
||||||
|
|
||||||
|
|
||||||
class MembershipFilterSchema(FilterSchema):
|
|
||||||
since_date: Annotated[date, FilterLookup("date__lte")]
|
|
||||||
clubs_id: set[int] | None = None
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { escape_html } from "tom-select/src/utils";
|
import type { TomOption } from "tom-select/dist/types/types";
|
||||||
import { AjaxSelect } from "#core:core/components/ajax-select-base";
|
import type { escape_html } from "tom-select/dist/types/utils";
|
||||||
import { registerComponent } from "#core:utils/web-components";
|
import { AjaxSelect } from "#core:core/components/ajax-select-base.ts";
|
||||||
|
import { registerComponent } from "#core:utils/web-components.ts";
|
||||||
import { type ClubSchema, clubSearchClub } from "#openapi";
|
import { type ClubSchema, clubSearchClub } from "#openapi";
|
||||||
|
|
||||||
@registerComponent("club-ajax-select")
|
@registerComponent("club-ajax-select")
|
||||||
@@ -9,7 +10,7 @@ export class ClubAjaxSelect extends AjaxSelect {
|
|||||||
protected labelField = "name";
|
protected labelField = "name";
|
||||||
protected searchField = ["code", "name"];
|
protected searchField = ["code", "name"];
|
||||||
|
|
||||||
protected async search(query: string) {
|
protected async search(query: string): Promise<TomOption[]> {
|
||||||
const resp = await clubSearchClub({ query: { search: query } });
|
const resp = await clubSearchClub({ query: { search: query } });
|
||||||
if (resp.data) {
|
if (resp.data) {
|
||||||
return resp.data.results;
|
return resp.data.results;
|
||||||
|
|||||||
@@ -45,10 +45,3 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 575px){
|
|
||||||
#club-list{
|
|
||||||
padding-left: 0;
|
|
||||||
padding-right: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -15,6 +15,9 @@
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% extends "core/base.jinja" %}
|
{% extends "core/base.jinja" %}
|
||||||
|
{% block additional_css %}
|
||||||
|
<link rel="stylesheet" href="{{ static("club/list.scss") }}">
|
||||||
|
{% endblock %}
|
||||||
{% block description -%}
|
{% block description -%}
|
||||||
{% trans %}The list of all clubs existing at UTBM.{% endtrans %}
|
{% trans %}The list of all clubs existing at UTBM.{% endtrans %}
|
||||||
{%- endblock %}
|
{%- endblock %}
|
||||||
@@ -23,12 +26,6 @@
|
|||||||
{%- endblock %}
|
{%- endblock %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% block additional_css %}
|
|
||||||
{% if not is_fragment %}
|
|
||||||
<link rel="stylesheet" href="{{ static("club/list.scss") }}">
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% from "core/macros.jinja" import paginate_htmx %}
|
{% from "core/macros.jinja" import paginate_htmx %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
@@ -36,17 +33,15 @@
|
|||||||
<h3>{% trans %}Filters{% endtrans %}</h3>
|
<h3>{% trans %}Filters{% endtrans %}</h3>
|
||||||
<form
|
<form
|
||||||
id="club-list-filters"
|
id="club-list-filters"
|
||||||
method="GET"
|
hx-get="{{ url("club:club_list") }}"
|
||||||
hx-action="{{ url("club:club_list") }}"
|
|
||||||
hx-target="#content"
|
hx-target="#content"
|
||||||
hx-swap="innerHTML"
|
hx-swap="outerHtml"
|
||||||
hx-push-url="true"
|
hx-push-url="true"
|
||||||
hx-disable="find input, find button"
|
|
||||||
>
|
>
|
||||||
<div class="row gap-4x">
|
<div class="row gap-4x">
|
||||||
{{ form }}
|
{{ form }}
|
||||||
</div>
|
</div>
|
||||||
<button class="btn btn-blue margin-bottom">
|
<button type="submit" class="btn btn-blue margin-bottom">
|
||||||
<i class="fa fa-magnifying-glass"></i>{% trans %}Search{% endtrans %}
|
<i class="fa fa-magnifying-glass"></i>{% trans %}Search{% endtrans %}
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -49,20 +49,6 @@
|
|||||||
{{ subform.is_active.help_text }}
|
{{ subform.is_active.help_text }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{% set groups = subform.instance.linked_groups.all()|list %}
|
|
||||||
{% if groups %}
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
<strong>{% trans %}Linked groups : {% endtrans %}</strong>
|
|
||||||
{{ groups|map(attribute="name")|join(", ") }}
|
|
||||||
</p>
|
|
||||||
<p class="helptext">
|
|
||||||
{% trans trimmed %}
|
|
||||||
Users receiving this role will also be assigned to those groups
|
|
||||||
{% endtrans %}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
</details>
|
</details>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,7 +1,12 @@
|
|||||||
{% extends "core/base.jinja" %}
|
{% extends "core/base.jinja" %}
|
||||||
|
{% from "reservation/macros.jinja" import room_detail %}
|
||||||
|
|
||||||
|
{% block additional_css %}
|
||||||
|
<link rel="stylesheet" href="{{ static("core/components/card.scss") }}">
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h3>{% trans %}Club tools{% endtrans %}</h3>
|
<h3>{% trans %}Club tools{% endtrans %} ({{ club.name }})</h3>
|
||||||
<div>
|
<div>
|
||||||
<h4>{% trans %}Communication:{% endtrans %}</h4>
|
<h4>{% trans %}Communication:{% endtrans %}</h4>
|
||||||
<ul>
|
<ul>
|
||||||
@@ -19,18 +24,43 @@
|
|||||||
<li><a href="{{ url("club:club_roles", club_id=object.id) }}"></a></li>
|
<li><a href="{{ url("club:club_roles", club_id=object.id) }}"></a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if object.trombi %}
|
{% if object.trombi %}
|
||||||
<li> <a href="{{ url('trombi:detail', trombi_id=object.trombi.id) }}">{% trans %}Edit Trombi{% endtrans %}</a></li>
|
<li>
|
||||||
|
<a href="{{ url('trombi:detail', trombi_id=object.trombi.id) }}">
|
||||||
|
{% trans %}Edit Trombi{% endtrans %}</a>
|
||||||
|
</li>
|
||||||
{% else %}
|
{% else %}
|
||||||
<li> <a href="{{ url('trombi:create', club_id=object.id) }}">{% trans %}New Trombi{% endtrans %}</a></li>
|
<li><a href="{{ url('trombi:create', club_id=object.id) }}">{% trans %}New Trombi{% endtrans %}</a></li>
|
||||||
<li> <a href="{{ url('club:poster_list', club_id=object.id) }}">{% trans %}Posters{% endtrans %}</a></li>
|
<li><a href="{{ url('club:poster_list', club_id=object.id) }}">{% trans %}Posters{% endtrans %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
<h4>{% trans %}Reservable rooms{% endtrans %}</h4>
|
||||||
|
<a
|
||||||
|
href="{{ url("reservation:room_create") }}?club={{ object.id }}"
|
||||||
|
class="btn btn-blue"
|
||||||
|
>
|
||||||
|
{% trans %}Add a room{% endtrans %}
|
||||||
|
</a>
|
||||||
|
{%- if reservable_rooms|length > 0 -%}
|
||||||
|
<ul class="card-group">
|
||||||
|
{%- for room in reservable_rooms -%}
|
||||||
|
{{ room_detail(
|
||||||
|
room,
|
||||||
|
can_edit=user.can_edit(room),
|
||||||
|
can_delete=request.user.has_perm("reservation.delete_room")
|
||||||
|
) }}
|
||||||
|
{%- endfor -%}
|
||||||
|
</ul>
|
||||||
|
{%- else -%}
|
||||||
|
<p>
|
||||||
|
{% trans %}This club manages no reservable room{% endtrans %}
|
||||||
|
</p>
|
||||||
|
{%- endif -%}
|
||||||
<h4>{% trans %}Counters:{% endtrans %}</h4>
|
<h4>{% trans %}Counters:{% endtrans %}</h4>
|
||||||
<ul>
|
<ul>
|
||||||
{% for c in object.counters.filter(type="OFFICE") %}
|
{% for counter in counters %}
|
||||||
<li>{{ c }}:
|
<li>{{ counter }}:
|
||||||
<a href="{{ url('counter:details', counter_id=c.id) }}">View</a>
|
<a href="{{ url('counter:details', counter_id=counter.id) }}">View</a>
|
||||||
<a href="{{ url('counter:admin', counter_id=c.id) }}">Edit</a>
|
<a href="{{ url('counter:admin', counter_id=counter.id) }}">Edit</a>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
<form
|
<form
|
||||||
hx-post="{{ url('club:club_new_members', club_id=club.id) }}"
|
hx-post="{{ url('club:club_new_members', club_id=club.id) }}"
|
||||||
hx-disable="find input[type='submit']"
|
hx-disabled-elt="find input[type='submit']"
|
||||||
hx-swap="outerHTML"
|
hx-swap="outerHTML"
|
||||||
hx-target="#member-fragment-container"
|
hx-target="#member-fragment-container"
|
||||||
id="add_club_members_form"
|
id="add_club_members_form"
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.db import ProgrammingError
|
from django.db import ProgrammingError
|
||||||
|
from django.test import Client
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.timezone import localdate
|
from django.utils.timezone import localdate
|
||||||
from model_bakery import baker
|
from model_bakery import baker
|
||||||
@@ -14,9 +14,6 @@ from club.models import Club, ClubRole, Membership
|
|||||||
from core.baker_recipes import subscriber_user
|
from core.baker_recipes import subscriber_user
|
||||||
from core.models import User
|
from core.models import User
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.test import Client
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_club_queryset_having_board_member():
|
def test_club_queryset_having_board_member():
|
||||||
|
|||||||
@@ -1,203 +0,0 @@
|
|||||||
from datetime import timedelta
|
|
||||||
|
|
||||||
from django.contrib.auth.models import Permission
|
|
||||||
from django.test import TestCase
|
|
||||||
from django.urls import reverse
|
|
||||||
from django.utils.timezone import localdate
|
|
||||||
from model_bakery import baker
|
|
||||||
|
|
||||||
from club.models import Club, ClubRole, Membership
|
|
||||||
from core.baker_recipes import subscriber_user
|
|
||||||
from core.models import User
|
|
||||||
|
|
||||||
|
|
||||||
class TestMembershipAPI(TestCase):
|
|
||||||
@classmethod
|
|
||||||
def setUpTestData(cls):
|
|
||||||
cls.user = baker.make(User)
|
|
||||||
perm = Permission.objects.get(codename="view_club")
|
|
||||||
cls.user.user_permissions.add(perm)
|
|
||||||
cls.clubs = baker.make(Club, _quantity=3, is_active=True)
|
|
||||||
cls.roles = baker.make(ClubRole, _quantity=3, is_active=True)
|
|
||||||
cls.expectedNumQueries = 5
|
|
||||||
|
|
||||||
# Clean existing data to avoid side effects
|
|
||||||
Membership.objects.all().delete()
|
|
||||||
|
|
||||||
cls.memberships = [
|
|
||||||
# on going
|
|
||||||
Membership.objects.create(
|
|
||||||
club=cls.clubs[0],
|
|
||||||
user=subscriber_user.make(),
|
|
||||||
role=cls.roles[0],
|
|
||||||
start_date=localdate() - timedelta(weeks=1),
|
|
||||||
),
|
|
||||||
# on going
|
|
||||||
Membership.objects.create(
|
|
||||||
club=cls.clubs[1],
|
|
||||||
user=subscriber_user.make(),
|
|
||||||
role=cls.roles[1],
|
|
||||||
start_date=localdate() - timedelta(days=1),
|
|
||||||
),
|
|
||||||
# former
|
|
||||||
Membership.objects.create(
|
|
||||||
club=cls.clubs[1],
|
|
||||||
user=subscriber_user.make(),
|
|
||||||
role=cls.roles[2],
|
|
||||||
start_date=localdate() - timedelta(weeks=2),
|
|
||||||
end_date=localdate() - timedelta(days=6),
|
|
||||||
),
|
|
||||||
# on going
|
|
||||||
Membership.objects.create(
|
|
||||||
club=cls.clubs[2],
|
|
||||||
user=subscriber_user.make(),
|
|
||||||
role=cls.roles[0],
|
|
||||||
start_date=localdate() - timedelta(weeks=3),
|
|
||||||
),
|
|
||||||
# former
|
|
||||||
Membership.objects.create(
|
|
||||||
club=cls.clubs[1],
|
|
||||||
user=subscriber_user.make(),
|
|
||||||
role=cls.roles[2],
|
|
||||||
start_date=localdate() - timedelta(days=4),
|
|
||||||
end_date=localdate() - timedelta(days=3),
|
|
||||||
),
|
|
||||||
# on going
|
|
||||||
Membership.objects.create(
|
|
||||||
club=cls.clubs[2],
|
|
||||||
user=subscriber_user.make(),
|
|
||||||
role=cls.roles[0],
|
|
||||||
start_date=localdate() - timedelta(days=1),
|
|
||||||
),
|
|
||||||
# former
|
|
||||||
Membership.objects.create(
|
|
||||||
club=cls.clubs[0],
|
|
||||||
user=subscriber_user.make(),
|
|
||||||
role=cls.roles[0],
|
|
||||||
start_date=localdate() - timedelta(weeks=6),
|
|
||||||
end_date=localdate() - timedelta(days=3),
|
|
||||||
),
|
|
||||||
# former
|
|
||||||
Membership.objects.create(
|
|
||||||
club=cls.clubs[2],
|
|
||||||
user=subscriber_user.make(),
|
|
||||||
role=cls.roles[0],
|
|
||||||
start_date=localdate() - timedelta(weeks=8),
|
|
||||||
end_date=localdate() - timedelta(days=6),
|
|
||||||
),
|
|
||||||
# former
|
|
||||||
Membership.objects.create(
|
|
||||||
club=cls.clubs[1],
|
|
||||||
user=subscriber_user.make(),
|
|
||||||
role=cls.roles[0],
|
|
||||||
start_date=localdate() - timedelta(weeks=8),
|
|
||||||
end_date=localdate() - timedelta(weeks=7, days=5),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
class TestNewMembershipAPI(TestMembershipAPI):
|
|
||||||
@classmethod
|
|
||||||
def setUpTestData(cls):
|
|
||||||
super().setUpTestData()
|
|
||||||
cls.url = reverse("api:get_new_clubs_members_since_date")
|
|
||||||
|
|
||||||
def test_new_membership_one_club(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
since_date = localdate() - timedelta(weeks=1)
|
|
||||||
arg = {"since_date": since_date, "clubs_id": self.clubs[0].id}
|
|
||||||
with self.assertNumQueries(self.expectedNumQueries):
|
|
||||||
response = self.client.get(self.url, query_params=arg)
|
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
|
||||||
|
|
||||||
membership_ids = [e["id"] for e in data]
|
|
||||||
expected_ids = [self.memberships[0].id]
|
|
||||||
assert membership_ids == expected_ids
|
|
||||||
|
|
||||||
def test_new_membership_multiple_club(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
since_date = localdate() - timedelta(weeks=1)
|
|
||||||
arg = {
|
|
||||||
"since_date": since_date,
|
|
||||||
"clubs_id": [self.clubs[0].id, self.clubs[1].id],
|
|
||||||
}
|
|
||||||
with self.assertNumQueries(self.expectedNumQueries):
|
|
||||||
response = self.client.get(self.url, query_params=arg)
|
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
|
||||||
|
|
||||||
membership_ids = [e["id"] for e in data]
|
|
||||||
expected_ids = [self.memberships[0].id, self.memberships[1].id]
|
|
||||||
assert membership_ids == expected_ids
|
|
||||||
|
|
||||||
def test_new_membership_all_clubs(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
since_date = localdate() - timedelta(weeks=1)
|
|
||||||
arg = {"since_date": since_date}
|
|
||||||
with self.assertNumQueries(self.expectedNumQueries):
|
|
||||||
response = self.client.get(self.url, query_params=arg)
|
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
|
||||||
|
|
||||||
membership_ids = [e["id"] for e in data]
|
|
||||||
expected_ids = [
|
|
||||||
self.memberships[0].id,
|
|
||||||
self.memberships[1].id,
|
|
||||||
self.memberships[5].id,
|
|
||||||
]
|
|
||||||
assert membership_ids == expected_ids
|
|
||||||
|
|
||||||
|
|
||||||
class TestFormerMembershipAPI(TestMembershipAPI):
|
|
||||||
@classmethod
|
|
||||||
def setUpTestData(cls):
|
|
||||||
super().setUpTestData()
|
|
||||||
cls.url = reverse("api:get_former_clubs_members_since_date")
|
|
||||||
|
|
||||||
def test_former_membership_one_club(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
since_date = localdate() - timedelta(weeks=1)
|
|
||||||
arg = {"since_date": since_date, "clubs_id": self.clubs[1].id}
|
|
||||||
with self.assertNumQueries(self.expectedNumQueries):
|
|
||||||
response = self.client.get(self.url, query_params=arg)
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
|
||||||
|
|
||||||
membership_ids = [e["id"] for e in data]
|
|
||||||
expected_ids = [self.memberships[2].id]
|
|
||||||
assert membership_ids == expected_ids
|
|
||||||
|
|
||||||
def test_new_membership_multiple_club(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
since_date = localdate() - timedelta(weeks=1)
|
|
||||||
arg = {
|
|
||||||
"since_date": since_date,
|
|
||||||
"clubs_id": [self.clubs[1].id, self.clubs[0].id],
|
|
||||||
}
|
|
||||||
with self.assertNumQueries(self.expectedNumQueries):
|
|
||||||
response = self.client.get(self.url, query_params=arg)
|
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
|
||||||
|
|
||||||
membership_ids = [e["id"] for e in data]
|
|
||||||
expected_ids = [self.memberships[6].id, self.memberships[2].id]
|
|
||||||
assert membership_ids == expected_ids
|
|
||||||
|
|
||||||
def test_new_membership_all_clubs(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
since_date = localdate() - timedelta(weeks=1)
|
|
||||||
arg = {"since_date": since_date}
|
|
||||||
with self.assertNumQueries(self.expectedNumQueries):
|
|
||||||
response = self.client.get(self.url, query_params=arg)
|
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
|
||||||
|
|
||||||
membership_ids = [e["id"] for e in data]
|
|
||||||
expected_ids = [
|
|
||||||
self.memberships[7].id,
|
|
||||||
self.memberships[6].id,
|
|
||||||
self.memberships[2].id,
|
|
||||||
]
|
|
||||||
assert membership_ids == expected_ids
|
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
from typing import TYPE_CHECKING
|
from collections.abc import Callable
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from django.contrib.auth.models import Permission
|
from django.contrib.auth.models import Permission
|
||||||
from django.test import Client, TestCase
|
from django.test import Client, TestCase
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.timezone import now
|
|
||||||
from model_bakery import baker, seq
|
from model_bakery import baker, seq
|
||||||
from model_bakery.recipe import Recipe
|
from model_bakery.recipe import Recipe
|
||||||
from pytest_django.asserts import assertRedirects
|
from pytest_django.asserts import assertRedirects
|
||||||
@@ -14,9 +13,6 @@ from club.models import Club, ClubRole, Membership
|
|||||||
from core.baker_recipes import subscriber_user
|
from core.baker_recipes import subscriber_user
|
||||||
from core.models import AnonymousUser, User
|
from core.models import AnonymousUser, User
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from collections.abc import Callable
|
|
||||||
|
|
||||||
|
|
||||||
def make_club():
|
def make_club():
|
||||||
# unittest-style tests cannot use fixture, so we create a function
|
# unittest-style tests cannot use fixture, so we create a function
|
||||||
@@ -243,7 +239,7 @@ class TestClubRoleUpdate(TestCase):
|
|||||||
|
|
||||||
def test_president_moves_itself_out_of_the_presidency(self):
|
def test_president_moves_itself_out_of_the_presidency(self):
|
||||||
"""Test that if the user moves its own role out of the presidency,
|
"""Test that if the user moves its own role out of the presidency,
|
||||||
then it loses access to the update page."""
|
then it's redirected to another page and loses access to the update page."""
|
||||||
self.payload["roles-0-is_presidency"] = False
|
self.payload["roles-0-is_presidency"] = False
|
||||||
self.client.force_login(self.user)
|
self.client.force_login(self.user)
|
||||||
res = self.client.post(self.url, data=self.payload)
|
res = self.client.post(self.url, data=self.payload)
|
||||||
@@ -255,29 +251,3 @@ class TestClubRoleUpdate(TestCase):
|
|||||||
|
|
||||||
res = self.client.get(self.url)
|
res = self.client.get(self.url)
|
||||||
assert res.status_code == 403
|
assert res.status_code == 403
|
||||||
|
|
||||||
def test_role_stops_being_board(self):
|
|
||||||
"""Test that if a role stops being a board role,
|
|
||||||
its users lose the club board group."""
|
|
||||||
self.payload["roles-0-is_board"] = False
|
|
||||||
self.payload["roles-0-is_presidency"] = False
|
|
||||||
self.payload["roles-1-is_board"] = False
|
|
||||||
formset = ClubRoleFormSet(data=self.payload, instance=self.club)
|
|
||||||
assert formset.is_valid()
|
|
||||||
formset.save()
|
|
||||||
assert not self.user.groups.contains(self.club.board_group)
|
|
||||||
|
|
||||||
def test_role_becomes_board(self):
|
|
||||||
"""Test that if a role becomes a board role,
|
|
||||||
its active users get the club board group"""
|
|
||||||
members = [
|
|
||||||
baker.make(Membership, club=self.club, role=self.roles[0], end_date=None),
|
|
||||||
baker.make(Membership, club=self.club, role=self.roles[0], end_date=now()),
|
|
||||||
]
|
|
||||||
self.payload["roles-2-is_board"] = True
|
|
||||||
formset = ClubRoleFormSet(data=self.payload, instance=self.club)
|
|
||||||
assert formset.is_valid()
|
|
||||||
formset.save()
|
|
||||||
# the second membership is finished, so its user shouldn't get the role
|
|
||||||
assert members[0].user.groups.contains(self.club.board_group)
|
|
||||||
assert not members[1].user.groups.contains(self.club.board_group)
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
from django.test import Client
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from model_bakery import baker
|
from model_bakery import baker
|
||||||
from pytest_django.asserts import assertRedirects
|
from pytest_django.asserts import assertRedirects
|
||||||
@@ -8,9 +7,6 @@ from pytest_django.asserts import assertRedirects
|
|||||||
from club.models import Club, ClubRole, Membership
|
from club.models import Club, ClubRole, Membership
|
||||||
from core.baker_recipes import subscriber_user
|
from core.baker_recipes import subscriber_user
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.test import Client
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_club_board_member_cannot_edit_club_properties(client: Client):
|
def test_club_board_member_cannot_edit_club_properties(client: Client):
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import itertools
|
import itertools
|
||||||
|
from collections.abc import Callable
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
@@ -17,10 +17,7 @@ from club.forms import ClubAddMemberForm, JoinClubForm
|
|||||||
from club.models import Club, ClubRole, Membership
|
from club.models import Club, ClubRole, Membership
|
||||||
from club.tests.base import TestClub
|
from club.tests.base import TestClub
|
||||||
from core.baker_recipes import subscriber_user
|
from core.baker_recipes import subscriber_user
|
||||||
from core.models import AnonymousUser, Group, User
|
from core.models import AnonymousUser, User
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from collections.abc import Callable
|
|
||||||
|
|
||||||
|
|
||||||
class TestMembershipQuerySet(TestClub):
|
class TestMembershipQuerySet(TestClub):
|
||||||
@@ -503,29 +500,6 @@ class TestMembership(TestClub):
|
|||||||
assert self.subscriber.groups.contains(self.club.members_group)
|
assert self.subscriber.groups.contains(self.club.members_group)
|
||||||
assert self.subscriber.groups.contains(self.club.board_group)
|
assert self.subscriber.groups.contains(self.club.board_group)
|
||||||
|
|
||||||
def test_add_to_club_role_group(self):
|
|
||||||
groups = baker.make(Group, _quantity=4)
|
|
||||||
self.subscriber.groups.set(groups[:1])
|
|
||||||
self.board_role.linked_groups.set(groups[1:3])
|
|
||||||
baker.make(
|
|
||||||
Membership, club=self.club, user=self.subscriber, role=self.board_role
|
|
||||||
)
|
|
||||||
assert set(self.subscriber.groups.all()) == {
|
|
||||||
*groups[:3],
|
|
||||||
self.club.board_group,
|
|
||||||
self.club.members_group,
|
|
||||||
}
|
|
||||||
|
|
||||||
def test_remove_from_club_role_group(self):
|
|
||||||
groups = baker.make(Group, _quantity=3)
|
|
||||||
baker.make(
|
|
||||||
Membership, club=self.club, user=self.subscriber, role=self.board_role
|
|
||||||
)
|
|
||||||
self.subscriber.groups.set(groups[:1])
|
|
||||||
self.board_role.linked_groups.set(groups[1:])
|
|
||||||
self.subscriber.memberships.update(end_date=localdate())
|
|
||||||
assert set(self.subscriber.groups.all()) == {groups[0]}
|
|
||||||
|
|
||||||
def test_change_position_in_club(self):
|
def test_change_position_in_club(self):
|
||||||
"""Test that when moving from board to members, club group change"""
|
"""Test that when moving from board to members, club group change"""
|
||||||
membership = baker.make(
|
membership = baker.make(
|
||||||
|
|||||||
@@ -1,19 +1,15 @@
|
|||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from aemark import markdown
|
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
|
from django.test import Client
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from model_bakery import baker
|
from model_bakery import baker
|
||||||
from pytest_django.asserts import assertHTMLEqual, assertRedirects
|
from pytest_django.asserts import assertHTMLEqual, assertRedirects
|
||||||
|
|
||||||
from club.models import Club, ClubRole, Membership
|
from club.models import Club, ClubRole, Membership
|
||||||
from core.baker_recipes import subscriber_user
|
from core.baker_recipes import subscriber_user
|
||||||
|
from core.markdown import markdown
|
||||||
from core.models import PageRev, User
|
from core.models import PageRev, User
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.test import Client
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_page_display_on_club_main_page(client: Client):
|
def test_page_display_on_club_main_page(client: Client):
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
from django.test import Client
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from model_bakery import baker
|
from model_bakery import baker
|
||||||
|
|
||||||
@@ -8,9 +7,6 @@ from club.models import Club
|
|||||||
from com.models import Poster
|
from com.models import Poster
|
||||||
from core.baker_recipes import subscriber_user
|
from core.baker_recipes import subscriber_user
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.test import Client
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
@pytest.mark.parametrize("route_url", ["club:poster_list", "club:poster_create"])
|
@pytest.mark.parametrize("route_url", ["club:poster_list", "club:poster_create"])
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import csv
|
import csv
|
||||||
import itertools
|
import itertools
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
from django.test import Client
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from model_bakery import baker
|
from model_bakery import baker
|
||||||
|
|
||||||
@@ -12,9 +12,6 @@ from core.models import User
|
|||||||
from counter.baker_recipes import product_recipe, sale_recipe
|
from counter.baker_recipes import product_recipe, sale_recipe
|
||||||
from counter.models import Counter, Customer, Product, Selling
|
from counter.models import Counter, Customer, Product, Selling
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.test import Client
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_sales_page_doesnt_crash(client: Client):
|
def test_sales_page_doesnt_crash(client: Client):
|
||||||
|
|||||||
@@ -309,6 +309,12 @@ class ClubToolsView(ClubTabsMixin, CanEditMixin, DetailView):
|
|||||||
template_name = "club/club_tools.jinja"
|
template_name = "club/club_tools.jinja"
|
||||||
current_tab = "tools"
|
current_tab = "tools"
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
return super().get_context_data(**kwargs) | {
|
||||||
|
"reservable_rooms": list(self.object.reservable_rooms.all()),
|
||||||
|
"counters": list(self.object.counters.filter(type="OFFICE")),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class ClubAddMembersFragment(
|
class ClubAddMembersFragment(
|
||||||
FragmentMixin, PermissionRequiredMixin, SuccessMessageMixin, CreateView
|
FragmentMixin, PermissionRequiredMixin, SuccessMessageMixin, CreateView
|
||||||
|
|||||||
+1
-4
@@ -1,5 +1,4 @@
|
|||||||
from datetime import date
|
from datetime import date
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
from dateutil.relativedelta import relativedelta
|
from dateutil.relativedelta import relativedelta
|
||||||
from django import forms
|
from django import forms
|
||||||
@@ -10,13 +9,11 @@ from django.utils.translation import gettext_lazy as _
|
|||||||
from club.models import Club
|
from club.models import Club
|
||||||
from club.widgets.ajax_select import AutoCompleteSelectClub
|
from club.widgets.ajax_select import AutoCompleteSelectClub
|
||||||
from com.models import News, NewsDate, Poster
|
from com.models import News, NewsDate, Poster
|
||||||
|
from core.models import User
|
||||||
from core.utils import get_end_of_semester
|
from core.utils import get_end_of_semester
|
||||||
from core.views.forms import SelectDateTime
|
from core.views.forms import SelectDateTime
|
||||||
from core.views.widgets.markdown import MarkdownInput
|
from core.views.widgets.markdown import MarkdownInput
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from core.models import User
|
|
||||||
|
|
||||||
|
|
||||||
class PosterForm(forms.ModelForm):
|
class PosterForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|||||||
+3
-8
@@ -1,10 +1,11 @@
|
|||||||
from typing import TYPE_CHECKING
|
from pathlib import Path
|
||||||
|
|
||||||
from dateutil.relativedelta import relativedelta
|
from dateutil.relativedelta import relativedelta
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.sites.models import Site
|
from django.contrib.sites.models import Site
|
||||||
from django.contrib.syndication.views import add_domain
|
from django.contrib.syndication.views import add_domain
|
||||||
from django.db.models import Count, OuterRef, QuerySet, Subquery
|
from django.db.models import Count, OuterRef, QuerySet, Subquery
|
||||||
|
from django.http import HttpRequest
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from ical.calendar import Calendar
|
from ical.calendar import Calendar
|
||||||
@@ -13,13 +14,7 @@ from ical.event import Event
|
|||||||
from ical.types import Frequency, Recur
|
from ical.types import Frequency, Recur
|
||||||
|
|
||||||
from com.models import News, NewsDate
|
from com.models import News, NewsDate
|
||||||
|
from core.models import User
|
||||||
if TYPE_CHECKING:
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
from django.http import HttpRequest
|
|
||||||
|
|
||||||
from core.models import User
|
|
||||||
|
|
||||||
|
|
||||||
def as_absolute_url(url: str, request: HttpRequest | None = None) -> str:
|
def as_absolute_url(url: str, request: HttpRequest | None = None) -> str:
|
||||||
|
|||||||
+1
-1
@@ -1,13 +1,13 @@
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from typing import Annotated
|
from typing import Annotated
|
||||||
|
|
||||||
from aemark import markdown
|
|
||||||
from ninja import FilterLookup, FilterSchema, ModelSchema
|
from ninja import FilterLookup, FilterSchema, ModelSchema
|
||||||
from ninja_extra import service_resolver
|
from ninja_extra import service_resolver
|
||||||
from ninja_extra.context import RouteContext
|
from ninja_extra.context import RouteContext
|
||||||
|
|
||||||
from club.schemas import ClubProfileSchema
|
from club.schemas import ClubProfileSchema
|
||||||
from com.models import News, NewsDate
|
from com.models import News, NewsDate
|
||||||
|
from core.markdown import markdown
|
||||||
|
|
||||||
|
|
||||||
class NewsDateFilterSchema(FilterSchema):
|
class NewsDateFilterSchema(FilterSchema):
|
||||||
|
|||||||
@@ -1,9 +1,4 @@
|
|||||||
import {
|
import { Calendar, type EventClickArg, type EventContentArg } from "@fullcalendar/core";
|
||||||
Calendar,
|
|
||||||
type EventClickArg,
|
|
||||||
type EventContentArg,
|
|
||||||
type EventInput,
|
|
||||||
} from "@fullcalendar/core";
|
|
||||||
import type { EventImpl } from "@fullcalendar/core/internal";
|
import type { EventImpl } from "@fullcalendar/core/internal";
|
||||||
import enLocale from "@fullcalendar/core/locales/en-gb";
|
import enLocale from "@fullcalendar/core/locales/en-gb";
|
||||||
import frLocale from "@fullcalendar/core/locales/fr";
|
import frLocale from "@fullcalendar/core/locales/fr";
|
||||||
@@ -11,8 +6,8 @@ import dayGridPlugin from "@fullcalendar/daygrid";
|
|||||||
import iCalendarPlugin from "@fullcalendar/icalendar";
|
import iCalendarPlugin from "@fullcalendar/icalendar";
|
||||||
import listPlugin from "@fullcalendar/list";
|
import listPlugin from "@fullcalendar/list";
|
||||||
import { type HTMLTemplateResult, html, render } from "lit-html";
|
import { type HTMLTemplateResult, html, render } from "lit-html";
|
||||||
import { type GenericEndpoint, makeUrl } from "#core:utils/api";
|
import { makeUrl } from "#core:utils/api.ts";
|
||||||
import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
|
import { inheritHtmlElement, registerComponent } from "#core:utils/web-components.ts";
|
||||||
import {
|
import {
|
||||||
calendarCalendarInternal,
|
calendarCalendarInternal,
|
||||||
calendarCalendarUnpublished,
|
calendarCalendarUnpublished,
|
||||||
@@ -24,11 +19,11 @@ import {
|
|||||||
@registerComponent("ics-calendar")
|
@registerComponent("ics-calendar")
|
||||||
export class IcsCalendar extends inheritHtmlElement("div") {
|
export class IcsCalendar extends inheritHtmlElement("div") {
|
||||||
static observedAttributes = ["locale", "can_moderate", "can_delete", "ics-help-url"];
|
static observedAttributes = ["locale", "can_moderate", "can_delete", "ics-help-url"];
|
||||||
private calendar!: Calendar;
|
private calendar: Calendar;
|
||||||
private locale? = "en";
|
private locale = "en";
|
||||||
private canModerate? = false;
|
private canModerate = false;
|
||||||
private canDelete? = false;
|
private canDelete = false;
|
||||||
private helpUrl? = "";
|
private helpUrl = "";
|
||||||
|
|
||||||
// Hack variable to detect recurring events
|
// Hack variable to detect recurring events
|
||||||
// The underlying ics library doesn't include any info about rrules
|
// The underlying ics library doesn't include any info about rrules
|
||||||
@@ -40,12 +35,10 @@ export class IcsCalendar extends inheritHtmlElement("div") {
|
|||||||
this.locale = newValue;
|
this.locale = newValue;
|
||||||
}
|
}
|
||||||
if (name === "can_moderate") {
|
if (name === "can_moderate") {
|
||||||
this.canModerate =
|
this.canModerate = newValue.toLowerCase() === "true";
|
||||||
typeof newValue === "string" && newValue.toLowerCase() === "true";
|
|
||||||
}
|
}
|
||||||
if (name === "can_delete") {
|
if (name === "can_delete") {
|
||||||
this.canDelete =
|
this.canDelete = newValue.toLowerCase() === "true";
|
||||||
typeof newValue === "string" && newValue.toLowerCase() === "true";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (name === "ics-help-url") {
|
if (name === "ics-help-url") {
|
||||||
@@ -101,7 +94,7 @@ export class IcsCalendar extends inheritHtmlElement("div") {
|
|||||||
.toString()
|
.toString()
|
||||||
.split("/")
|
.split("/")
|
||||||
.filter((s) => s) // Remove blank characters
|
.filter((s) => s) // Remove blank characters
|
||||||
.pop() as string,
|
.pop(),
|
||||||
10,
|
10,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -166,7 +159,7 @@ export class IcsCalendar extends inheritHtmlElement("div") {
|
|||||||
this.refreshEvents();
|
this.refreshEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
async getEventSources(): Promise<EventInput[]> {
|
async getEventSources() {
|
||||||
const tagRecurringEvents = (eventData: EventImpl) => {
|
const tagRecurringEvents = (eventData: EventImpl) => {
|
||||||
// This functions tags events with a similar event url
|
// This functions tags events with a similar event url
|
||||||
// We rely on the fact that the event url is always the same
|
// We rely on the fact that the event url is always the same
|
||||||
@@ -180,14 +173,14 @@ export class IcsCalendar extends inheritHtmlElement("div") {
|
|||||||
};
|
};
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
url: `${await makeUrl(calendarCalendarInternal as GenericEndpoint)}`,
|
url: `${await makeUrl(calendarCalendarInternal)}`,
|
||||||
format: "ics",
|
format: "ics",
|
||||||
className: "internal",
|
className: "internal",
|
||||||
cache: false,
|
cache: false,
|
||||||
eventDataTransform: tagRecurringEvents,
|
eventDataTransform: tagRecurringEvents,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
url: `${await makeUrl(calendarCalendarUnpublished as GenericEndpoint)}`,
|
url: `${await makeUrl(calendarCalendarUnpublished)}`,
|
||||||
format: "ics",
|
format: "ics",
|
||||||
color: "red",
|
color: "red",
|
||||||
className: "unpublished",
|
className: "unpublished",
|
||||||
@@ -220,7 +213,7 @@ export class IcsCalendar extends inheritHtmlElement("div") {
|
|||||||
${event.title}
|
${event.title}
|
||||||
</h4>
|
</h4>
|
||||||
<span class="event-details-row-content">
|
<span class="event-details-row-content">
|
||||||
${this.formatDate(event.start as Date)} - ${this.formatDate(event.end as Date)}
|
${this.formatDate(event.start)} - ${this.formatDate(event.end)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
@@ -258,7 +251,7 @@ export class IcsCalendar extends inheritHtmlElement("div") {
|
|||||||
const buttons = [] as HTMLTemplateResult[];
|
const buttons = [] as HTMLTemplateResult[];
|
||||||
|
|
||||||
if (this.canModerate) {
|
if (this.canModerate) {
|
||||||
if (event.source?.internalEventSource.ui.classNames.includes("unpublished")) {
|
if (event.source.internalEventSource.ui.classNames.includes("unpublished")) {
|
||||||
const button = html`
|
const button = html`
|
||||||
<button class="btn btn-green" @click="${() => this.publishNews(newsId)}">
|
<button class="btn btn-green" @click="${() => this.publishNews(newsId)}">
|
||||||
<i class="fa fa-check"></i>${gettext("Publish")}
|
<i class="fa fa-check"></i>${gettext("Publish")}
|
||||||
@@ -345,9 +338,9 @@ export class IcsCalendar extends inheritHtmlElement("div") {
|
|||||||
button.classList.remove("text-copied");
|
button.classList.remove("text-copied");
|
||||||
}
|
}
|
||||||
button.setAttribute("tooltip", gettext("Link copied"));
|
button.setAttribute("tooltip", gettext("Link copied"));
|
||||||
await navigator.clipboard.writeText(
|
navigator.clipboard.writeText(
|
||||||
new URL(
|
new URL(
|
||||||
await makeUrl(calendarCalendarInternal as GenericEndpoint),
|
await makeUrl(calendarCalendarInternal),
|
||||||
window.location.origin,
|
window.location.origin,
|
||||||
).toString(),
|
).toString(),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,9 +1,4 @@
|
|||||||
import {
|
import { newsDeleteNews, newsFetchNewsDates, newsPublishNews } from "#openapi";
|
||||||
newsDeleteNews,
|
|
||||||
newsFetchNewsDates,
|
|
||||||
newsPublishNews,
|
|
||||||
type PaginatedResponseSchemaNewsDateSchema,
|
|
||||||
} from "#openapi";
|
|
||||||
|
|
||||||
// This will be used in jinja templates,
|
// This will be used in jinja templates,
|
||||||
// so we cannot use real enums as those are purely an abstraction of Typescript
|
// so we cannot use real enums as those are purely an abstraction of Typescript
|
||||||
@@ -69,8 +64,7 @@ document.addEventListener("alpine:init", () => {
|
|||||||
// biome-ignore lint/style/useNamingConvention: api is snake-case
|
// biome-ignore lint/style/useNamingConvention: api is snake-case
|
||||||
query: { news_id: this.newsId, page: 1, page_size: 1 },
|
query: { news_id: this.newsId, page: 1, page_size: 1 },
|
||||||
});
|
});
|
||||||
|
return response.data.count;
|
||||||
return (response.data as PaginatedResponseSchemaNewsDateSchema).count;
|
|
||||||
},
|
},
|
||||||
|
|
||||||
weeklyEventWarningMessage(nbEvents: number): string {
|
weeklyEventWarningMessage(nbEvents: number): string {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import { type NewsDateSchema, newsFetchNewsDates } from "#openapi";
|
import { type NewsDateSchema, newsFetchNewsDates } from "#openapi";
|
||||||
|
|
||||||
type ParsedNewsDateSchema = Omit<NewsDateSchema, "start_date" | "end_date"> & {
|
interface ParsedNewsDateSchema extends Omit<NewsDateSchema, "start_date" | "end_date"> {
|
||||||
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
||||||
start_date: Date;
|
start_date: Date;
|
||||||
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
||||||
end_date: Date;
|
end_date: Date;
|
||||||
};
|
}
|
||||||
|
|
||||||
document.addEventListener("alpine:init", () => {
|
document.addEventListener("alpine:init", () => {
|
||||||
Alpine.data("upcomingNewsLoader", (startDate: Date, locale: string) => ({
|
Alpine.data("upcomingNewsLoader", (startDate: Date, locale: string) => ({
|
||||||
@@ -32,11 +32,6 @@ document.addEventListener("alpine:init", () => {
|
|||||||
page_size: this.pageSize,
|
page_size: this.pageSize,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (response.response === undefined || response.data === undefined) {
|
|
||||||
// response may be undefined, because error may be
|
|
||||||
// from building the request object itself or from a network error
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (response.response.status === 404) {
|
if (response.response.status === 404) {
|
||||||
this.hasNext = false;
|
this.hasNext = false;
|
||||||
} else if (response.data.next === null) {
|
} else if (response.data.next === null) {
|
||||||
@@ -49,7 +44,7 @@ document.addEventListener("alpine:init", () => {
|
|||||||
this.loading = false;
|
this.loading = false;
|
||||||
},
|
},
|
||||||
|
|
||||||
groupedDates(): Record<string, ParsedNewsDateSchema[]> {
|
groupedDates(): Record<string, NewsDateSchema[]> {
|
||||||
return this.newsDates
|
return this.newsDates
|
||||||
.map(
|
.map(
|
||||||
(date: NewsDateSchema): ParsedNewsDateSchema => ({
|
(date: NewsDateSchema): ParsedNewsDateSchema => ({
|
||||||
|
|||||||
@@ -84,7 +84,6 @@
|
|||||||
font-size: 85%;
|
font-size: 85%;
|
||||||
|
|
||||||
#links_content {
|
#links_content {
|
||||||
overflow: auto;
|
|
||||||
box-shadow: $shadow-color 1px 1px 1px;
|
box-shadow: $shadow-color 1px 1px 1px;
|
||||||
min-height: 20em;
|
min-height: 20em;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
|
|||||||
@@ -39,18 +39,12 @@
|
|||||||
<a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a>
|
<a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a>
|
||||||
</div>
|
</div>
|
||||||
<h4>{{ news.title }}</h4>
|
<h4>{{ news.title }}</h4>
|
||||||
{% if date %}
|
<p class="date">
|
||||||
<p class="date">
|
<time datetime="{{ date.start_date.isoformat(timespec="seconds") }}">{{ date.start_date|localtime|date(DATETIME_FORMAT) }}
|
||||||
<time datetime="{{ date.start_date.isoformat(timespec="seconds") }}">
|
{{ date.start_date|localtime|time(DATETIME_FORMAT) }}</time> -
|
||||||
{{ date.start_date|localtime|date(DATETIME_FORMAT) }}
|
<time datetime="{{ date.end_date.isoformat(timespec="seconds") }}">{{ date.end_date|localtime|date(DATETIME_FORMAT) }}
|
||||||
{{ date.start_date|localtime|time(DATETIME_FORMAT) }}
|
{{ date.end_date|localtime|time(DATETIME_FORMAT) }}</time>
|
||||||
</time> -
|
</p>
|
||||||
<time datetime="{{ date.end_date.isoformat(timespec="seconds") }}">
|
|
||||||
{{ date.end_date|localtime|date(DATETIME_FORMAT) }}
|
|
||||||
{{ date.end_date|localtime|time(DATETIME_FORMAT) }}
|
|
||||||
</time>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
<div class="news_content">
|
<div class="news_content">
|
||||||
<div><em>{{ news.summary|markdown }}</em></div>
|
<div><em>{{ news.summary|markdown }}</em></div>
|
||||||
<br/>
|
<br/>
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
{% 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 %}AE UTBM{% 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('core/components/calendar.scss') }}">
|
||||||
|
|
||||||
{# Atom feed discovery, not really css but also goes there #}
|
{# Atom feed discovery, not really css but also goes there #}
|
||||||
<link rel="alternate" type="application/rss+xml" title="{% trans %}News feed{% endtrans %}" href="{{ url("com:news_feed") }}">
|
<link rel="alternate" type="application/rss+xml" title="{% trans %}News feed{% endtrans %}" href="{{ url("com:news_feed") }}">
|
||||||
@@ -213,6 +215,12 @@
|
|||||||
<i class="fa-solid fa-magnifying-glass fa-xl"></i>
|
<i class="fa-solid fa-magnifying-glass fa-xl"></i>
|
||||||
<a href="{{ url("matmat:search") }}">{% trans %}Matmatronch{% endtrans %}</a>
|
<a href="{{ url("matmat:search") }}">{% trans %}Matmatronch{% endtrans %}</a>
|
||||||
</li>
|
</li>
|
||||||
|
{% if user.has_perm("reservation.view_reservationslot") %}
|
||||||
|
<li>
|
||||||
|
<i class="fa-solid fa-thumbtack fa-xl"></i>
|
||||||
|
<a href="{{ url("reservation:main") }}">{% trans %}Room reservation{% endtrans %}</a>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
<li>
|
<li>
|
||||||
<i class="fa-solid fa-check-to-slot fa-xl"></i>
|
<i class="fa-solid fa-check-to-slot fa-xl"></i>
|
||||||
<a href="{{ url("election:list") }}">{% trans %}Elections{% endtrans %}</a>
|
<a href="{{ url("election:list") }}">{% trans %}Elections{% endtrans %}</a>
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from aemark import markdown
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth.models import Permission
|
from django.contrib.auth.models import Permission
|
||||||
|
from django.http import HttpResponse
|
||||||
from django.test import Client, TestCase
|
from django.test import Client, TestCase
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.timezone import now
|
from django.utils.timezone import now
|
||||||
@@ -14,11 +13,9 @@ from pytest_django.asserts import assertNumQueries
|
|||||||
|
|
||||||
from com.ics_calendar import IcsCalendar
|
from com.ics_calendar import IcsCalendar
|
||||||
from com.models import News, NewsDate
|
from com.models import News, NewsDate
|
||||||
|
from core.markdown import markdown
|
||||||
from core.models import User
|
from core.models import User
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.http import HttpResponse
|
|
||||||
|
|
||||||
|
|
||||||
def accel_redirect_to_file(response: HttpResponse) -> Path | None:
|
def accel_redirect_to_file(response: HttpResponse) -> Path | None:
|
||||||
redirect = Path(response.headers.get("X-Accel-Redirect", ""))
|
redirect = Path(response.headers.get("X-Accel-Redirect", ""))
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ from django.utils import html
|
|||||||
from django.utils.timezone import now
|
from django.utils.timezone import now
|
||||||
from django.utils.translation import gettext as _
|
from django.utils.translation import gettext as _
|
||||||
from model_bakery import baker
|
from model_bakery import baker
|
||||||
from model_bakery.recipe import Recipe
|
|
||||||
from pytest_django.asserts import assertNumQueries, assertRedirects
|
from pytest_django.asserts import assertNumQueries, assertRedirects
|
||||||
|
|
||||||
from club.models import Club, ClubRole, Membership
|
from club.models import Club, ClubRole, Membership
|
||||||
@@ -363,37 +362,3 @@ def test_moderate_poster(client: Client, referer: str | None):
|
|||||||
poster.refresh_from_db()
|
poster.refresh_from_db()
|
||||||
assert poster.is_moderated
|
assert poster.is_moderated
|
||||||
assert poster.moderator == user
|
assert poster.moderator == user
|
||||||
|
|
||||||
|
|
||||||
class TestNewsDetail(TestCase):
|
|
||||||
@classmethod
|
|
||||||
def setUpTestData(cls) -> None:
|
|
||||||
cls.news = baker.make(News, is_published=True)
|
|
||||||
cls.user = subscriber_user.make()
|
|
||||||
cls.url = reverse("com:news_detail", kwargs={"news_id": cls.news.id})
|
|
||||||
|
|
||||||
def test_page_ok(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
res = self.client.get(self.url)
|
|
||||||
assert res.status_code == 200
|
|
||||||
|
|
||||||
def test_displayed_date(self):
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
n = now()
|
|
||||||
date_recipe = Recipe(NewsDate, news=self.news)
|
|
||||||
date_recipe.make(
|
|
||||||
start_date=n - timedelta(days=1, hours=6), end_date=n - timedelta(days=1)
|
|
||||||
)
|
|
||||||
date_recipe.make(
|
|
||||||
start_date=n - timedelta(hours=6), end_date=n + timedelta(hours=1)
|
|
||||||
)
|
|
||||||
expected = date_recipe.make( # we expect the next happening date.
|
|
||||||
start_date=n + timedelta(days=1), end_date=n + timedelta(days=1, hours=1)
|
|
||||||
)
|
|
||||||
date_recipe.make(
|
|
||||||
start_date=n + timedelta(days=2), end_date=n + timedelta(days=2, hours=1)
|
|
||||||
)
|
|
||||||
self.client.force_login(self.user)
|
|
||||||
res = self.client.get(self.url)
|
|
||||||
assert res.status_code == 200
|
|
||||||
assert res.context_data["date"] == expected
|
|
||||||
+2
-4
@@ -170,7 +170,7 @@ class NewsUpdateView(PermissionOrAuthorRequiredMixin, UpdateView):
|
|||||||
form_class = NewsForm
|
form_class = NewsForm
|
||||||
template_name = "com/news_edit.jinja"
|
template_name = "com/news_edit.jinja"
|
||||||
pk_url_kwarg = "news_id"
|
pk_url_kwarg = "news_id"
|
||||||
permission_required = "com.change_news"
|
permission_required = "com.edit_news"
|
||||||
|
|
||||||
def form_valid(self, form):
|
def form_valid(self, form):
|
||||||
response = super().form_valid(form) # Does the saving part
|
response = super().form_valid(form) # Does the saving part
|
||||||
@@ -301,9 +301,7 @@ class NewsDetailView(CanViewMixin, DetailView):
|
|||||||
queryset = News.objects.select_related("club", "author", "moderator")
|
queryset = News.objects.select_related("club", "author", "moderator")
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
return super().get_context_data(**kwargs) | {
|
return super().get_context_data(**kwargs) | {"date": self.object.dates.first()}
|
||||||
"date": self.object.dates.filter(start_date__gt=now()).first()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class NewsFeed(Feed):
|
class NewsFeed(Feed):
|
||||||
|
|||||||
+13
-3
@@ -1,8 +1,9 @@
|
|||||||
from typing import Annotated, Literal
|
from typing import Annotated, Any, Literal
|
||||||
|
|
||||||
from annotated_types import Ge, Le, MinLen
|
from annotated_types import Ge, Le, MinLen
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.db.models import F
|
from django.db.models import F
|
||||||
|
from django.http import HttpResponse
|
||||||
from ninja import File, Query
|
from ninja import File, Query
|
||||||
from ninja.security import SessionAuth
|
from ninja.security import SessionAuth
|
||||||
from ninja_extra import ControllerBase, api_controller, paginate, route
|
from ninja_extra import ControllerBase, api_controller, paginate, route
|
||||||
@@ -17,6 +18,7 @@ from core.models import Group, QuickUploadImage, SithFile, User
|
|||||||
from core.schemas import (
|
from core.schemas import (
|
||||||
FamilyGodfatherSchema,
|
FamilyGodfatherSchema,
|
||||||
GroupSchema,
|
GroupSchema,
|
||||||
|
MarkdownSchema,
|
||||||
SithFileSchema,
|
SithFileSchema,
|
||||||
UploadedFileSchema,
|
UploadedFileSchema,
|
||||||
UploadedImage,
|
UploadedImage,
|
||||||
@@ -24,18 +26,26 @@ from core.schemas import (
|
|||||||
UserFilterSchema,
|
UserFilterSchema,
|
||||||
UserProfileSchema,
|
UserProfileSchema,
|
||||||
UserSchema,
|
UserSchema,
|
||||||
ValidationErrorSchema,
|
|
||||||
)
|
)
|
||||||
|
from core.templatetags.renderer import markdown
|
||||||
from counter.utils import is_logged_in_counter
|
from counter.utils import is_logged_in_counter
|
||||||
|
|
||||||
|
|
||||||
|
@api_controller("/markdown")
|
||||||
|
class MarkdownController(ControllerBase):
|
||||||
|
@route.post("", url_name="markdown")
|
||||||
|
def render_markdown(self, body: MarkdownSchema):
|
||||||
|
"""Convert the markdown text into html."""
|
||||||
|
return HttpResponse(markdown(body.text), content_type="text/html")
|
||||||
|
|
||||||
|
|
||||||
@api_controller("/upload")
|
@api_controller("/upload")
|
||||||
class UploadController(ControllerBase):
|
class UploadController(ControllerBase):
|
||||||
@route.post(
|
@route.post(
|
||||||
"/image",
|
"/image",
|
||||||
response={
|
response={
|
||||||
200: UploadedFileSchema,
|
200: UploadedFileSchema,
|
||||||
422: ValidationErrorSchema,
|
422: dict[Literal["detail"], list[dict[str, Any]]],
|
||||||
403: dict[Literal["detail"], str],
|
403: dict[Literal["detail"], str],
|
||||||
},
|
},
|
||||||
permissions=[HasPerm("core.add_quickuploadimage")],
|
permissions=[HasPerm("core.add_quickuploadimage")],
|
||||||
|
|||||||
+4
-55
@@ -1,16 +1,15 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import typing
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth.backends import ModelBackend
|
from django.contrib.auth.backends import ModelBackend
|
||||||
from django.contrib.auth.models import Permission
|
from django.contrib.auth.models import Permission
|
||||||
from django.db.models import Exists, OuterRef, Q, QuerySet
|
|
||||||
|
|
||||||
from core.models import Group, User
|
from core.models import Group
|
||||||
|
|
||||||
if typing.TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from django.db.models.base import Model
|
from core.models import User
|
||||||
|
|
||||||
|
|
||||||
class SithModelBackend(ModelBackend):
|
class SithModelBackend(ModelBackend):
|
||||||
@@ -41,53 +40,3 @@ class SithModelBackend(ModelBackend):
|
|||||||
return Permission.objects.filter(
|
return Permission.objects.filter(
|
||||||
group__group__in=groups.values_list("pk", flat=True)
|
group__group__in=groups.values_list("pk", flat=True)
|
||||||
)
|
)
|
||||||
|
|
||||||
@typing.override
|
|
||||||
def with_perm(
|
|
||||||
self,
|
|
||||||
perm: str | Permission,
|
|
||||||
is_active: bool | None = True,
|
|
||||||
include_superusers: bool = False,
|
|
||||||
obj: Model | None = None,
|
|
||||||
) -> QuerySet[User]:
|
|
||||||
"""Return users that have permission "perm".
|
|
||||||
|
|
||||||
Contrary to the base django method, superusers aren't included in the
|
|
||||||
result.
|
|
||||||
This is because the OR operation to include superusers in the query result
|
|
||||||
utterly destroy the query performances on postgres
|
|
||||||
(it makes it like 1000x slower, and I'm not even kidding).
|
|
||||||
To overcome that, we could use a UNION instead, but then we wouldn't
|
|
||||||
be able to perform further filter operations on the queryset.
|
|
||||||
Thus, the `include_superusers` argument is not used at all.
|
|
||||||
|
|
||||||
Because of that, it is useless to set `include_superusers`,
|
|
||||||
as it will be silently ignored.
|
|
||||||
The only reason it's still there is not to break the interface
|
|
||||||
of the base class.
|
|
||||||
"""
|
|
||||||
if isinstance(perm, str):
|
|
||||||
try:
|
|
||||||
app_label, codename = perm.split(".")
|
|
||||||
except ValueError as e:
|
|
||||||
raise ValueError(
|
|
||||||
"Permission name should be in the form "
|
|
||||||
"app_label.permission_codename."
|
|
||||||
) from e
|
|
||||||
permission_q = Q(codename=codename, content_type__app_label=app_label)
|
|
||||||
elif isinstance(perm, Permission):
|
|
||||||
permission_q = Q(pk=perm.pk)
|
|
||||||
else:
|
|
||||||
raise TypeError(
|
|
||||||
"The `perm` argument must be a string or a permission instance."
|
|
||||||
)
|
|
||||||
|
|
||||||
user_q = Exists(
|
|
||||||
Permission.objects.filter(
|
|
||||||
Q(group__group__users=OuterRef("pk")) | Q(user=OuterRef("pk")),
|
|
||||||
permission_q,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if is_active is not None:
|
|
||||||
user_q &= Q(is_active=is_active)
|
|
||||||
return User.objects.filter(user_q)
|
|
||||||
+8
-11
@@ -1,16 +1,19 @@
|
|||||||
from django.urls.converters import IntConverter, StringConverter
|
class FourDigitYearConverter:
|
||||||
|
|
||||||
|
|
||||||
class FourDigitYearConverter(IntConverter):
|
|
||||||
regex = "[0-9]{4}"
|
regex = "[0-9]{4}"
|
||||||
|
|
||||||
|
def to_python(self, value):
|
||||||
|
return int(value)
|
||||||
|
|
||||||
def to_url(self, value):
|
def to_url(self, value):
|
||||||
return str(value).zfill(4)
|
return str(value).zfill(4)
|
||||||
|
|
||||||
|
|
||||||
class TwoDigitMonthConverter(IntConverter):
|
class TwoDigitMonthConverter:
|
||||||
regex = "[0-9]{2}"
|
regex = "[0-9]{2}"
|
||||||
|
|
||||||
|
def to_python(self, value):
|
||||||
|
return int(value)
|
||||||
|
|
||||||
def to_url(self, value):
|
def to_url(self, value):
|
||||||
return str(value).zfill(2)
|
return str(value).zfill(2)
|
||||||
|
|
||||||
@@ -25,9 +28,3 @@ class BooleanStringConverter:
|
|||||||
|
|
||||||
def to_url(self, value):
|
def to_url(self, value):
|
||||||
return str(value)
|
return str(value)
|
||||||
|
|
||||||
|
|
||||||
class ResultConverter(StringConverter):
|
|
||||||
"""Converter whose regex match either "success" or "failure"."""
|
|
||||||
|
|
||||||
regex = "(success|failure)"
|
|
||||||
+36
-35
@@ -2,9 +2,12 @@
|
|||||||
<h1>Markdown-AE Documentation</h1>
|
<h1>Markdown-AE Documentation</h1>
|
||||||
<p>Le Markdown le plus standard se trouve documenté ici:
|
<p>Le Markdown le plus standard se trouve documenté ici:
|
||||||
<a href="https://www.markdownguide.org/basic-syntax">https://www.markdownguide.org/basic-syntax</a>.<br />
|
<a href="https://www.markdownguide.org/basic-syntax">https://www.markdownguide.org/basic-syntax</a>.<br />
|
||||||
Si cette page n’est pas exhaustive vis à vis de la syntaxe du site AE,
|
Si cette page n'est pas exhaustive vis à vis de la syntaxe du site AE,
|
||||||
elle a au moins le mérite de bien documenter le Markdown original.</p>
|
elle a au moins le mérite de bien documenter le Markdown original.</p>
|
||||||
<p>Le réel parseur du site AE est une version tunée de <a href="https://github.com/kivikakk/comrak">comrak</a>.</p>
|
<p>Le réel parseur du site AE est une version tunée de <a href="https://github.com/lepture/mistune">mistune</a>.<br />
|
||||||
|
Les plus aventureux pourront aller lire ses <a href="https://github.com/lepture/mistune/blob/master/tests/fixtures">tests</a>
|
||||||
|
afin d'en connaître la syntaxe le plus finement possible.<br />
|
||||||
|
En pratique, cette page devrait déjà résumer une bonne partie.</p>
|
||||||
<h2>Basique</h2>
|
<h2>Basique</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Mettre le texte en <strong>gras</strong> : <code>**texte**</code></li>
|
<li>Mettre le texte en <strong>gras</strong> : <code>**texte**</code></li>
|
||||||
@@ -12,8 +15,8 @@ elle a au moins le mérite de bien documenter le Markdown original.</p>
|
|||||||
<li><u>Souligner</u> le texte : <code>__texte__</code></li>
|
<li><u>Souligner</u> le texte : <code>__texte__</code></li>
|
||||||
<li><del>Barrer du texte</del> : <code>~~texte~~</code></li>
|
<li><del>Barrer du texte</del> : <code>~~texte~~</code></li>
|
||||||
<li>On peut bien sûr tout <del><em><strong><u>combiner</u></strong></em></del> : <code>~~***__texte__***~~</code></li>
|
<li>On peut bien sûr tout <del><em><strong><u>combiner</u></strong></em></del> : <code>~~***__texte__***~~</code></li>
|
||||||
<li>Mettre du texte<sup>en exposant</sup> : <code><sup>texte</sup></code></li>
|
<li>Mettre du texte^en exposant^ : <code><sup>texte</sup></code></li>
|
||||||
<li>Mettre du texte<sub>en indice</sub> : <code><sub>texte</sub></code></li>
|
<li>Mettre du texte~en indice~ : <code><sub>texte</sub></code></li>
|
||||||
</ul>
|
</ul>
|
||||||
<h2>Liens</h2>
|
<h2>Liens</h2>
|
||||||
<ul>
|
<ul>
|
||||||
@@ -25,10 +28,10 @@ elle a au moins le mérite de bien documenter le Markdown original.</p>
|
|||||||
</ul>
|
</ul>
|
||||||
<p><a href="http://www.site.com">nom du lien</a></p>
|
<p><a href="http://www.site.com">nom du lien</a></p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Les liens peuvent être internes au site de l’AE, on peut dès lors éviter d’entrer
|
<li>Les liens peuvent être internes au site de l'AE, on peut dès lors éviter d'entrer
|
||||||
l’adresse complète d’une page : <code>[nom du lien](page://nomDeLaPage)</code></li>
|
l'adresse complète d'une page : <code>[nom du lien](page://nomDeLaPage)</code></li>
|
||||||
</ul>
|
</ul>
|
||||||
<p><a href="/page/nomDeLaPage">nom du lien</a></p>
|
<p><a href="/page/nomDeLaPage/">nom du lien</a></p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>On peut également utiliser une image pour les liens :
|
<li>On peut également utiliser une image pour les liens :
|
||||||
<code>[nom du lien](options)</code></li>
|
<code>[nom du lien](options)</code></li>
|
||||||
@@ -91,25 +94,25 @@ etc...
|
|||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Titre</th>
|
<th>Titre</th>
|
||||||
<th>Titre2</th>
|
<th>Titre2</th>
|
||||||
<th>Titre3</th>
|
<th>Titre3</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td>test</td>
|
<td>test</td>
|
||||||
<td>test</td>
|
<td>test</td>
|
||||||
<td>test</td>
|
<td>test</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>test</td>
|
<td>test</td>
|
||||||
<td>test</td>
|
<td>test</td>
|
||||||
<td>test</td>
|
<td>test</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<p>L’alignement dans les cellules est géré comme suit, avec les ‘:’ sur la ligne en dessous du titre:</p>
|
<p>L'alignement dans les cellules est géré comme suit, avec les ':' sur la ligne en dessous du titre:</p>
|
||||||
<pre><code>| Titre | Titre2 | Titre3 |
|
<pre><code>| Titre | Titre2 | Titre3 |
|
||||||
|:-------|:------:|-------:|
|
|:-------|:------:|-------:|
|
||||||
| gauche | centre | droite |
|
| gauche | centre | droite |
|
||||||
@@ -117,16 +120,16 @@ etc...
|
|||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th align="left">Titre</th>
|
<th style="text-align:left">Titre</th>
|
||||||
<th align="center">Titre2</th>
|
<th style="text-align:center">Titre2</th>
|
||||||
<th align="right">Titre3</th>
|
<th style="text-align:right">Titre3</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="left">gauche</td>
|
<td style="text-align:left">gauche</td>
|
||||||
<td align="center">centre</td>
|
<td style="text-align:center">centre</td>
|
||||||
<td align="right">droite</td>
|
<td style="text-align:right">droite</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@@ -138,11 +141,11 @@ etc...
|
|||||||

|

|
||||||

|

|
||||||
</code></pre>
|
</code></pre>
|
||||||
<p><img src="/static/core/img/logo.png" style="width:50%" alt="image à 50%" title="Image à 50%" /><br />
|
<p><img src="/static/core/img/logo.png" alt="image à 50%" title="Image à 50%" style="width:50%;" /><br />
|
||||||
Image à 50% de la largeur de la page.</p>
|
Image à 50% de la largeur de la page.</p>
|
||||||
<p><img src="/static/core/img/logo.png" style="width:350px" alt="image de 350 pixels de large" title="Image de 350 pixels" /><br />
|
<p><img src="/static/core/img/logo.png" alt="image de 350 pixels de large" title="Image de 350 pixels" style="width:350px;" /><br />
|
||||||
Image de 350 pixels de large.</p>
|
Image de 350 pixels de large.</p>
|
||||||
<p><img src="/static/core/img/logo.png" style="width:350px;height:100px" alt="image de 350x100 pixels" title="Image de 350x100 pixels" /><br />
|
<p><img src="/static/core/img/logo.png" alt="image de 350x100 pixels" title="Image de 350x100 pixels" style="width:350px;height:100px;" /><br />
|
||||||
Image de 350x100 pixels.</p>
|
Image de 350x100 pixels.</p>
|
||||||
<p>(devrait pouvoir détecter si vidéo ou non)</p>
|
<p>(devrait pouvoir détecter si vidéo ou non)</p>
|
||||||
<h2>Blocs de citations</h2>
|
<h2>Blocs de citations</h2>
|
||||||
@@ -156,9 +159,9 @@ Image de 350x100 pixels.</p>
|
|||||||
un bloc de
|
un bloc de
|
||||||
citation</p>
|
citation</p>
|
||||||
</blockquote>
|
</blockquote>
|
||||||
<p>Il est possible d’intégrer de la syntaxe Markdown-AE dans un tel bloc.</p>
|
<p>Il est possible d'intégrer de la syntaxe Markdown-AE dans un tel bloc.</p>
|
||||||
<h2>Note de bas de page</h2>
|
<h2>Note de bas de page</h2>
|
||||||
<p>On les crée comme ça<sup class="footnote-ref"><a href="#fn-key" id="fnref-key" data-footnote-ref>1</a></sup>:</p>
|
<p>On les crée comme ça<sup class="footnote-ref" id="fnref-1"><a href="#fn-1">1</a></sup>:</p>
|
||||||
<pre><code>Je fais une note[^clef].
|
<pre><code>Je fais une note[^clef].
|
||||||
|
|
||||||
[^clef]: je note ensuite où je veux le contenu de ma clef qui apparaîtra quand même en bas
|
[^clef]: je note ensuite où je veux le contenu de ma clef qui apparaîtra quand même en bas
|
||||||
@@ -172,15 +175,13 @@ citation</p>
|
|||||||
</code></pre>
|
</code></pre>
|
||||||
<h2>Échapper des caractères</h2>
|
<h2>Échapper des caractères</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Il est possible d’ignorer un caractère spécial en l’échappant à l’aide d’un \</li>
|
<li>Il est possible d'ignorer un caractère spécial en l'échappant à l'aide d'un \</li>
|
||||||
<li>L’échappement de blocs de codes complet se fera à l’aide de balises <nosyntax></nosyntax></li>
|
<li>L'échappement de blocs de codes complet se fera à l'aide de balises <nosyntax></nosyntax></li>
|
||||||
</ul>
|
</ul>
|
||||||
<h2>Autres (hérité de l’ancien wiki)</h2>
|
<h2>Autres (hérité de l'ancien wiki)</h2>
|
||||||
<p>Une ligne peut être créée avec une ligne contenant 4 tirets (<code>----</code>).</p>
|
<p>Une ligne peut être créée avec une ligne contenant 4 tirets (<code>----</code>).</p>
|
||||||
<section class="footnotes" data-footnotes>
|
<section class="footnotes">
|
||||||
<ol>
|
<ol>
|
||||||
<li id="fn-key">
|
<li id="fn-1"><p>ceci est le contenu de ma clef<a href="#fnref-1" class="footnote">↩</a></p></li>
|
||||||
<p>ceci est le contenu de ma clef <a href="#fnref-key" class="footnote-backref" data-footnote-backref data-footnote-backref-idx="1" aria-label="Back to reference 1">↩</a></p>
|
|
||||||
</li>
|
|
||||||
</ol>
|
</ol>
|
||||||
</section>
|
</section>
|
||||||
@@ -7,7 +7,10 @@ https://www.markdownguide.org/basic-syntax.
|
|||||||
Si cette page n'est pas exhaustive vis à vis de la syntaxe du site AE,
|
Si cette page n'est pas exhaustive vis à vis de la syntaxe du site AE,
|
||||||
elle a au moins le mérite de bien documenter le Markdown original.
|
elle a au moins le mérite de bien documenter le Markdown original.
|
||||||
|
|
||||||
Le réel parseur du site AE est une version tunée de [comrak](https://github.com/kivikakk/comrak).
|
Le réel parseur du site AE est une version tunée de [mistune](https://github.com/lepture/mistune).
|
||||||
|
Les plus aventureux pourront aller lire ses [tests](https://github.com/lepture/mistune/blob/master/tests/fixtures)
|
||||||
|
afin d'en connaître la syntaxe le plus finement possible.
|
||||||
|
En pratique, cette page devrait déjà résumer une bonne partie.
|
||||||
|
|
||||||
## Basique
|
## Basique
|
||||||
|
|
||||||
|
|||||||
@@ -22,10 +22,11 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
from aemark import markdown
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.management.base import BaseCommand
|
from django.core.management.base import BaseCommand
|
||||||
|
|
||||||
|
from core.markdown import markdown
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
help = "Output the fully rendered SYNTAX.md file"
|
help = "Output the fully rendered SYNTAX.md file"
|
||||||
|
|||||||
@@ -20,8 +20,7 @@
|
|||||||
# Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
import itertools
|
from datetime import date, timedelta
|
||||||
from datetime import date, datetime, timedelta
|
|
||||||
from io import StringIO
|
from io import StringIO
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import ClassVar, NamedTuple
|
from typing import ClassVar, NamedTuple
|
||||||
@@ -34,8 +33,7 @@ from django.core.management.base import BaseCommand
|
|||||||
from django.db import connection
|
from django.db import connection
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.utils.lorem_ipsum import paragraphs
|
from django.utils.timezone import localdate
|
||||||
from django.utils.timezone import localdate, now
|
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
|
|
||||||
from club.models import Club, ClubLink, ClubRole, LinkType, Membership
|
from club.models import Club, ClubLink, ClubRole, LinkType, Membership
|
||||||
@@ -45,14 +43,13 @@ from core.models import BanGroup, Group, Page, PageRev, SithFile, User
|
|||||||
from core.utils import resize_image
|
from core.utils import resize_image
|
||||||
from counter.models import (
|
from counter.models import (
|
||||||
Counter,
|
Counter,
|
||||||
CounterSellers,
|
|
||||||
Price,
|
Price,
|
||||||
Product,
|
Product,
|
||||||
ProductType,
|
ProductType,
|
||||||
ReturnableProduct,
|
ReturnableProduct,
|
||||||
StudentCard,
|
StudentCard,
|
||||||
)
|
)
|
||||||
from election.models import Candidature, Election, ElectionList, Role, Vote
|
from election.models import Candidature, Election, ElectionList, Role
|
||||||
from forum.models import Forum
|
from forum.models import Forum
|
||||||
from pedagogy.models import UE
|
from pedagogy.models import UE
|
||||||
from sas.models import Album, PeoplePictureRelation, Picture
|
from sas.models import Album, PeoplePictureRelation, Picture
|
||||||
@@ -121,6 +118,11 @@ class Command(BaseCommand):
|
|||||||
)
|
)
|
||||||
self.profiles_root = SithFile.objects.create(name="profiles", owner=root)
|
self.profiles_root = SithFile.objects.create(name="profiles", owner=root)
|
||||||
home_root = SithFile.objects.create(name="users", owner=root)
|
home_root = SithFile.objects.create(name="users", owner=root)
|
||||||
|
|
||||||
|
# Page needed for club creation
|
||||||
|
p = Page(name=settings.SITH_CLUB_ROOT_PAGE)
|
||||||
|
p.save(force_lock=True)
|
||||||
|
|
||||||
club_root = SithFile.objects.create(name="clubs", owner=root)
|
club_root = SithFile.objects.create(name="clubs", owner=root)
|
||||||
sas = SithFile.objects.create(
|
sas = SithFile.objects.create(
|
||||||
name="SAS", owner=root, id=settings.SITH_SAS_ROOT_DIR_ID
|
name="SAS", owner=root, id=settings.SITH_SAS_ROOT_DIR_ID
|
||||||
@@ -252,7 +254,6 @@ class Command(BaseCommand):
|
|||||||
date_of_birth="1942-06-12",
|
date_of_birth="1942-06-12",
|
||||||
password="plop",
|
password="plop",
|
||||||
)
|
)
|
||||||
User.objects.all().update(cgu_approved_at=now())
|
|
||||||
User.groups.through.objects.bulk_create(
|
User.groups.through.objects.bulk_create(
|
||||||
[
|
[
|
||||||
User.groups.through(group=groups.counter_admin, user=counter),
|
User.groups.through(group=groups.counter_admin, user=counter),
|
||||||
@@ -276,7 +277,34 @@ class Command(BaseCommand):
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
self._create_pages(groups)
|
# Adding syntax help page
|
||||||
|
syntax_page = Page(name="Aide_sur_la_syntaxe")
|
||||||
|
syntax_page.save(force_lock=True)
|
||||||
|
PageRev.objects.create(
|
||||||
|
page=syntax_page,
|
||||||
|
title="Aide sur la syntaxe",
|
||||||
|
author=skia,
|
||||||
|
content=(self.ROOT_PATH / "core" / "fixtures" / "SYNTAX.md").read_text(),
|
||||||
|
)
|
||||||
|
services_page = Page(name="Services")
|
||||||
|
services_page.save(force_lock=True)
|
||||||
|
PageRev.objects.create(
|
||||||
|
page=services_page,
|
||||||
|
title="Services",
|
||||||
|
author=skia,
|
||||||
|
content="- [Eboutic](/eboutic)\n- Matmat\n- SAS\n- Weekmail\n- Forum",
|
||||||
|
)
|
||||||
|
|
||||||
|
index_page = Page(name="Index")
|
||||||
|
index_page.save(force_lock=True)
|
||||||
|
PageRev.objects.create(
|
||||||
|
page=index_page,
|
||||||
|
title="Wiki index",
|
||||||
|
author=root,
|
||||||
|
content="Welcome to the wiki page!",
|
||||||
|
)
|
||||||
|
|
||||||
|
groups.public.viewable_page.set([syntax_page, services_page, index_page])
|
||||||
|
|
||||||
self._create_subscription(root)
|
self._create_subscription(root)
|
||||||
self._create_subscription(skia)
|
self._create_subscription(skia)
|
||||||
@@ -336,15 +364,62 @@ class Command(BaseCommand):
|
|||||||
Counter.objects.create(name="Carte AE", club=clubs.refound, type="OFFICE")
|
Counter.objects.create(name="Carte AE", club=clubs.refound, type="OFFICE")
|
||||||
|
|
||||||
# Add barman to counter
|
# Add barman to counter
|
||||||
CounterSellers.objects.bulk_create(
|
Counter.sellers.through.objects.bulk_create(
|
||||||
[
|
[
|
||||||
CounterSellers(counter_id=1, user=skia, is_regular=True), # MDE
|
Counter.sellers.through(counter_id=1, user=skia), # MDE
|
||||||
CounterSellers(counter_id=2, user=krophil, is_regular=True), # Foyer
|
Counter.sellers.through(counter_id=2, user=krophil), # Foyer
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create an election
|
# Create an election
|
||||||
self._create_elections(groups, clubs, skia, sli, krophil)
|
el = Election.objects.create(
|
||||||
|
title="Élection 2017",
|
||||||
|
description="La roue tourne",
|
||||||
|
start_candidature="1942-06-12 10:28:45+01",
|
||||||
|
end_candidature="2042-06-12 10:28:45+01",
|
||||||
|
start_date="1942-06-12 10:28:45+01",
|
||||||
|
end_date="7942-06-12 10:28:45+01",
|
||||||
|
)
|
||||||
|
el.view_groups.add(groups.public)
|
||||||
|
el.edit_groups.add(clubs.ae.board_group)
|
||||||
|
el.candidature_groups.add(groups.subscribers)
|
||||||
|
el.vote_groups.add(groups.subscribers)
|
||||||
|
liste = ElectionList.objects.create(title="Candidature Libre", election=el)
|
||||||
|
listeT = ElectionList.objects.create(title="Troll", election=el)
|
||||||
|
pres = Role.objects.create(
|
||||||
|
election=el, title="Président AE", description="Roi de l'AE"
|
||||||
|
)
|
||||||
|
resp = Role.objects.create(
|
||||||
|
election=el, title="Co Respo Info", max_choice=2, description="Ghetto++"
|
||||||
|
)
|
||||||
|
Candidature.objects.bulk_create(
|
||||||
|
[
|
||||||
|
Candidature(
|
||||||
|
role=resp,
|
||||||
|
user=skia,
|
||||||
|
election_list=liste,
|
||||||
|
program="Refesons le site AE",
|
||||||
|
),
|
||||||
|
Candidature(
|
||||||
|
role=resp,
|
||||||
|
user=sli,
|
||||||
|
election_list=liste,
|
||||||
|
program="Vasy je deviens mon propre adjoint",
|
||||||
|
),
|
||||||
|
Candidature(
|
||||||
|
role=resp,
|
||||||
|
user=krophil,
|
||||||
|
election_list=listeT,
|
||||||
|
program="Le Pôle Troll !",
|
||||||
|
),
|
||||||
|
Candidature(
|
||||||
|
role=pres,
|
||||||
|
user=sli,
|
||||||
|
election_list=listeT,
|
||||||
|
program="En fait j'aime pas l'info, je voulais faire GMC",
|
||||||
|
),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
# Forum
|
# Forum
|
||||||
room = Forum.objects.create(
|
room = Forum.objects.create(
|
||||||
@@ -547,48 +622,6 @@ class Command(BaseCommand):
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
def _create_pages(self, groups: PopulatedGroups):
|
|
||||||
pages = Page.objects.bulk_create(
|
|
||||||
[Page(name=s, _full_name=s) for s in settings.SITH_CGU_PAGE.split("/")]
|
|
||||||
)
|
|
||||||
for parent, son in itertools.pairwise(pages):
|
|
||||||
son.parent = parent
|
|
||||||
son.save(force_lock=True)
|
|
||||||
cgu_page = pages[-1]
|
|
||||||
|
|
||||||
syntax_page = Page(name="Aide_sur_la_syntaxe")
|
|
||||||
syntax_page.save(force_lock=True)
|
|
||||||
services_page = Page(name="Services")
|
|
||||||
services_page.save(force_lock=True)
|
|
||||||
index_page = Page(name="Index")
|
|
||||||
index_page.save(force_lock=True)
|
|
||||||
|
|
||||||
page_revs = [
|
|
||||||
PageRev(page=cgu_page, title="Règlement informatique", content=""),
|
|
||||||
PageRev(
|
|
||||||
page=syntax_page,
|
|
||||||
title="Aide sur la syntaxe",
|
|
||||||
content=(
|
|
||||||
self.ROOT_PATH / "core" / "fixtures" / "SYNTAX.md"
|
|
||||||
).read_text(),
|
|
||||||
),
|
|
||||||
PageRev(
|
|
||||||
page=services_page,
|
|
||||||
title="Services",
|
|
||||||
content="- [Eboutic](/eboutic)\n- Matmat\n- SAS\n- Weekmail\n- Forum",
|
|
||||||
),
|
|
||||||
PageRev(
|
|
||||||
page=index_page, title="Wiki index", content="Welcome to the wiki page!"
|
|
||||||
),
|
|
||||||
]
|
|
||||||
for rev in page_revs:
|
|
||||||
rev.author_id = settings.SITH_ROOT_USER_ID
|
|
||||||
rev.revision = 1
|
|
||||||
PageRev.objects.bulk_create(page_revs)
|
|
||||||
groups.public.viewable_page.set(
|
|
||||||
[syntax_page, services_page, index_page, cgu_page]
|
|
||||||
)
|
|
||||||
|
|
||||||
def _create_products(self, groups: PopulatedGroups, clubs: PopulatedClubs):
|
def _create_products(self, groups: PopulatedGroups, clubs: PopulatedClubs):
|
||||||
beers_type, cotis_type, refill_type, verre_type = (
|
beers_type, cotis_type, refill_type, verre_type = (
|
||||||
ProductType.objects.bulk_create(
|
ProductType.objects.bulk_create(
|
||||||
@@ -749,10 +782,6 @@ class Command(BaseCommand):
|
|||||||
s.save()
|
s.save()
|
||||||
|
|
||||||
def _create_clubs(self) -> PopulatedClubs:
|
def _create_clubs(self) -> PopulatedClubs:
|
||||||
# Page needed for club creation
|
|
||||||
p = Page(name=settings.SITH_CLUB_ROOT_PAGE)
|
|
||||||
p.save(force_lock=True)
|
|
||||||
|
|
||||||
ae = Club.objects.create(
|
ae = Club.objects.create(
|
||||||
id=1, name="AE", address="6 Boulevard Anatole France, 90000 Belfort"
|
id=1, name="AE", address="6 Boulevard Anatole France, 90000 Belfort"
|
||||||
)
|
)
|
||||||
@@ -763,7 +792,6 @@ class Command(BaseCommand):
|
|||||||
"add_subscription",
|
"add_subscription",
|
||||||
"add_membership",
|
"add_membership",
|
||||||
"view_hidden_user",
|
"view_hidden_user",
|
||||||
"add_refilling",
|
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -864,7 +892,11 @@ class Command(BaseCommand):
|
|||||||
|
|
||||||
subscribers = Group.objects.create(name="Cotisants")
|
subscribers = Group.objects.create(name="Cotisants")
|
||||||
subscribers.permissions.add(
|
subscribers.permissions.add(
|
||||||
*list(perms.filter(codename__in=["add_news", "add_uecomment"]))
|
*list(
|
||||||
|
perms.filter(
|
||||||
|
codename__in=["add_news", "add_uecomment", "view_reservationslot"]
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
old_subscribers = Group.objects.create(name="Anciens cotisants")
|
old_subscribers = Group.objects.create(name="Anciens cotisants")
|
||||||
old_subscribers.permissions.add(
|
old_subscribers.permissions.add(
|
||||||
@@ -982,132 +1014,3 @@ class Command(BaseCommand):
|
|||||||
BanGroup.objects.create(name="Banned from buying alcohol", description="")
|
BanGroup.objects.create(name="Banned from buying alcohol", description="")
|
||||||
BanGroup.objects.create(name="Banned from counters", description="")
|
BanGroup.objects.create(name="Banned from counters", description="")
|
||||||
BanGroup.objects.create(name="Banned to subscribe", description="")
|
BanGroup.objects.create(name="Banned to subscribe", description="")
|
||||||
|
|
||||||
def _create_elections(
|
|
||||||
self,
|
|
||||||
groups: PopulatedGroups,
|
|
||||||
clubs: PopulatedClubs,
|
|
||||||
skia: User,
|
|
||||||
sli: User,
|
|
||||||
krophil: User,
|
|
||||||
):
|
|
||||||
"""Populate elections.
|
|
||||||
|
|
||||||
4 elections are created :
|
|
||||||
|
|
||||||
- one that has not started yet,
|
|
||||||
- one on the candidature period
|
|
||||||
- one on the vote period
|
|
||||||
- one that is finished
|
|
||||||
|
|
||||||
All elections have two lists, are linked to the AE and Troll clubs,
|
|
||||||
and have one role for each board role of thos two clubs, plus
|
|
||||||
an additional role linked to no club roles.
|
|
||||||
|
|
||||||
The ongoing vote and finished elections have candidates.
|
|
||||||
|
|
||||||
The finished election has 10 voters.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def election_factory(title: str, start_candidature: datetime):
|
|
||||||
return Election(
|
|
||||||
title=title,
|
|
||||||
description="",
|
|
||||||
start_candidature=start_candidature,
|
|
||||||
end_candidature=start_candidature + timedelta(days=7),
|
|
||||||
start_date=start_candidature + timedelta(days=7),
|
|
||||||
end_date=start_candidature + timedelta(days=14),
|
|
||||||
)
|
|
||||||
|
|
||||||
# create the elections
|
|
||||||
elections = Election.objects.bulk_create(
|
|
||||||
[
|
|
||||||
election_factory("Election terminée", now() - timedelta(days=14)),
|
|
||||||
election_factory("Votes en cours", now() - timedelta(days=7)),
|
|
||||||
election_factory("Candidatures en cours", now()),
|
|
||||||
election_factory("Election à venir", now() + timedelta(days=7)),
|
|
||||||
]
|
|
||||||
)
|
|
||||||
finished, ongoing_vote, _ongoing_candidature, _not_started = elections
|
|
||||||
|
|
||||||
# set the groups (all elections have the same groups)
|
|
||||||
groups.public.viewable_elections.set(elections)
|
|
||||||
clubs.ae.board_group.editable_elections.set(elections)
|
|
||||||
groups.subscribers.candidate_elections.set(elections)
|
|
||||||
groups.subscribers.votable_elections.set(elections)
|
|
||||||
|
|
||||||
# link elections to clubs (AE and Troll for all elections)
|
|
||||||
Election.clubs.through.objects.bulk_create(
|
|
||||||
[
|
|
||||||
*[Election.clubs.through(club=clubs.ae, election=e) for e in elections],
|
|
||||||
*[
|
|
||||||
Election.clubs.through(club=clubs.troll, election=e)
|
|
||||||
for e in elections
|
|
||||||
],
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
# Create lists (all elections have two lists)
|
|
||||||
ElectionList.objects.bulk_create(
|
|
||||||
[
|
|
||||||
*[ElectionList(title="Candidat libre", election=e) for e in elections],
|
|
||||||
*[ElectionList(title="Troll", election=e) for e in elections],
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
# Create roles.
|
|
||||||
# Elections have a role for each board club role of AE and Troll,
|
|
||||||
# +an additional role linked to no club role
|
|
||||||
club_roles = list(
|
|
||||||
ClubRole.objects.filter(club__in=[clubs.ae, clubs.troll], is_board=True)
|
|
||||||
.select_related("club")
|
|
||||||
.order_by("club_id", "order")
|
|
||||||
)
|
|
||||||
Role.objects.bulk_create(
|
|
||||||
[
|
|
||||||
*[
|
|
||||||
Role(election=e, title=f"{r.name} {r.club.name}", club_role=r)
|
|
||||||
for r in club_roles
|
|
||||||
for e in elections
|
|
||||||
],
|
|
||||||
*[Role(election=e, title="Rôle libre") for e in elections],
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
# create candidatures for ongoing_vote and finished elections
|
|
||||||
candidatures = []
|
|
||||||
lipsum = "\n\n".join(paragraphs(2))
|
|
||||||
for election in ongoing_vote, finished:
|
|
||||||
lists = list(election.election_lists.order_by("id"))
|
|
||||||
roles = list(election.roles.order_by("order")[:3])
|
|
||||||
candidatures.extend(
|
|
||||||
[
|
|
||||||
Candidature(
|
|
||||||
role=roles[0], user=skia, election_list=lists[0], program=lipsum
|
|
||||||
),
|
|
||||||
Candidature(
|
|
||||||
role=roles[1], user=sli, election_list=lists[0], program=lipsum
|
|
||||||
),
|
|
||||||
Candidature(
|
|
||||||
role=roles[2], user=krophil, election_list=lists[1], program=""
|
|
||||||
),
|
|
||||||
Candidature(
|
|
||||||
role=roles[2], user=sli, election_list=lists[0], program=lipsum
|
|
||||||
),
|
|
||||||
]
|
|
||||||
)
|
|
||||||
candidatures = Candidature.objects.bulk_create(candidatures)
|
|
||||||
|
|
||||||
skia, sli_vp, krophil, sli_treso = candidatures[4:] # candidates of finished
|
|
||||||
votes = Vote.objects.bulk_create(
|
|
||||||
[
|
|
||||||
*[Vote(role=skia.role) for _ in range(6)],
|
|
||||||
*[Vote(role=sli_vp.role) for _ in range(8)],
|
|
||||||
*[Vote(role=krophil.role) for _ in range(9)],
|
|
||||||
]
|
|
||||||
)
|
|
||||||
skia.votes.set(votes[:6])
|
|
||||||
sli_vp.votes.set(votes[6:14])
|
|
||||||
krophil.votes.set(votes[14:20])
|
|
||||||
sli_treso.votes.set(votes[20:23])
|
|
||||||
finished.voters.set(list(User.objects.all()[:10]))
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import math
|
|
||||||
import random
|
import random
|
||||||
from datetime import date, timedelta
|
from datetime import date, timedelta
|
||||||
from datetime import timezone as tz
|
from datetime import timezone as tz
|
||||||
|
from math import ceil
|
||||||
from typing import Iterator
|
from typing import Iterator
|
||||||
|
|
||||||
from dateutil.relativedelta import relativedelta
|
from dateutil.relativedelta import relativedelta
|
||||||
@@ -26,6 +26,7 @@ from counter.models import (
|
|||||||
)
|
)
|
||||||
from forum.models import Forum, ForumMessage, ForumTopic
|
from forum.models import Forum, ForumMessage, ForumTopic
|
||||||
from pedagogy.models import UE
|
from pedagogy.models import UE
|
||||||
|
from reservation.models import ReservationSlot, Room
|
||||||
from subscription.models import Subscription
|
from subscription.models import Subscription
|
||||||
|
|
||||||
|
|
||||||
@@ -36,57 +37,27 @@ class Command(BaseCommand):
|
|||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
self.faker = Faker("fr_FR")
|
self.faker = Faker("fr_FR")
|
||||||
|
|
||||||
def add_arguments(self, parser):
|
|
||||||
parser.add_argument(
|
|
||||||
"-n", "--nb-users", help="Number of users to create", type=int, default=600
|
|
||||||
)
|
|
||||||
|
|
||||||
def handle(self, *args, **options):
|
def handle(self, *args, **options):
|
||||||
if not settings.DEBUG:
|
if not settings.DEBUG:
|
||||||
raise Exception("Never call this command in prod. Never.")
|
raise Exception("Never call this command in prod. Never.")
|
||||||
|
|
||||||
self.stdout.write("Creating users...")
|
self.stdout.write("Creating users...")
|
||||||
users = self.create_users(options["nb_users"])
|
users = self.create_users()
|
||||||
self.create_bans(random.sample(users, k=len(users) // 200)) # 0.5% of users
|
self.create_bans(random.sample(users, k=len(users) // 200)) # 0.5% of users
|
||||||
|
# len(subscribers) is approximately 480
|
||||||
subscribers = random.sample(users, k=int(0.8 * len(users)))
|
subscribers = random.sample(users, k=int(0.8 * len(users)))
|
||||||
self.stdout.write("Creating subscriptions...")
|
self.stdout.write("Creating subscriptions...")
|
||||||
self.create_subscriptions(subscribers)
|
self.create_subscriptions(subscribers)
|
||||||
self.stdout.write("Creating club memberships...")
|
self.stdout.write("Creating club memberships...")
|
||||||
users_qs = User.objects.filter(id__in=[s.id for s in subscribers])
|
self.create_club_memberships(subscribers)
|
||||||
subscribers_now = list(
|
self.stdout.write("Creating rooms and reservation...")
|
||||||
users_qs.annotate(
|
self.create_resources_and_reservations(random.sample(subscribers, k=40))
|
||||||
filter=Exists(
|
|
||||||
Subscription.objects.filter(
|
|
||||||
member_id=OuterRef("pk"), subscription_end__gte=now()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
old_subscribers = list(
|
|
||||||
users_qs.annotate(
|
|
||||||
filter=Exists(
|
|
||||||
Subscription.objects.filter(
|
|
||||||
member_id=OuterRef("pk"), subscription_end__lt=now()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
self.make_club(
|
|
||||||
Club.objects.get(id=settings.SITH_MAIN_CLUB_ID),
|
|
||||||
random.sample(subscribers_now, k=min(30, len(subscribers_now))),
|
|
||||||
random.sample(old_subscribers, k=min(60, len(old_subscribers))),
|
|
||||||
)
|
|
||||||
self.make_club(
|
|
||||||
Club.objects.get(name="Troll Penché"),
|
|
||||||
random.sample(subscribers_now, k=min(20, len(subscribers_now))),
|
|
||||||
random.sample(old_subscribers, k=min(80, len(old_subscribers))),
|
|
||||||
)
|
|
||||||
self.stdout.write("Creating uvs...")
|
self.stdout.write("Creating uvs...")
|
||||||
self.create_ues()
|
self.create_ues()
|
||||||
self.stdout.write("Creating products...")
|
self.stdout.write("Creating products...")
|
||||||
self.create_products()
|
self.create_products()
|
||||||
self.stdout.write("Creating sales and refills...")
|
self.stdout.write("Creating sales and refills...")
|
||||||
sellers = random.sample(users, len(users) // 10)
|
sellers = list(User.objects.order_by("?")[:100])
|
||||||
self.create_sales(sellers)
|
self.create_sales(sellers)
|
||||||
self.stdout.write("Creating permanences...")
|
self.stdout.write("Creating permanences...")
|
||||||
self.create_permanences(sellers)
|
self.create_permanences(sellers)
|
||||||
@@ -95,7 +66,7 @@ class Command(BaseCommand):
|
|||||||
|
|
||||||
self.stdout.write("Done")
|
self.stdout.write("Done")
|
||||||
|
|
||||||
def create_users(self, nb_users: int = 600) -> list[User]:
|
def create_users(self) -> list[User]:
|
||||||
# Create a single password hash for all users to make it faster.
|
# Create a single password hash for all users to make it faster.
|
||||||
# It's insecure as hell, but it's ok since it's only for dev purposes.
|
# It's insecure as hell, but it's ok since it's only for dev purposes.
|
||||||
password = make_password("plop")
|
password = make_password("plop")
|
||||||
@@ -114,7 +85,7 @@ class Command(BaseCommand):
|
|||||||
address=self.faker.address(),
|
address=self.faker.address(),
|
||||||
password=password,
|
password=password,
|
||||||
)
|
)
|
||||||
for _ in range(nb_users)
|
for _ in range(600)
|
||||||
]
|
]
|
||||||
# there may a duplicate or two
|
# there may a duplicate or two
|
||||||
# Not a problem, we will just have 599 users instead of 600
|
# Not a problem, we will just have 599 users instead of 600
|
||||||
@@ -144,22 +115,10 @@ class Command(BaseCommand):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def create_subscriptions(self, users: list[User]):
|
def create_subscriptions(self, users: list[User]):
|
||||||
subscription_types = [
|
|
||||||
"un-semestre",
|
|
||||||
"deux-semestres",
|
|
||||||
"cursus-tronc-commun",
|
|
||||||
"cursus-branche",
|
|
||||||
]
|
|
||||||
|
|
||||||
def prepare_subscription(_user: User, start_date: date) -> Subscription:
|
def prepare_subscription(_user: User, start_date: date) -> Subscription:
|
||||||
payment_method = random.choice(settings.SITH_SUBSCRIPTION_PAYMENT_METHOD)[0]
|
payment_method = random.choice(settings.SITH_SUBSCRIPTION_PAYMENT_METHOD)[0]
|
||||||
subscription_type = random.choice(subscription_types)
|
duration = random.randint(1, 4)
|
||||||
s = Subscription(
|
s = Subscription(member=_user, payment_method=payment_method)
|
||||||
member=_user,
|
|
||||||
payment_method=payment_method,
|
|
||||||
subscription_type=subscription_type,
|
|
||||||
)
|
|
||||||
duration = settings.SITH_SUBSCRIPTIONS[subscription_type]["duration"]
|
|
||||||
s.subscription_start = s.compute_start(d=start_date, duration=duration)
|
s.subscription_start = s.compute_start(d=start_date, duration=duration)
|
||||||
s.subscription_end = s.compute_end(duration)
|
s.subscription_end = s.compute_end(duration)
|
||||||
return s
|
return s
|
||||||
@@ -233,6 +192,97 @@ class Command(BaseCommand):
|
|||||||
memberships = Membership.objects.bulk_create(memberships)
|
memberships = Membership.objects.bulk_create(memberships)
|
||||||
Membership._add_club_groups(memberships)
|
Membership._add_club_groups(memberships)
|
||||||
|
|
||||||
|
def create_club_memberships(self, users: list[User]):
|
||||||
|
users_qs = User.objects.filter(id__in=[s.id for s in users])
|
||||||
|
subscribers_now = list(
|
||||||
|
users_qs.annotate(
|
||||||
|
filter=Exists(
|
||||||
|
Subscription.objects.filter(
|
||||||
|
member_id=OuterRef("pk"), subscription_end__gte=now()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
old_subscribers = list(
|
||||||
|
users_qs.annotate(
|
||||||
|
filter=Exists(
|
||||||
|
Subscription.objects.filter(
|
||||||
|
member_id=OuterRef("pk"), subscription_end__lt=now()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.make_club(
|
||||||
|
Club.objects.get(id=settings.SITH_MAIN_CLUB_ID),
|
||||||
|
random.sample(subscribers_now, k=min(30, len(subscribers_now))),
|
||||||
|
random.sample(old_subscribers, k=min(60, len(old_subscribers))),
|
||||||
|
)
|
||||||
|
self.make_club(
|
||||||
|
Club.objects.get(name="Troll Penché"),
|
||||||
|
random.sample(subscribers_now, k=min(20, len(subscribers_now))),
|
||||||
|
random.sample(old_subscribers, k=min(80, len(old_subscribers))),
|
||||||
|
)
|
||||||
|
|
||||||
|
def create_resources_and_reservations(self, users: list[User]):
|
||||||
|
"""Generate reservable rooms and reservations slots for those rooms.
|
||||||
|
|
||||||
|
Contrary to the other data generator,
|
||||||
|
this one generates more data than what is expected on the real db.
|
||||||
|
"""
|
||||||
|
ae = Club.objects.get(id=settings.SITH_MAIN_CLUB_ID)
|
||||||
|
pdf = Club.objects.get(id=settings.SITH_PDF_CLUB_ID)
|
||||||
|
troll = Club.objects.get(name="Troll Penché")
|
||||||
|
rooms = [
|
||||||
|
Room(
|
||||||
|
name=name,
|
||||||
|
club=club,
|
||||||
|
location=location,
|
||||||
|
description=self.faker.text(100),
|
||||||
|
)
|
||||||
|
for name, club, location in [
|
||||||
|
("Champi", ae, "BELFORT"),
|
||||||
|
("Muzik", ae, "BELFORT"),
|
||||||
|
("Pôle Tech", ae, "BELFORT"),
|
||||||
|
("Jolly", troll, "BELFORT"),
|
||||||
|
("Cookut", pdf, "BELFORT"),
|
||||||
|
("Lucky", pdf, "BELFORT"),
|
||||||
|
("Potards", pdf, "SEVENANS"),
|
||||||
|
("Bureau AE", ae, "SEVENANS"),
|
||||||
|
]
|
||||||
|
]
|
||||||
|
rooms = Room.objects.bulk_create(rooms)
|
||||||
|
reservations = []
|
||||||
|
for room in rooms:
|
||||||
|
# how much people use this room.
|
||||||
|
# The higher the number, the more reservations exist,
|
||||||
|
# the smaller the interval between two slot is,
|
||||||
|
# and the more future reservations have already been made ahead of time
|
||||||
|
affluence = random.randint(2, 6)
|
||||||
|
slot_start = make_aware(self.faker.past_datetime("-5y").replace(minute=0))
|
||||||
|
generate_until = make_aware(
|
||||||
|
self.faker.future_datetime(timedelta(days=1) * affluence**2)
|
||||||
|
)
|
||||||
|
while slot_start < generate_until:
|
||||||
|
if slot_start.hour < 8:
|
||||||
|
# if a reservation would start in the middle of the night
|
||||||
|
# make it start the next morning instead
|
||||||
|
slot_start += timedelta(hours=10 - slot_start.hour)
|
||||||
|
duration = timedelta(minutes=15) * (1 + int(random.gammavariate(3, 2)))
|
||||||
|
reservations.append(
|
||||||
|
ReservationSlot(
|
||||||
|
room=room,
|
||||||
|
author=random.choice(users),
|
||||||
|
start_at=slot_start,
|
||||||
|
end_at=slot_start + duration,
|
||||||
|
created_at=slot_start - self.faker.time_delta("+7d"),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
slot_start += duration + (
|
||||||
|
timedelta(minutes=15) * ceil(random.expovariate(affluence / 192))
|
||||||
|
)
|
||||||
|
reservations.sort(key=lambda slot: slot.created_at)
|
||||||
|
ReservationSlot.objects.bulk_create(reservations)
|
||||||
|
|
||||||
def create_ues(self):
|
def create_ues(self):
|
||||||
root = User.objects.get(username="root")
|
root = User.objects.get(username="root")
|
||||||
categories = ["CS", "TM", "OM", "QC", "EC"]
|
categories = ["CS", "TM", "OM", "QC", "EC"]
|
||||||
@@ -433,9 +483,8 @@ class Command(BaseCommand):
|
|||||||
Permanency.objects.bulk_create(perms)
|
Permanency.objects.bulk_create(perms)
|
||||||
|
|
||||||
def create_forums(self):
|
def create_forums(self):
|
||||||
users = list(User.objects.all())
|
forumers = list(User.objects.order_by("?")[:100])
|
||||||
forumers = random.sample(users, math.ceil(len(users) / 10))
|
most_actives = random.sample(forumers, 10)
|
||||||
most_actives = random.sample(forumers, math.ceil(len(forumers) / 6))
|
|
||||||
categories = list(Forum.objects.filter(is_category=True))
|
categories = list(Forum.objects.filter(is_category=True))
|
||||||
new_forums = [
|
new_forums = [
|
||||||
Forum(name=self.faker.text(20), parent=random.choice(categories))
|
Forum(name=self.faker.text(20), parent=random.choice(categories))
|
||||||
@@ -452,7 +501,7 @@ class Command(BaseCommand):
|
|||||||
for _ in range(100)
|
for _ in range(100)
|
||||||
]
|
]
|
||||||
ForumTopic.objects.bulk_create(new_topics)
|
ForumTopic.objects.bulk_create(new_topics)
|
||||||
topics = list(ForumTopic.objects.all())
|
topics = list(ForumTopic.objects.values_list("id", flat=True))
|
||||||
|
|
||||||
def get_author():
|
def get_author():
|
||||||
if random.random() > 0.5:
|
if random.random() > 0.5:
|
||||||
@@ -460,7 +509,7 @@ class Command(BaseCommand):
|
|||||||
return random.choice(forumers)
|
return random.choice(forumers)
|
||||||
|
|
||||||
messages = []
|
messages = []
|
||||||
for t in topics:
|
for topic_id in topics:
|
||||||
nb_messages = max(1, int(random.normalvariate(mu=90, sigma=50)))
|
nb_messages = max(1, int(random.normalvariate(mu=90, sigma=50)))
|
||||||
dates = sorted(
|
dates = sorted(
|
||||||
[
|
[
|
||||||
@@ -472,7 +521,7 @@ class Command(BaseCommand):
|
|||||||
messages.extend(
|
messages.extend(
|
||||||
[
|
[
|
||||||
ForumMessage(
|
ForumMessage(
|
||||||
topic=t,
|
topic_id=topic_id,
|
||||||
author=get_author(),
|
author=get_author(),
|
||||||
date=d,
|
date=d,
|
||||||
message="\n\n".join(
|
message="\n\n".join(
|
||||||
|
|||||||
@@ -0,0 +1,132 @@
|
|||||||
|
#
|
||||||
|
# Copyright 2023 © AE UTBM
|
||||||
|
# ae@utbm.fr / ae.info@utbm.fr
|
||||||
|
#
|
||||||
|
# This file is part of the website of the UTBM Student Association (AE UTBM),
|
||||||
|
# https://ae.utbm.fr.
|
||||||
|
#
|
||||||
|
# You can find the source code of the website at https://github.com/ae-utbm/sith
|
||||||
|
#
|
||||||
|
# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
|
||||||
|
# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
|
||||||
|
# OR WITHIN THE LOCAL FILE "LICENSE"
|
||||||
|
#
|
||||||
|
#
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
import mistune
|
||||||
|
from django.urls import reverse
|
||||||
|
from mistune import HTMLRenderer, Markdown
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from mistune import InlineParser, InlineState
|
||||||
|
|
||||||
|
# match __text__, without linebreak in the text, nor backslash prepending an underscore
|
||||||
|
# Examples :
|
||||||
|
# - "__text__" : OK
|
||||||
|
# - "__te xt__" : OK
|
||||||
|
# - "__te_xt__" : nope (underscore in the middle)
|
||||||
|
# - "__te\_xt__" : Ok (the middle underscore is escaped)
|
||||||
|
# - "__te\nxt__" : nope (there is a linebreak in the text)
|
||||||
|
# - "\__text__" : nope (one of the underscores have a backslash prepended)
|
||||||
|
# - "\\__text__" : Ok (the backslash is ignored, because there is another backslash before)
|
||||||
|
UNDERLINED_RE = (
|
||||||
|
r"(?<!\\)(?:\\{2})*" # ignore if there is an odd number of backslashes before
|
||||||
|
r"_{2}" # two underscores
|
||||||
|
r"(?P<underlined>([^\\_]|\\.)+)" # the actual text
|
||||||
|
r"_{2}" # closing underscores
|
||||||
|
)
|
||||||
|
|
||||||
|
SITH_LINK_RE = (
|
||||||
|
r"\[(?P<page_name>[\w\s]+)\]" # [nom du lien]
|
||||||
|
r"\(page:\/\/" # (page://
|
||||||
|
r"(?P<page_slug>[a-zA-Z0-9][a-zA-Z0-9.-]*[a-zA-Z0-9])" # actual page name
|
||||||
|
r"\)" # )
|
||||||
|
)
|
||||||
|
|
||||||
|
CUSTOM_DIMENSIONS_IMAGE_RE = (
|
||||||
|
r"\[(?P<img_name>[\w\s]+)\]" # [nom du lien]
|
||||||
|
r"\(img:\/\/" # (img://
|
||||||
|
r"(?P<img_slug>[a-zA-Z0-9][a-zA-Z0-9.-]*[a-zA-Z0-9])" # actual page name
|
||||||
|
r"\)" # )
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def parse_underline(_inline: InlineParser, m: re.Match, state: InlineState):
|
||||||
|
state.append_token({"type": "underline", "raw": m.group("underlined")})
|
||||||
|
return m.end()
|
||||||
|
|
||||||
|
|
||||||
|
def underline(md_instance: Markdown):
|
||||||
|
md_instance.inline.register(
|
||||||
|
"underline",
|
||||||
|
UNDERLINED_RE,
|
||||||
|
parse_underline,
|
||||||
|
before="emphasis",
|
||||||
|
)
|
||||||
|
md_instance.renderer.register("underline", lambda _, text: f"<u>{text}</u>")
|
||||||
|
|
||||||
|
|
||||||
|
def parse_sith_link(_inline: InlineParser, m: re.Match, state: InlineState):
|
||||||
|
page_name = m.group("page_name")
|
||||||
|
page_slug = m.group("page_slug")
|
||||||
|
state.append_token(
|
||||||
|
{
|
||||||
|
"type": "link",
|
||||||
|
"children": [{"type": "text", "raw": page_name}],
|
||||||
|
"attrs": {"url": reverse("core:page", kwargs={"page_name": page_slug})},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return m.end()
|
||||||
|
|
||||||
|
|
||||||
|
def sith_link(md_instance: Markdown):
|
||||||
|
md_instance.inline.register(
|
||||||
|
"sith_link",
|
||||||
|
SITH_LINK_RE,
|
||||||
|
parse_sith_link,
|
||||||
|
before="emphasis",
|
||||||
|
)
|
||||||
|
# no custom renderer here.
|
||||||
|
# we just add another parsing rule, but render it as if it was
|
||||||
|
# a regular markdown link
|
||||||
|
|
||||||
|
|
||||||
|
class SithRenderer(HTMLRenderer):
|
||||||
|
def image(self, text: str, url: str, title=None) -> str:
|
||||||
|
if "?" not in url:
|
||||||
|
return super().image(text, url, title)
|
||||||
|
|
||||||
|
new_url, params = url.rsplit("?", maxsplit=1)
|
||||||
|
m = re.match(r"^(?P<width>\d+(%|px)?)(x(?P<height>\d+(%|px)?))?$", params)
|
||||||
|
if not m:
|
||||||
|
return super().image(text, url, title)
|
||||||
|
|
||||||
|
width, height = m.group("width"), m.group("height")
|
||||||
|
if not width.endswith(("%", "px")):
|
||||||
|
width += "px"
|
||||||
|
style = f"width:{width};"
|
||||||
|
if height is not None:
|
||||||
|
if not height.endswith(("%", "px")):
|
||||||
|
height += "px"
|
||||||
|
style += f"height:{height};"
|
||||||
|
return super().image(text, new_url, title).replace("/>", f'style="{style}" />')
|
||||||
|
|
||||||
|
|
||||||
|
markdown = mistune.create_markdown(
|
||||||
|
renderer=SithRenderer(escape=True),
|
||||||
|
plugins=[
|
||||||
|
underline,
|
||||||
|
sith_link,
|
||||||
|
"strikethrough",
|
||||||
|
"footnotes",
|
||||||
|
"table",
|
||||||
|
"spoiler",
|
||||||
|
"subscript",
|
||||||
|
"superscript",
|
||||||
|
"url",
|
||||||
|
],
|
||||||
|
)
|
||||||
@@ -1,13 +1,9 @@
|
|||||||
# Generated by Django 4.2.17 on 2025-01-04 16:42
|
# Generated by Django 4.2.17 on 2025-01-04 16:42
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
from django.db import migrations
|
from django.db import migrations
|
||||||
|
from django.db.migrations.state import StateApps
|
||||||
from django.db.models import F
|
from django.db.models import F
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.db.migrations.state import StateApps
|
|
||||||
|
|
||||||
|
|
||||||
def invert_is_manually_manageable(apps: StateApps, schema_editor):
|
def invert_is_manually_manageable(apps: StateApps, schema_editor):
|
||||||
"""Invert `is_manually_manageable`.
|
"""Invert `is_manually_manageable`.
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
# Generated by Django 4.2.17 on 2024-12-31 13:30
|
# Generated by Django 4.2.17 on 2024-12-31 13:30
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import django.contrib.auth.models
|
import django.contrib.auth.models
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
|
from django.db.migrations.state import StateApps
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.db.migrations.state import StateApps
|
|
||||||
|
|
||||||
|
|
||||||
def migrate_ban_groups(apps: StateApps, schema_editor):
|
def migrate_ban_groups(apps: StateApps, schema_editor):
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
# Generated by Django 5.2.12 on 2026-05-01 08:59
|
# Generated by Django 5.2.12 on 2026-05-01 08:59
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
|
from django.db.migrations.state import StateApps
|
||||||
from django.db.models import F
|
from django.db.models import F
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.db.migrations.state import StateApps
|
|
||||||
|
|
||||||
|
|
||||||
def set_updated_at(apps: StateApps, schema_editor):
|
def set_updated_at(apps: StateApps, schema_editor):
|
||||||
SithFile = apps.get_model("core", "SithFile")
|
SithFile = apps.get_model("core", "SithFile")
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
# Generated by Django 5.2.17 on 2026-09-24 14:49
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [("core", "0050_alter_sithfile_moderator")]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name="preferences",
|
|
||||||
name="show_my_timetable",
|
|
||||||
field=models.BooleanField(
|
|
||||||
default=True,
|
|
||||||
help_text=(
|
|
||||||
"Allow subscribers to see your timetable and "
|
|
||||||
"to compare it to theirs (if you have filled it)"
|
|
||||||
),
|
|
||||||
verbose_name="show your timetable to others",
|
|
||||||
),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
# Generated by Django 5.2.17 on 2026-09-25 12:26
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [("core", "0050_alter_sithfile_moderator")]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name="user",
|
|
||||||
name="cgu_approved_at",
|
|
||||||
field=models.DateTimeField(null=True, verbose_name="ToS approved at"),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
+4
-20
@@ -44,7 +44,6 @@ from django.core.files.base import ContentFile
|
|||||||
from django.core.mail import send_mail
|
from django.core.mail import send_mail
|
||||||
from django.db import models, transaction
|
from django.db import models, transaction
|
||||||
from django.db.models import Exists, F, OuterRef, Q
|
from django.db.models import Exists, F, OuterRef, Q
|
||||||
from django.db.models.aggregates import Max
|
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.utils.functional import cached_property
|
from django.utils.functional import cached_property
|
||||||
@@ -292,7 +291,6 @@ class User(AbstractUser):
|
|||||||
),
|
),
|
||||||
blank=True,
|
blank=True,
|
||||||
)
|
)
|
||||||
cgu_approved_at = models.DateTimeField(_("ToS approved at"), null=True, blank=False)
|
|
||||||
godfathers = models.ManyToManyField("User", related_name="godchildren", blank=True)
|
godfathers = models.ManyToManyField("User", related_name="godchildren", blank=True)
|
||||||
|
|
||||||
objects = CustomUserManager()
|
objects = CustomUserManager()
|
||||||
@@ -420,14 +418,6 @@ class User(AbstractUser):
|
|||||||
)
|
)
|
||||||
return age
|
return age
|
||||||
|
|
||||||
@cached_property
|
|
||||||
def approved_current_cgu(self) -> bool:
|
|
||||||
qs = PageRev.objects.filter(page___full_name=settings.SITH_CGU_PAGE)
|
|
||||||
return (
|
|
||||||
self.cgu_approved_at is not None
|
|
||||||
and self.cgu_approved_at > qs.aggregate(date=Max("date"))["date"]
|
|
||||||
)
|
|
||||||
|
|
||||||
def make_home(self):
|
def make_home(self):
|
||||||
if self.home is None:
|
if self.home is None:
|
||||||
home_root = SithFile.objects.filter(parent=None, name="users").first()
|
home_root = SithFile.objects.filter(parent=None, name="users").first()
|
||||||
@@ -799,14 +789,6 @@ class Preferences(models.Model):
|
|||||||
),
|
),
|
||||||
default=False,
|
default=False,
|
||||||
)
|
)
|
||||||
show_my_timetable = models.BooleanField(
|
|
||||||
_("show your timetable to others"),
|
|
||||||
help_text=_(
|
|
||||||
"Allow subscribers to see your timetable and "
|
|
||||||
"to compare it to theirs (if you have filled it)"
|
|
||||||
),
|
|
||||||
default=True,
|
|
||||||
)
|
|
||||||
notify_on_click = models.BooleanField(
|
notify_on_click = models.BooleanField(
|
||||||
_("get a notification for every click"), default=False
|
_("get a notification for every click"), default=False
|
||||||
)
|
)
|
||||||
@@ -1251,8 +1233,9 @@ class Page(models.Model):
|
|||||||
raise NotLocked("The page is not locked and thus can not be saved")
|
raise NotLocked("The page is not locked and thus can not be saved")
|
||||||
self.full_clean()
|
self.full_clean()
|
||||||
if not self.id:
|
if not self.id:
|
||||||
# Save a first time to correctly set _full_name
|
super().save(
|
||||||
super().save(*args, **kwargs)
|
*args, **kwargs
|
||||||
|
) # Save a first time to correctly set _full_name
|
||||||
# This reset the _full_name just before saving to maintain a coherent field quicker for queries than the
|
# This reset the _full_name just before saving to maintain a coherent field quicker for queries than the
|
||||||
# recursive method
|
# recursive method
|
||||||
# It also update all the children to maintain correct names
|
# It also update all the children to maintain correct names
|
||||||
@@ -1271,6 +1254,7 @@ class Page(models.Model):
|
|||||||
return Page.objects.filter(_full_name=name).first()
|
return Page.objects.filter(_full_name=name).first()
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
|
"""Cleans up only the name for the moment, but this can be used to make any treatment before saving the object."""
|
||||||
if "/" in self.name:
|
if "/" in self.name:
|
||||||
self.name = self.name.split("/")[-1]
|
self.name = self.name.split("/")[-1]
|
||||||
if (
|
if (
|
||||||
|
|||||||
+4
-10
@@ -19,16 +19,6 @@ from core.utils import get_last_promo, is_image
|
|||||||
NonEmptyStr = Annotated[str, MinLen(1)]
|
NonEmptyStr = Annotated[str, MinLen(1)]
|
||||||
|
|
||||||
|
|
||||||
class ValidationErrorSchema(Schema):
|
|
||||||
class ValidationErrorItem(Schema):
|
|
||||||
loc: list[str | int]
|
|
||||||
msg: str
|
|
||||||
type: str
|
|
||||||
ctx: dict[str, str]
|
|
||||||
|
|
||||||
detail: list[ValidationErrorItem]
|
|
||||||
|
|
||||||
|
|
||||||
class UploadedImage(UploadedFile):
|
class UploadedImage(UploadedFile):
|
||||||
@classmethod
|
@classmethod
|
||||||
def _validate(cls, v: Any, info: ValidationInfo) -> Any:
|
def _validate(cls, v: Any, info: ValidationInfo) -> Any:
|
||||||
@@ -161,6 +151,10 @@ class UserFilterSchema(FilterSchema):
|
|||||||
return value
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
class MarkdownSchema(Schema):
|
||||||
|
text: str
|
||||||
|
|
||||||
|
|
||||||
class FamilyGodfatherSchema(Schema):
|
class FamilyGodfatherSchema(Schema):
|
||||||
godfather: int
|
godfather: int
|
||||||
godchild: int
|
godchild: int
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export function limitedChoices(Alpine: AlpineType) {
|
|||||||
Alpine.directive(
|
Alpine.directive(
|
||||||
"limited-choices",
|
"limited-choices",
|
||||||
(el, { expression }, { evaluateLater, effect }) => {
|
(el, { expression }, { evaluateLater, effect }) => {
|
||||||
const getMaxChoices = evaluateLater<string>(expression);
|
const getMaxChoices = evaluateLater(expression);
|
||||||
let maxChoices: number;
|
let maxChoices: number;
|
||||||
const inputs: HTMLInputElement[] = Array.from(
|
const inputs: HTMLInputElement[] = Array.from(
|
||||||
el.querySelectorAll("input[type='checkbox']"),
|
el.querySelectorAll("input[type='checkbox']"),
|
||||||
@@ -54,7 +54,7 @@ export function limitedChoices(Alpine: AlpineType) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
effect(() => {
|
effect(() => {
|
||||||
getMaxChoices((value) => {
|
getMaxChoices((value: string) => {
|
||||||
const previousValue = maxChoices;
|
const previousValue = maxChoices;
|
||||||
maxChoices = Number.parseInt(value, 10);
|
maxChoices = Number.parseInt(value, 10);
|
||||||
if (maxChoices < previousValue) {
|
if (maxChoices < previousValue) {
|
||||||
|
|||||||
@@ -6,15 +6,12 @@
|
|||||||
* for more efficient tree-shaking and gzip compression.
|
* for more efficient tree-shaking and gzip compression.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Must be loaded before Apline
|
import { morph } from "@alpinejs/morph";
|
||||||
import htmx from "htmx.org";
|
|
||||||
import "htmx.org/dist/ext/hx-alpine-compat.js";
|
|
||||||
import "htmx.org/dist/ext/hx-prompt.js";
|
|
||||||
import "htmx.org/dist/ext/hx-download.js";
|
|
||||||
|
|
||||||
import sort from "@alpinejs/sort";
|
import sort from "@alpinejs/sort";
|
||||||
import Alpine from "alpinejs";
|
import Alpine from "alpinejs";
|
||||||
import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
|
import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
|
||||||
|
import htmx from "htmx.org";
|
||||||
|
import "htmx-ext-alpine-morph";
|
||||||
import { limitedChoices } from "#core:alpine/limited-choices";
|
import { limitedChoices } from "#core:alpine/limited-choices";
|
||||||
import { expireOldStorage } from "#core:core/localstorage";
|
import { expireOldStorage } from "#core:core/localstorage";
|
||||||
import { default as navbar } from "#core:core/navbar";
|
import { default as navbar } from "#core:core/navbar";
|
||||||
@@ -32,7 +29,7 @@ declare module "alpinejs" {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Alpine.plugin([sort, limitedChoices, notifications]);
|
Alpine.plugin([sort, limitedChoices, morph, notifications]);
|
||||||
// biome-ignore lint/style/useNamingConvention: it's how it's named
|
// biome-ignore lint/style/useNamingConvention: it's how it's named
|
||||||
Object.assign(window, { Alpine });
|
Object.assign(window, { Alpine });
|
||||||
|
|
||||||
@@ -48,28 +45,13 @@ polyfillCountryFlagEmojis();
|
|||||||
/**
|
/**
|
||||||
* HTMX
|
* HTMX
|
||||||
*/
|
*/
|
||||||
htmx.registerExtension("aria-busy", {
|
document.body.addEventListener("htmx:beforeRequest", (event: CustomEvent) => {
|
||||||
// biome-ignore lint/style/useNamingConvention: api's name
|
event.detail.target.ariaBusy = true;
|
||||||
htmx_before_request: (
|
|
||||||
_: HTMLElement,
|
|
||||||
detail: { ctx: { target: HTMLElement | undefined } },
|
|
||||||
) => {
|
|
||||||
if (detail.ctx.target !== undefined) {
|
|
||||||
(detail.ctx.target as HTMLElement).ariaBusy = "true";
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// biome-ignore lint/style/useNamingConvention: api's name
|
|
||||||
htmx_after_swap: (
|
|
||||||
_: HTMLElement,
|
|
||||||
detail: { ctx: { target: HTMLElement | undefined } },
|
|
||||||
) => {
|
|
||||||
if (detail.ctx.target !== undefined) {
|
|
||||||
(detail.ctx.target as HTMLElement).ariaBusy = null;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
htmx.config.transitions = true;
|
document.body.addEventListener("htmx:beforeSwap", (event: CustomEvent) => {
|
||||||
|
event.detail.target.ariaBusy = null;
|
||||||
|
});
|
||||||
|
|
||||||
Object.assign(window, { htmx });
|
Object.assign(window, { htmx });
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ import type {
|
|||||||
TomLoadCallback,
|
TomLoadCallback,
|
||||||
TomOption,
|
TomOption,
|
||||||
TomSettings,
|
TomSettings,
|
||||||
} from "tom-select/src/types";
|
} from "tom-select/dist/types/types";
|
||||||
import type { escape_html } from "tom-select/src/utils";
|
import type { escape_html } from "tom-select/dist/types/utils";
|
||||||
import { inheritHtmlElement } from "#core:utils/web-components";
|
import { inheritHtmlElement } from "#core:utils/web-components.ts";
|
||||||
|
|
||||||
export class AutoCompleteSelectBase extends inheritHtmlElement("select") {
|
export class AutoCompleteSelectBase extends inheritHtmlElement("select") {
|
||||||
static observedAttributes = [
|
static observedAttributes = [
|
||||||
@@ -15,7 +15,7 @@ export class AutoCompleteSelectBase extends inheritHtmlElement("select") {
|
|||||||
"max",
|
"max",
|
||||||
"min-characters-for-search",
|
"min-characters-for-search",
|
||||||
];
|
];
|
||||||
public widget!: TomSelect;
|
public widget: TomSelect;
|
||||||
|
|
||||||
protected minCharNumberForSearch = 0;
|
protected minCharNumberForSearch = 0;
|
||||||
protected delay: number | null = null;
|
protected delay: number | null = null;
|
||||||
@@ -24,8 +24,8 @@ export class AutoCompleteSelectBase extends inheritHtmlElement("select") {
|
|||||||
|
|
||||||
protected attributeChangedCallback(
|
protected attributeChangedCallback(
|
||||||
name: string,
|
name: string,
|
||||||
_oldValue: string,
|
_oldValue?: string,
|
||||||
newValue: string,
|
newValue?: string,
|
||||||
) {
|
) {
|
||||||
switch (name) {
|
switch (name) {
|
||||||
case "delay": {
|
case "delay": {
|
||||||
@@ -73,7 +73,7 @@ export class AutoCompleteSelectBase extends inheritHtmlElement("select") {
|
|||||||
persist: false,
|
persist: false,
|
||||||
maxItems: this.node.multiple ? this.max : 1,
|
maxItems: this.node.multiple ? this.max : 1,
|
||||||
closeAfterSelect: true,
|
closeAfterSelect: true,
|
||||||
loadThrottle: this.delay ?? undefined,
|
loadThrottle: this.delay,
|
||||||
placeholder: this.placeholder,
|
placeholder: this.placeholder,
|
||||||
shouldLoad: (query: string) => this.shouldLoad(query), // wraps the method to avoid shadowing `this` by the one from tom-select
|
shouldLoad: (query: string) => this.shouldLoad(query), // wraps the method to avoid shadowing `this` by the one from tom-select
|
||||||
render: {
|
render: {
|
||||||
@@ -103,7 +103,7 @@ export class AutoCompleteSelectBase extends inheritHtmlElement("select") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export abstract class AjaxSelect extends AutoCompleteSelectBase {
|
export abstract class AjaxSelect extends AutoCompleteSelectBase {
|
||||||
protected filter?: (items: TomOption[]) => TomOption[];
|
protected filter?: (items: TomOption[]) => TomOption[] = null;
|
||||||
protected minCharNumberForSearch = 2;
|
protected minCharNumberForSearch = 2;
|
||||||
/**
|
/**
|
||||||
* A cache of researches that have been made using this input.
|
* A cache of researches that have been made using this input.
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
// @ts-expect-error TS2882
|
|
||||||
import "tom-select/dist/css/tom-select.default.css";
|
import "tom-select/dist/css/tom-select.default.css";
|
||||||
import type { TomOption } from "tom-select/src/types";
|
import type { TomOption } from "tom-select/dist/types/types";
|
||||||
import type { escape_html } from "tom-select/src/utils";
|
import type { escape_html } from "tom-select/dist/types/utils";
|
||||||
import {
|
import {
|
||||||
AjaxSelect,
|
AjaxSelect,
|
||||||
AutoCompleteSelectBase,
|
AutoCompleteSelectBase,
|
||||||
} from "#core:core/components/ajax-select-base";
|
} from "#core:core/components/ajax-select-base.ts";
|
||||||
import { registerComponent } from "#core:utils/web-components";
|
import { registerComponent } from "#core:utils/web-components.ts";
|
||||||
import {
|
import {
|
||||||
type GroupSchema,
|
type GroupSchema,
|
||||||
groupSearchGroup,
|
groupSearchGroup,
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
// @ts-expect-error 2307
|
|
||||||
// biome-ignore lint/correctness/noUndeclaredDependencies: shipped by easymde
|
// biome-ignore lint/correctness/noUndeclaredDependencies: shipped by easymde
|
||||||
import "codemirror/lib/codemirror.css";
|
import "codemirror/lib/codemirror.css";
|
||||||
// @ts-expect-error 2307
|
|
||||||
import "easymde/src/css/easymde.css";
|
import "easymde/src/css/easymde.css";
|
||||||
import { markdown } from "@ae_utbm/aemark";
|
|
||||||
// biome-ignore lint/correctness/noUndeclaredDependencies: Imported by EasyMDE
|
// biome-ignore lint/correctness/noUndeclaredDependencies: Imported by EasyMDE
|
||||||
import type CodeMirror from "codemirror"; // biome-ignore lint/style/useNamingConvention: This is how they called their namespace
|
import type CodeMirror from "codemirror";
|
||||||
|
// biome-ignore lint/style/useNamingConvention: This is how they called their namespace
|
||||||
import EasyMDE from "easymde";
|
import EasyMDE from "easymde";
|
||||||
import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
|
import { inheritHtmlElement, registerComponent } from "#core:utils/web-components.ts";
|
||||||
import { type UploadUploadImageErrors, uploadUploadImage } from "#openapi";
|
import {
|
||||||
|
markdownRenderMarkdown,
|
||||||
|
type UploadUploadImageErrors,
|
||||||
|
uploadUploadImage,
|
||||||
|
} from "#openapi";
|
||||||
|
|
||||||
const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
||||||
const easymde = new EasyMDE({
|
const easymde = new EasyMDE({
|
||||||
@@ -23,11 +25,11 @@ const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
|||||||
file: file,
|
file: file,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (response.response !== undefined && !response.response.ok) {
|
if (!response.response.ok) {
|
||||||
if (response?.response.status === 422) {
|
if (response.response.status === 422) {
|
||||||
onError(
|
onError(
|
||||||
(response.error as UploadUploadImageErrors[422]).detail
|
(response.error as UploadUploadImageErrors[422]).detail
|
||||||
.map((err) => err.ctx.error)
|
.map((err: Record<"ctx", Record<"error", string>>) => err.ctx.error)
|
||||||
.join(" ; "),
|
.join(" ; "),
|
||||||
);
|
);
|
||||||
} else if (response.response.status === 403) {
|
} else if (response.response.status === 403) {
|
||||||
@@ -37,10 +39,6 @@ const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (response.data === undefined) {
|
|
||||||
// this can't happen, it's just for the type checker to know
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
onSuccess(response.data.href);
|
onSuccess(response.data.href);
|
||||||
// Workaround function to add an image name to uploaded image
|
// Workaround function to add an image name to uploaded image
|
||||||
// Without this, you get  instead of 
|
// Without this, you get  instead of 
|
||||||
@@ -60,7 +58,22 @@ const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
|||||||
});
|
});
|
||||||
easymde.codemirror.replaceSelection("\n");
|
easymde.codemirror.replaceSelection("\n");
|
||||||
},
|
},
|
||||||
previewRender: (plainText) => markdown(plainText),
|
previewRender: (plainText: string, preview: MarkdownInput) => {
|
||||||
|
/* This is wrapped this way to allow time for Alpine to be loaded on the page */
|
||||||
|
return Alpine.debounce((plainText: string, preview: MarkdownInput) => {
|
||||||
|
const func = async (
|
||||||
|
plainText: string,
|
||||||
|
preview: MarkdownInput,
|
||||||
|
): Promise<null> => {
|
||||||
|
preview.innerHTML = (
|
||||||
|
await markdownRenderMarkdown({ body: { text: plainText } })
|
||||||
|
).data as string;
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
func(plainText, preview);
|
||||||
|
return null;
|
||||||
|
}, 300)(plainText, preview);
|
||||||
|
},
|
||||||
forceSync: true, // Avoid validation error on generic create view
|
forceSync: true, // Avoid validation error on generic create view
|
||||||
imageTexts: {
|
imageTexts: {
|
||||||
sbInit: gettext("Attach files by drag and dropping or pasting from clipboard."),
|
sbInit: gettext("Attach files by drag and dropping or pasting from clipboard."),
|
||||||
@@ -209,11 +222,9 @@ const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const submits: HTMLInputElement[] = Array.from(
|
const submits: HTMLInputElement[] = Array.from(
|
||||||
(textarea.closest("form") as HTMLFormElement).querySelectorAll(
|
textarea.closest("form").querySelectorAll('input[type="submit"]'),
|
||||||
'input[type="submit"]',
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
const parentDiv = textarea.parentElement?.parentElement as HTMLElement;
|
const parentDiv = textarea.parentElement.parentElement;
|
||||||
|
|
||||||
function checkMarkdownInput(event: Event) {
|
function checkMarkdownInput(event: Event) {
|
||||||
// an attribute is null if it does not exist, else a string
|
// an attribute is null if it does not exist, else a string
|
||||||
@@ -238,7 +249,6 @@ const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
@registerComponent("markdown-input")
|
@registerComponent("markdown-input")
|
||||||
// biome-ignore lint/correctness/noUnusedVariables: it is used in jinja
|
|
||||||
class MarkdownInput extends inheritHtmlElement("textarea") {
|
class MarkdownInput extends inheritHtmlElement("textarea") {
|
||||||
connectedCallback() {
|
connectedCallback() {
|
||||||
super.connectedCallback();
|
super.connectedCallback();
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import {
|
|||||||
type InheritedHtmlElement,
|
type InheritedHtmlElement,
|
||||||
inheritHtmlElement,
|
inheritHtmlElement,
|
||||||
registerComponent,
|
registerComponent,
|
||||||
} from "#core:utils/web-components";
|
} from "#core:utils/web-components.ts";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ElementOnce web components
|
* ElementOnce web components
|
||||||
@@ -28,7 +28,7 @@ export function elementOnce<K extends keyof HTMLElementTagNameMap>(tagName: K) {
|
|||||||
|
|
||||||
clearNode() {
|
clearNode() {
|
||||||
while (this.firstChild) {
|
while (this.firstChild) {
|
||||||
this.removeChild(this.lastChild as ChildNode);
|
this.removeChild(this.lastChild);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,7 +130,7 @@ startObserver(observer);
|
|||||||
export class LinkOnce extends elementOnce("link") {
|
export class LinkOnce extends elementOnce("link") {
|
||||||
getElementQuerySelector(): string {
|
getElementQuerySelector(): string {
|
||||||
// We get href from node.attributes instead of node.href to avoid getting the domain part
|
// We get href from node.attributes instead of node.href to avoid getting the domain part
|
||||||
return `link[href='${this.node.attributes.getNamedItem("href")?.nodeValue}']`;
|
return `link[href='${this.node.attributes.getNamedItem("href").nodeValue}']`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,6 +142,6 @@ export class LinkOnce extends elementOnce("link") {
|
|||||||
export class ScriptOnce extends inheritHtmlElement("script") {
|
export class ScriptOnce extends inheritHtmlElement("script") {
|
||||||
getElementQuerySelector(): string {
|
getElementQuerySelector(): string {
|
||||||
// We get href from node.attributes instead of node.src to avoid getting the domain part
|
// We get href from node.attributes instead of node.src to avoid getting the domain part
|
||||||
return `script[src='${this.node.attributes.getNamedItem("src")?.nodeValue}']`;
|
return `script[src='${this.node.attributes.getNamedItem("src").nodeValue}']`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
|
import { inheritHtmlElement, registerComponent } from "#core:utils/web-components.ts";
|
||||||
|
|
||||||
@registerComponent("nfc-input")
|
@registerComponent("nfc-input")
|
||||||
export class NfcInput extends inheritHtmlElement("input") {
|
export class NfcInput extends inheritHtmlElement("input") {
|
||||||
@@ -26,11 +26,9 @@ export class NfcInput extends inheritHtmlElement("input") {
|
|||||||
window.alert(gettext("Unsupported NFC card"));
|
window.alert(gettext("Unsupported NFC card"));
|
||||||
});
|
});
|
||||||
|
|
||||||
ndef.addEventListener("reading", (event) => {
|
ndef.addEventListener("reading", (event: NDEFReadingEvent) => {
|
||||||
this.removeAttribute("scan");
|
this.removeAttribute("scan");
|
||||||
this.node.value = (event as NDEFReadingEvent).serialNumber
|
this.node.value = event.serialNumber.replace(/:/g, "").toUpperCase();
|
||||||
.replace(/:/g, "")
|
|
||||||
.toUpperCase();
|
|
||||||
/* Auto submit form, we need another button to not trigger our previously defined click event */
|
/* Auto submit form, we need another button to not trigger our previously defined click event */
|
||||||
const submit = document.createElement("button");
|
const submit = document.createElement("button");
|
||||||
this.node.appendChild(submit);
|
this.node.appendChild(submit);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { html, render } from "lit-html";
|
import { html, render } from "lit-html";
|
||||||
import { unsafeHTML } from "lit-html/directives/unsafe-html.js";
|
import { unsafeHTML } from "lit-html/directives/unsafe-html.js";
|
||||||
import { registerComponent } from "#core:utils/web-components";
|
import { registerComponent } from "#core:utils/web-components.ts";
|
||||||
|
|
||||||
@registerComponent("ui-tab")
|
@registerComponent("ui-tab")
|
||||||
export class Tab extends HTMLElement {
|
export class Tab extends HTMLElement {
|
||||||
@@ -19,7 +19,7 @@ export class Tab extends HTMLElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (name === "title") {
|
if (name === "title") {
|
||||||
this.description = newValue ?? "";
|
this.description = newValue;
|
||||||
}
|
}
|
||||||
this.dispatchEvent(new CustomEvent("ui-tab-updated", { bubbles: true }));
|
this.dispatchEvent(new CustomEvent("ui-tab-updated", { bubbles: true }));
|
||||||
}
|
}
|
||||||
@@ -79,15 +79,15 @@ export class Tab extends HTMLElement {
|
|||||||
|
|
||||||
@registerComponent("ui-tab-group")
|
@registerComponent("ui-tab-group")
|
||||||
export class TabGroup extends HTMLElement {
|
export class TabGroup extends HTMLElement {
|
||||||
private node!: HTMLDivElement;
|
private node: HTMLDivElement;
|
||||||
|
|
||||||
connectedCallback() {
|
connectedCallback() {
|
||||||
this.node = document.createElement("div");
|
this.node = document.createElement("div");
|
||||||
this.node.classList.add("tabs", "shadow");
|
this.node.classList.add("tabs", "shadow");
|
||||||
this.appendChild(this.node);
|
this.appendChild(this.node);
|
||||||
|
|
||||||
this.addEventListener("ui-tab-activated", (event) => {
|
this.addEventListener("ui-tab-activated", (event: CustomEvent) => {
|
||||||
const target = (event as CustomEvent).detail as Tab;
|
const target = event.detail as Tab;
|
||||||
for (const tab of this.getElementsByTagName("ui-tab") as HTMLCollectionOf<Tab>) {
|
for (const tab of this.getElementsByTagName("ui-tab") as HTMLCollectionOf<Tab>) {
|
||||||
if (tab !== target) {
|
if (tab !== target) {
|
||||||
tab.setActive(false);
|
tab.setActive(false);
|
||||||
|
|||||||
@@ -26,23 +26,19 @@ document.addEventListener("alpine:init", () => {
|
|||||||
* `counter/templates/counter/product_form.jinja`
|
* `counter/templates/counter/product_form.jinja`
|
||||||
*/
|
*/
|
||||||
Alpine.data("dynamicFormSet", (config?: Config) => ({
|
Alpine.data("dynamicFormSet", (config?: Config) => ({
|
||||||
formContainer: undefined as unknown as HTMLElement,
|
|
||||||
nbForms: 0,
|
|
||||||
template: undefined as unknown as HTMLTemplateElement,
|
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
this.formContainer = this.$refs.formContainer as HTMLElement;
|
this.formContainer = this.$refs.formContainer as HTMLElement;
|
||||||
this.nbForms = this.formContainer.children.length as number;
|
this.nbForms = this.formContainer.children.length as number;
|
||||||
this.template = this.$refs.formTemplate as HTMLTemplateElement;
|
this.template = this.$refs.formTemplate as HTMLTemplateElement;
|
||||||
const prefix = config?.prefix ?? "form";
|
const prefix = config?.prefix ?? "form";
|
||||||
(
|
this.$root
|
||||||
this.$root.querySelector(`#id_${prefix}-TOTAL_FORMS`) as HTMLFormElement
|
.querySelector(`#id_${prefix}-TOTAL_FORMS`)
|
||||||
).setAttribute(":value", "nbForms");
|
.setAttribute(":value", "nbForms");
|
||||||
},
|
},
|
||||||
|
|
||||||
addForm() {
|
addForm() {
|
||||||
this.formContainer.appendChild(document.importNode(this.template.content, true));
|
this.formContainer.appendChild(document.importNode(this.template.content, true));
|
||||||
const newForm = this.formContainer.lastElementChild as Element;
|
const newForm = this.formContainer.lastElementChild;
|
||||||
const inputs: NodeListOf<HTMLFormInputElement> = newForm.querySelectorAll(
|
const inputs: NodeListOf<HTMLFormInputElement> = newForm.querySelectorAll(
|
||||||
"input, select, textarea",
|
"input, select, textarea",
|
||||||
);
|
);
|
||||||
@@ -63,7 +59,7 @@ document.addEventListener("alpine:init", () => {
|
|||||||
this.nbForms -= 1;
|
this.nbForms -= 1;
|
||||||
// adjust the id of remaining forms
|
// adjust the id of remaining forms
|
||||||
for (let i = 0; i < this.nbForms; i++) {
|
for (let i = 0; i < this.nbForms; i++) {
|
||||||
const form = this.formContainer.children[i];
|
const form: HTMLDivElement = this.formContainer.children[i];
|
||||||
const inputs: NodeListOf<HTMLFormInputElement> = form.querySelectorAll(
|
const inputs: NodeListOf<HTMLFormInputElement> = form.querySelectorAll(
|
||||||
"input, select, textarea",
|
"input, select, textarea",
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
function showMenu() {
|
function showMenu() {
|
||||||
const navbar = document.getElementById("navbar-content") as HTMLElement;
|
const navbar = document.getElementById("navbar-content");
|
||||||
const current = navbar.getAttribute("mobile-display");
|
const current = navbar.getAttribute("mobile-display");
|
||||||
navbar.setAttribute("mobile-display", current === "hidden" ? "revealed" : "hidden");
|
navbar.setAttribute("mobile-display", current === "hidden" ? "revealed" : "hidden");
|
||||||
}
|
}
|
||||||
@@ -20,12 +20,9 @@ function navbarInit() {
|
|||||||
item.removeAttribute("open");
|
item.removeAttribute("open");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
item.addEventListener("click", (event) => {
|
item.addEventListener("click", (event: MouseEvent) => {
|
||||||
// Don't close when clicking on desktop mode
|
// Don't close when clicking on desktop mode
|
||||||
if (
|
if ((event.target as HTMLElement).nodeName !== "SUMMARY" || event.detail === 0) {
|
||||||
(event.target as HTMLElement).nodeName !== "SUMMARY" ||
|
|
||||||
(event as MouseEvent).detail === 0
|
|
||||||
) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-expect-error 2307 this dependency does exist, but it's a little bit wacky
|
|
||||||
import clip from "@arendjr/text-clipper";
|
import clip from "@arendjr/text-clipper";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -70,16 +70,15 @@ function createTooltip(element: HTMLElement) {
|
|||||||
function updateTooltip(element: HTMLElement, tooltip: HTMLElement, status: Status) {
|
function updateTooltip(element: HTMLElement, tooltip: HTMLElement, status: Status) {
|
||||||
// Update tooltip status and set it's attributes and content
|
// Update tooltip status and set it's attributes and content
|
||||||
tooltip.setAttribute("tooltip-status", status);
|
tooltip.setAttribute("tooltip-status", status);
|
||||||
tooltip.innerText = element.getAttribute("tooltip") as string;
|
tooltip.innerText = element.getAttribute("tooltip");
|
||||||
|
|
||||||
for (const attributes of [
|
for (const attributes of [
|
||||||
{ src: "tooltip-class", dst: "class", default: ["tooltip"] },
|
{ src: "tooltip-class", dst: "class", default: ["tooltip"] },
|
||||||
{ src: "tooltip-id", dst: "id", default: [] },
|
{ src: "tooltip-id", dst: "id", default: [] },
|
||||||
]) {
|
]) {
|
||||||
const populated = attributes.default;
|
const populated = attributes.default;
|
||||||
const attr = element.getAttribute(attributes.src);
|
if (element.hasAttribute(attributes.src)) {
|
||||||
if (attr !== null) {
|
populated.push(...element.getAttribute(attributes.src).split(" "));
|
||||||
populated.push(...attr.split(" "));
|
|
||||||
}
|
}
|
||||||
tooltip.setAttribute(attributes.dst, populated.join(" "));
|
tooltip.setAttribute(attributes.dst, populated.join(" "));
|
||||||
}
|
}
|
||||||
@@ -94,7 +93,7 @@ function getTooltip(element: HTMLElement) {
|
|||||||
return tooltip;
|
return tooltip;
|
||||||
}
|
}
|
||||||
|
|
||||||
function tooltipMouseover(event: Event) {
|
function tooltipMouseover(event: MouseEvent) {
|
||||||
// We get the closest tooltip to have a consistent behavior
|
// We get the closest tooltip to have a consistent behavior
|
||||||
// when hovering over a child element of a tooltip marked element
|
// when hovering over a child element of a tooltip marked element
|
||||||
const target = (event.target as HTMLElement).closest("[tooltip]") as HTMLElement;
|
const target = (event.target as HTMLElement).closest("[tooltip]") as HTMLElement;
|
||||||
@@ -112,7 +111,7 @@ function tooltipMouseover(event: Event) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function tooltipMouseout(event: Event) {
|
function tooltipMouseout(event: MouseEvent) {
|
||||||
// We get the closest tooltip to have a consistent behavior
|
// We get the closest tooltip to have a consistent behavior
|
||||||
// when hovering over a child element of a tooltip marked element
|
// when hovering over a child element of a tooltip marked element
|
||||||
const target = (event.target as HTMLElement).closest("[tooltip]") as HTMLElement;
|
const target = (event.target as HTMLElement).closest("[tooltip]") as HTMLElement;
|
||||||
@@ -142,7 +141,7 @@ new MutationObserver((mutations: MutationRecord[]) => {
|
|||||||
}
|
}
|
||||||
} else if (tooltips.has(target)) {
|
} else if (tooltips.has(target)) {
|
||||||
// Remove corresponding tooltip
|
// Remove corresponding tooltip
|
||||||
tooltips.get(target)?.remove();
|
tooltips.get(target).remove();
|
||||||
tooltips.delete(target);
|
tooltips.delete(target);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -164,7 +163,7 @@ new MutationObserver((mutations: MutationRecord[]) => {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (tooltips.has(target)) {
|
if (tooltips.has(target)) {
|
||||||
tooltips.get(target)?.remove();
|
tooltips.get(target).remove();
|
||||||
tooltips.delete(target);
|
tooltips.delete(target);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -55,6 +55,7 @@ declare interface NDEFRecordInit {
|
|||||||
// biome-ignore lint/style/useNamingConvention: this is the official API name
|
// biome-ignore lint/style/useNamingConvention: this is the official API name
|
||||||
declare type NDEFMessageSource = string | BufferSource | NDEFMessageInit;
|
declare type NDEFMessageSource = string | BufferSource | NDEFMessageInit;
|
||||||
|
|
||||||
|
// biome-ignore lint/correctness/noUnusedVariables: this is the official definition
|
||||||
interface Window {
|
interface Window {
|
||||||
// biome-ignore lint/style/useNamingConvention: this is the official API name
|
// biome-ignore lint/style/useNamingConvention: this is the official API name
|
||||||
NDEFReader: NDEFReader;
|
NDEFReader: NDEFReader;
|
||||||
|
|||||||
@@ -1,13 +1,20 @@
|
|||||||
import cytoscape, { type ElementDefinition, type Singular } from "cytoscape";
|
import cytoscape, {
|
||||||
|
type ElementDefinition,
|
||||||
|
type NodeSingular,
|
||||||
|
type Singular,
|
||||||
|
} from "cytoscape";
|
||||||
import cxtmenu from "cytoscape-cxtmenu";
|
import cxtmenu from "cytoscape-cxtmenu";
|
||||||
import klay, { type KlayLayoutOptions } from "cytoscape-klay";
|
import klay, { type KlayLayoutOptions } from "cytoscape-klay";
|
||||||
import { History, initialUrlParams, updateQueryString } from "#core:utils/history";
|
import { History, initialUrlParams, updateQueryString } from "#core:utils/history.ts";
|
||||||
import { familyGetFamilyGraph, type UserProfileSchema } from "#openapi";
|
import { familyGetFamilyGraph, type UserProfileSchema } from "#openapi";
|
||||||
|
|
||||||
cytoscape.use(klay);
|
cytoscape.use(klay);
|
||||||
cytoscape.use(cxtmenu);
|
cytoscape.use(cxtmenu);
|
||||||
|
|
||||||
type GraphData = { data: UserProfileSchema | { source: number; target: number } }[];
|
type GraphData = (
|
||||||
|
| { data: UserProfileSchema }
|
||||||
|
| { data: { source: number; target: number } }
|
||||||
|
)[];
|
||||||
|
|
||||||
function isMobile() {
|
function isMobile() {
|
||||||
return window.innerWidth < 500;
|
return window.innerWidth < 500;
|
||||||
@@ -20,8 +27,10 @@ async function getGraphData(
|
|||||||
): Promise<GraphData> {
|
): Promise<GraphData> {
|
||||||
const data = (
|
const data = (
|
||||||
await familyGetFamilyGraph({
|
await familyGetFamilyGraph({
|
||||||
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
path: {
|
||||||
path: { user_id: userId },
|
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
||||||
|
user_id: userId,
|
||||||
|
},
|
||||||
query: {
|
query: {
|
||||||
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
||||||
godfathers_depth: godfathersDepth,
|
godfathers_depth: godfathersDepth,
|
||||||
@@ -30,10 +39,6 @@ async function getGraphData(
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
).data;
|
).data;
|
||||||
if (data === undefined) {
|
|
||||||
console.error("Family graph request failed");
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
return [
|
return [
|
||||||
...data.users.map((user) => {
|
...data.users.map((user) => {
|
||||||
return { data: user };
|
return { data: user };
|
||||||
@@ -150,7 +155,7 @@ function createGraph(container: HTMLDivElement, data: GraphData, activeUserId: n
|
|||||||
{
|
{
|
||||||
content: '<i class="fa fa-external-link fa-2x"></i>',
|
content: '<i class="fa fa-external-link fa-2x"></i>',
|
||||||
select: (el) => {
|
select: (el) => {
|
||||||
window.open(el.data().profile_url, "_blank")?.focus();
|
window.open(el.data().profile_url, "_blank").focus();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -190,12 +195,12 @@ document.addEventListener("alpine:init", () => {
|
|||||||
godfathersDepth: 0,
|
godfathersDepth: 0,
|
||||||
godchildrenDepth: 0,
|
godchildrenDepth: 0,
|
||||||
reverse: initialUrlParams.get("reverse")?.toLowerCase?.() === "true",
|
reverse: initialUrlParams.get("reverse")?.toLowerCase?.() === "true",
|
||||||
graph: undefined as unknown as cytoscape.Core,
|
graph: undefined as cytoscape.Core,
|
||||||
graphData: {} as GraphData,
|
graphData: {},
|
||||||
isZoomEnabled: !isMobile(),
|
isZoomEnabled: !isMobile(),
|
||||||
|
|
||||||
getInitialDepth(prop: string) {
|
getInitialDepth(prop: string) {
|
||||||
const value = Number.parseInt(initialUrlParams.get(prop) as string, 10);
|
const value = Number.parseInt(initialUrlParams.get(prop), 10);
|
||||||
if (Number.isNaN(value) || value < config.depthMin || value > config.depthMax) {
|
if (Number.isNaN(value) || value < config.depthMin || value > config.depthMax) {
|
||||||
return defaultDepth;
|
return defaultDepth;
|
||||||
}
|
}
|
||||||
@@ -218,8 +223,8 @@ document.addEventListener("alpine:init", () => {
|
|||||||
await delayedFetch();
|
await delayedFetch();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
this.$watch("reverse", async (newValue, _oldValue) => {
|
this.$watch("reverse", async (value: number) => {
|
||||||
updateQueryString("reverse", newValue.toString(), History.Replace);
|
updateQueryString("reverse", value.toString(), History.Replace);
|
||||||
await this.reverseGraph();
|
await this.reverseGraph();
|
||||||
});
|
});
|
||||||
this.$watch("graphData", async () => {
|
this.$watch("graphData", async () => {
|
||||||
@@ -254,9 +259,9 @@ document.addEventListener("alpine:init", () => {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async reverseGraph() {
|
async reverseGraph() {
|
||||||
this.graph
|
this.graph.elements((el: NodeSingular) => {
|
||||||
.elements()
|
el.position({ x: -el.position().x, y: -el.position().y });
|
||||||
.positions((el, _) => ({ x: -el.position().x, y: -el.position().y }));
|
});
|
||||||
this.graph.center(this.graph.elements());
|
this.graph.center(this.graph.elements());
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ interface AlertParams {
|
|||||||
|
|
||||||
export class AlertMessage {
|
export class AlertMessage {
|
||||||
public open: boolean;
|
public open: boolean;
|
||||||
public success!: boolean;
|
public success: boolean;
|
||||||
public content: string;
|
public content: string;
|
||||||
private timeoutId: number | null;
|
private timeoutId?: number;
|
||||||
private readonly defaultDuration: number;
|
private readonly defaultDuration: number;
|
||||||
|
|
||||||
constructor(params?: { defaultDuration: number }) {
|
constructor(params?: { defaultDuration: number }) {
|
||||||
|
|||||||
@@ -37,10 +37,6 @@ export const paginated = async <T>(
|
|||||||
queryParams.query.page = 1;
|
queryParams.query.page = 1;
|
||||||
|
|
||||||
const firstPage = (await endpoint(queryParams)).data;
|
const firstPage = (await endpoint(queryParams)).data;
|
||||||
if (firstPage === undefined) {
|
|
||||||
console.error(`Request to "${options?.url}" failed`);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
const results = firstPage.results;
|
const results = firstPage.results;
|
||||||
|
|
||||||
const nbElements = firstPage.count;
|
const nbElements = firstPage.count;
|
||||||
@@ -49,9 +45,9 @@ export const paginated = async <T>(
|
|||||||
if (nbPages > 1) {
|
if (nbPages > 1) {
|
||||||
const promises: Promise<T[]>[] = [];
|
const promises: Promise<T[]>[] = [];
|
||||||
for (let i = 2; i <= nbPages; i++) {
|
for (let i = 2; i <= nbPages; i++) {
|
||||||
const nextPage = structuredClone(queryParams) as Required<PaginatedRequest>;
|
const nextPage = structuredClone(queryParams);
|
||||||
nextPage.query.page = i;
|
nextPage.query.page = i;
|
||||||
promises.push(endpoint(nextPage).then((res) => res.data?.results ?? []));
|
promises.push(endpoint(nextPage).then((res) => res.data.results));
|
||||||
}
|
}
|
||||||
results.push(...(await Promise.all(promises)).flat());
|
results.push(...(await Promise.all(promises)).flat());
|
||||||
}
|
}
|
||||||
@@ -65,7 +61,8 @@ interface Request extends TDataShape {
|
|||||||
interface InterceptorOptions {
|
interface InterceptorOptions {
|
||||||
url: string;
|
url: string;
|
||||||
}
|
}
|
||||||
export type GenericEndpoint = <ThrowOnError extends boolean = false>(
|
|
||||||
|
type GenericEndpoint = <ThrowOnError extends boolean = false>(
|
||||||
options?: Options<Request, ThrowOnError>,
|
options?: Options<Request, ThrowOnError>,
|
||||||
) => RequestResult<unknown, unknown, ThrowOnError>;
|
) => RequestResult<unknown, unknown, ThrowOnError>;
|
||||||
|
|
||||||
@@ -74,7 +71,7 @@ export type GenericEndpoint = <ThrowOnError extends boolean = false>(
|
|||||||
**/
|
**/
|
||||||
export const makeUrl = async (endpoint: GenericEndpoint) => {
|
export const makeUrl = async (endpoint: GenericEndpoint) => {
|
||||||
let url = "";
|
let url = "";
|
||||||
const interceptor = (_request: Request, options: InterceptorOptions) => {
|
const interceptor = (_request: undefined, options: InterceptorOptions) => {
|
||||||
url = options.url;
|
url = options.url;
|
||||||
throw new Error("We don't want to send the request");
|
throw new Error("We don't want to send the request");
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,14 +7,14 @@ interface StringifyOptions<T extends object> {
|
|||||||
titleRow?: readonly string[];
|
titleRow?: readonly string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
function getNested<T extends { [key: string]: unknown }>(obj: T, key: NestedKeyOf<T>) {
|
function getNested<T extends object>(obj: T, key: NestedKeyOf<T>) {
|
||||||
const path = key.split(".");
|
const path: (keyof object)[] = key.split(".") as (keyof unknown)[];
|
||||||
let res = obj[path.shift() as string] as { [key: string]: unknown } | undefined;
|
let res = obj[path.shift() as keyof T];
|
||||||
for (const node of path) {
|
for (const node of path) {
|
||||||
if (res === undefined) {
|
if (res === null) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
res = res[node] as { [key: string]: unknown } | undefined;
|
res = res[node];
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@@ -29,21 +29,18 @@ function sanitizeCell(content: string): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const csv = {
|
export const csv = {
|
||||||
stringify: <T extends { [key: string]: unknown }>(
|
stringify: <T extends object>(objs: T[], options?: StringifyOptions<T>) => {
|
||||||
objs: T[],
|
const columns = options.columns;
|
||||||
options?: StringifyOptions<T>,
|
|
||||||
) => {
|
|
||||||
const columns = options?.columns;
|
|
||||||
const content = objs
|
const content = objs
|
||||||
.map((obj) => {
|
.map((obj) => {
|
||||||
return (columns ?? [])
|
return columns
|
||||||
.map((col) => {
|
.map((col) => {
|
||||||
return sanitizeCell((getNested(obj, col) ?? "").toString());
|
return sanitizeCell((getNested(obj, col) ?? "").toString());
|
||||||
})
|
})
|
||||||
.join(",");
|
.join(",");
|
||||||
})
|
})
|
||||||
.join("\n");
|
.join("\n");
|
||||||
if (!options?.titleRow) {
|
if (!options.titleRow) {
|
||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
const firstRow = options.titleRow.map(sanitizeCell).join(",");
|
const firstRow = options.titleRow.map(sanitizeCell).join(",");
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ export function registerComponent(name: string, options?: ElementDefinitionOptio
|
|||||||
export interface InheritedHtmlElement<K extends keyof HTMLElementTagNameMap>
|
export interface InheritedHtmlElement<K extends keyof HTMLElementTagNameMap>
|
||||||
extends HTMLElement {
|
extends HTMLElement {
|
||||||
readonly inheritedTagName: K;
|
readonly inheritedTagName: K;
|
||||||
// readonly initializedAttribute: "component-initialized";
|
|
||||||
node: HTMLElementTagNameMap[K];
|
node: HTMLElementTagNameMap[K];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,8 +47,8 @@ export function inheritHtmlElement<K extends keyof HTMLElementTagNameMap>(tagNam
|
|||||||
implements InheritedHtmlElement<K>
|
implements InheritedHtmlElement<K>
|
||||||
{
|
{
|
||||||
readonly inheritedTagName = tagName;
|
readonly inheritedTagName = tagName;
|
||||||
readonly initializedAttribute = "component-initialized";
|
private readonly initializedAttribute = "component-initialized";
|
||||||
node!: HTMLElementTagNameMap[K];
|
node: HTMLElementTagNameMap[K];
|
||||||
|
|
||||||
connectedCallback(autoAddNode?: boolean) {
|
connectedCallback(autoAddNode?: boolean) {
|
||||||
// When nesting inherited elements, we might trigger the wrapping twice
|
// When nesting inherited elements, we might trigger the wrapping twice
|
||||||
|
|||||||
@@ -46,10 +46,6 @@ details.accordion>.accordion-content {
|
|||||||
border-bottom-right-radius: 3px;
|
border-bottom-right-radius: 3px;
|
||||||
border-bottom-left-radius: 3px;
|
border-bottom-left-radius: 3px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
@media screen and (max-width: 600px) {
|
|
||||||
padding: .75em 1.5em;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin animation($selector) {
|
@mixin animation($selector) {
|
||||||
|
|||||||
+104
-66
@@ -16,16 +16,76 @@
|
|||||||
--event-details-padding: 20px;
|
--event-details-padding: 20px;
|
||||||
--event-details-border: 1px solid #EEEEEE;
|
--event-details-border: 1px solid #EEEEEE;
|
||||||
--event-details-border-radius: 4px;
|
--event-details-border-radius: 4px;
|
||||||
--event-details-box-shadow: 0px 6px 20px 4px rgb(0 0 0 / 16%);
|
--event-details-box-shadow: 0 6px 20px 4px rgb(0 0 0 / 16%);
|
||||||
--event-details-max-width: 600px;
|
--event-details-max-width: 600px;
|
||||||
--event-recurring-internal-color: #6f69cd;
|
--event-recurring-internal-color: #6f69cd;
|
||||||
--event-recurring-unpublished-color: orange;
|
--event-recurring-unpublished-color: orange;
|
||||||
}
|
}
|
||||||
|
|
||||||
ics-calendar {
|
ics-calendar,
|
||||||
|
room-scheduler {
|
||||||
border: none;
|
border: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
|
|
||||||
|
a.fc-col-header-cell-cushion,
|
||||||
|
a.fc-col-header-cell-cushion:hover {
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
|
a.fc-daygrid-day-number,
|
||||||
|
a.fc-daygrid-day-number:hover {
|
||||||
|
color: rgb(34, 34, 34);
|
||||||
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
overflow: visible; // Show events on multiple days
|
||||||
|
}
|
||||||
|
|
||||||
|
td, th {
|
||||||
|
text-align: unset;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Reset from style.scss
|
||||||
|
table {
|
||||||
|
box-shadow: none;
|
||||||
|
border-radius: 0;
|
||||||
|
-moz-border-radius: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset from style.scss
|
||||||
|
thead {
|
||||||
|
background-color: white;
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset from style.scss
|
||||||
|
tbody > tr {
|
||||||
|
&:nth-child(even):not(.highlight) {
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.fc .fc-toolbar.fc-footer-toolbar {
|
||||||
|
margin-bottom: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
button.text-copy,
|
||||||
|
button.text-copy:focus,
|
||||||
|
button.text-copy:hover {
|
||||||
|
background-color: #67AE6E !important;
|
||||||
|
transition: 500ms ease-in;
|
||||||
|
}
|
||||||
|
|
||||||
|
button.text-copied,
|
||||||
|
button.text-copied:focus,
|
||||||
|
button.text-copied:hover {
|
||||||
|
transition: 500ms ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
ics-calendar {
|
||||||
#event-details {
|
#event-details {
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
max-width: 1151px;
|
max-width: 1151px;
|
||||||
@@ -62,82 +122,60 @@ ics-calendar {
|
|||||||
align-items: start;
|
align-items: start;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
background-color: var(--event-details-background-color);
|
background-color: var(--event-details-background-color);
|
||||||
margin-top: 0px;
|
margin-top: 0;
|
||||||
margin-bottom: 4px;
|
margin-bottom: 4px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
a.fc-col-header-cell-cushion,
|
// Reset from style.scss
|
||||||
a.fc-col-header-cell-cushion:hover {
|
thead {
|
||||||
color: black;
|
background-color: white;
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset from style.scss
|
||||||
|
tbody > tr {
|
||||||
|
&:nth-child(even):not(.highlight) {
|
||||||
|
background: white;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
a.fc-daygrid-day-number,
|
.fc .fc-toolbar.fc-footer-toolbar {
|
||||||
a.fc-daygrid-day-number:hover {
|
margin-bottom: 0.5em;
|
||||||
color: rgb(34, 34, 34);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
td {
|
button.text-copy,
|
||||||
overflow: visible; // Show events on multiple days
|
button.text-copy:focus,
|
||||||
}
|
button.text-copy:hover {
|
||||||
|
background-color: #67AE6E !important;
|
||||||
|
transition: 500ms ease-in;
|
||||||
|
}
|
||||||
|
|
||||||
//Reset from style.scss
|
button.text-copied,
|
||||||
table {
|
button.text-copied:focus,
|
||||||
box-shadow: none;
|
button.text-copied:hover {
|
||||||
border-radius: 0px;
|
transition: 500ms ease-out;
|
||||||
-moz-border-radius: 0px;
|
}
|
||||||
margin: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset from style.scss
|
.fc .fc-getCalendarLink-button {
|
||||||
thead {
|
margin-right: 0.5rem;
|
||||||
background-color: white;
|
}
|
||||||
color: black;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset from style.scss
|
.fc .fc-helpButton-button {
|
||||||
tbody>tr {
|
border-radius: 70%;
|
||||||
&:nth-child(even):not(.highlight) {
|
padding-left: 0.5rem;
|
||||||
background: white;
|
padding-right: 0.5rem;
|
||||||
}
|
background-color: rgba(0, 0, 0, 0.8);
|
||||||
}
|
transition: 100ms ease-out;
|
||||||
|
width: 30px;
|
||||||
.fc .fc-toolbar.fc-footer-toolbar {
|
height: 30px;
|
||||||
margin-bottom: 0.5em;
|
font-size: 11px;
|
||||||
}
|
}
|
||||||
|
|
||||||
button.text-copy,
|
|
||||||
button.text-copy:focus,
|
|
||||||
button.text-copy:hover {
|
|
||||||
background-color: #67AE6E !important;
|
|
||||||
transition: 500ms ease-in;
|
|
||||||
}
|
|
||||||
|
|
||||||
button.text-copied,
|
|
||||||
button.text-copied:focus,
|
|
||||||
button.text-copied:hover {
|
|
||||||
transition: 500ms ease-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
.fc .fc-getCalendarLink-button {
|
|
||||||
margin-right: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.fc .fc-helpButton-button {
|
|
||||||
border-radius: 70%;
|
|
||||||
padding-left: 0.5rem;
|
|
||||||
padding-right: 0.5rem;
|
|
||||||
background-color: rgba(0, 0, 0, 0.8);
|
|
||||||
transition: 100ms ease-out;
|
|
||||||
width: 30px;
|
|
||||||
height: 30px;
|
|
||||||
font-size: 11px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.fc .fc-helpButton-button:hover {
|
.fc .fc-helpButton-button:hover {
|
||||||
background-color: rgba(20, 20, 20, 0.6);
|
background-color: rgba(20, 20, 20, 0.6);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.tooltip.calendar-copy-tooltip {
|
.tooltip.calendar-copy-tooltip {
|
||||||
@@ -16,6 +16,13 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.card-group {
|
||||||
|
display: flex;
|
||||||
|
gap: 15px;
|
||||||
|
margin-bottom: 30px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
.card {
|
.card {
|
||||||
background-color: $primary-neutral-light-color;
|
background-color: $primary-neutral-light-color;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
@@ -29,12 +36,7 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 20px;
|
gap: 20px;
|
||||||
|
|
||||||
&:disabled {
|
&.clickable:hover {
|
||||||
background-color: darken($primary-neutral-light-color, 5%);
|
|
||||||
opacity: 65%;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.clickable:not(:disabled):hover {
|
|
||||||
background-color: darken($primary-neutral-light-color, 5%);
|
background-color: darken($primary-neutral-light-color, 5%);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -97,13 +99,23 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 765px) {
|
@media screen and (max-width: 765px) {
|
||||||
@include row-layout
|
@include row-layout;
|
||||||
}
|
}
|
||||||
|
|
||||||
// When combined with card, card-row display the card in a row layout,
|
// When combined with card, card-row display the card in a row layout,
|
||||||
// whatever the size of the screen.
|
// whatever the size of the screen.
|
||||||
&.card-row {
|
&.card-row {
|
||||||
@include row-layout
|
@include row-layout;
|
||||||
|
|
||||||
|
&.card-row-m {
|
||||||
|
//width: 50%;
|
||||||
|
max-width: 50%;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.card-row-s {
|
||||||
|
//width: 33%;
|
||||||
|
max-width: 33%;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
color: black;
|
color: black;
|
||||||
|
|
||||||
&:not(.link-like):not(:disabled):hover {
|
&:hover {
|
||||||
background: hsl(0, 0%, 83%);
|
background: hsl(0, 0%, 83%);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -141,6 +141,7 @@ form {
|
|||||||
display: block;
|
display: block;
|
||||||
margin: calc(var(--nf-input-size) * 1.5) auto 10px;
|
margin: calc(var(--nf-input-size) * 1.5) auto 10px;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
|
white-space: nowrap;
|
||||||
|
|
||||||
.fields-centered {
|
.fields-centered {
|
||||||
padding: 10px 10px 0;
|
padding: 10px 10px 0;
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ $background-color-hovered: #283747;
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
a.button {
|
>.button {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
height: 35px;
|
height: 35px;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
@@ -139,7 +139,7 @@ $background-color-hovered: #283747;
|
|||||||
font-size: .9em;
|
font-size: .9em;
|
||||||
width: 120px;
|
width: 120px;
|
||||||
|
|
||||||
&:not(.link-like):not(:disabled):hover {
|
&:hover {
|
||||||
background-color: $background-color-hovered;
|
background-color: $background-color-hovered;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,10 +10,9 @@
|
|||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
padding: 5px 10px;
|
padding: 5px 10px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
white-space: nowrap;
|
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: opacity 500ms ease-out;
|
transition: opacity 500ms ease-out;
|
||||||
|
width: max-content;
|
||||||
white-space: normal;
|
white-space: normal;
|
||||||
|
|
||||||
left: 0;
|
left: 0;
|
||||||
|
|||||||
+46
-11
@@ -37,7 +37,8 @@ body {
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
form {
|
>div,
|
||||||
|
>form {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -48,33 +49,67 @@ body {
|
|||||||
max-width: 500px;
|
max-width: 500px;
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
|
|
||||||
input[type="submit"] {
|
>p,
|
||||||
|
>div {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 300px;
|
margin: 0;
|
||||||
margin-top: 1em;
|
|
||||||
|
>label {
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
@media (min-width: 500px) {
|
||||||
|
width: 300px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.errorlist {
|
>input,
|
||||||
|
>p>input,
|
||||||
|
>div>input {
|
||||||
|
box-sizing: border-box;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 500px;
|
||||||
|
|
||||||
|
@media (min-width: 500px) {
|
||||||
|
max-width: 300px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
>.errorlist {
|
||||||
color: red;
|
color: red;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
margin: 10px 0 0 0;
|
margin: 10px 0 0 0;
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
div, fieldset {
|
>.required>.helptext {
|
||||||
max-width: 300px;
|
text-align: center;
|
||||||
|
font-style: italic;
|
||||||
}
|
}
|
||||||
.captcha {
|
|
||||||
box-sizing: border-box;
|
|
||||||
|
|
||||||
fieldset {
|
>.required:last-of-type {
|
||||||
margin-bottom: unset
|
box-sizing: border-box;
|
||||||
|
max-width: 300px;
|
||||||
|
flex-direction: row;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: space-between;
|
||||||
|
|
||||||
|
>label {
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
>img {
|
>img {
|
||||||
width: 70px;
|
width: 70px;
|
||||||
object-fit: contain;
|
object-fit: contain;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
>input {
|
||||||
|
width: 200px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,10 +4,6 @@
|
|||||||
|
|
||||||
<div id="page">
|
<div id="page">
|
||||||
<h3>{% trans %}404, Not Found{% endtrans %}</h3>
|
<h3>{% trans %}404, Not Found{% endtrans %}</h3>
|
||||||
|
|
||||||
<blockquote>
|
|
||||||
{% trans %}Impossible, perhaps the archives are incomplete{% endtrans %}
|
|
||||||
</blockquote>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@@ -14,8 +14,6 @@
|
|||||||
{%- endblock %}"
|
{%- endblock %}"
|
||||||
>
|
>
|
||||||
<meta property="og:site_name" content="Association des Étudiants de l'UTBM" />
|
<meta property="og:site_name" content="Association des Étudiants de l'UTBM" />
|
||||||
<meta property="og:locale" content="fr_FR" />
|
|
||||||
<meta property="og:locale:alternate" content="en_GB" />
|
|
||||||
{% block metatags %}
|
{% block metatags %}
|
||||||
<meta property="og:url" content="{{ request.build_absolute_uri() }}" />
|
<meta property="og:url" content="{{ request.build_absolute_uri() }}" />
|
||||||
<meta property="og:type" content="website" />
|
<meta property="og:type" content="website" />
|
||||||
|
|||||||
@@ -22,9 +22,14 @@
|
|||||||
</form>
|
</form>
|
||||||
<ul class="bars">
|
<ul class="bars">
|
||||||
{% cache 100 "counters_activity" %}
|
{% cache 100 "counters_activity" %}
|
||||||
{# It would be cleaner to handle the timeout with django-celery-beat,
|
{# The sith has no periodic tasks manager
|
||||||
but doing it here is simpler and less error-prone #}
|
and using cron jobs would be way too overkill here.
|
||||||
{% do Counter.objects.filter(type="BAR").handle_timeout() %}
|
Thus the barmen timeout is handled in the only place that
|
||||||
|
is loaded on every page : the header bar.
|
||||||
|
However, let's be clear : this has nothing to do here.
|
||||||
|
It's' merely a contrived workaround that should
|
||||||
|
replaced by a proper task manager as soon as possible. #}
|
||||||
|
{% set _ = Counter.objects.filter(type="BAR").handle_timeout() %}
|
||||||
{% endcache %}
|
{% endcache %}
|
||||||
{% for bar in Counter.objects.annotate_has_barman(user).annotate_is_open().filter(type="BAR") %}
|
{% for bar in Counter.objects.annotate_has_barman(user).annotate_is_open().filter(type="BAR") %}
|
||||||
<li>
|
<li>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<template x-for="(message, index) in $notifications.getAll()">
|
<template x-for="(message, index) in $notifications.getAll()">
|
||||||
<div class="alert" :class="`alert-${message.tag}`" x-transition>
|
<div class="alert" :class="`alert-${message.tag}`" x-transition>
|
||||||
<span class="alert-main" x-text="message.text"></span>
|
<span class="alert-main" x-text="message.text"></span>
|
||||||
<span class="clickable" @click="$store.notifications = $store.notifications.filter((item, i) => i !== index)">
|
<span class="clickable" @click="messages = messages.filter((item, i) => i !== index)">
|
||||||
<i class="fa fa-close"></i>
|
<i class="fa fa-close"></i>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
{% extends "core/base.jinja" %}
|
|
||||||
|
|
||||||
{%- block additional_css -%}
|
|
||||||
<link rel="stylesheet" href="{{ static('user/login.scss') }}">
|
|
||||||
{%- endblock -%}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
{% trans %}Login{% endtrans %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block info_boxes %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block nav %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1 class="title">{% trans %}Terms of Service{% endtrans %}</h1>
|
|
||||||
|
|
||||||
<form method="post" id="login-form">
|
|
||||||
{% csrf_token %}
|
|
||||||
|
|
||||||
<div class="alert alert-yellow">
|
|
||||||
{% trans trimmed %}
|
|
||||||
To continue using our services,
|
|
||||||
please read and approve the AE website's terms of service
|
|
||||||
{% endtrans %}
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
{{ form.cgu_approved_at.errors }}
|
|
||||||
{{ form.cgu_approved_at }}
|
|
||||||
{{ form.cgu_approved_at.label_tag() }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<input type="hidden" name="next" value="{{ next }}">
|
|
||||||
<input type="submit" class="btn btn-blue">
|
|
||||||
</form>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
Loaded 100 of 301 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user