mirror of
https://github.com/ae-utbm/sith.git
synced 2026-09-03 19:19:19 +00:00
Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec051f5982 | ||
|
|
22ecd01898 | ||
|
|
1fa4ccd710 | ||
|
|
2a71708ccd | ||
|
|
549d8c67e7 | ||
|
|
ff69741c82 | ||
|
|
b5b837498f | ||
|
|
8ef3054888 | ||
|
|
362f1a6a62 | ||
|
|
b6347829c6 | ||
|
|
2099e1bd36 | ||
|
|
7fca5d8c75 | ||
|
|
3467aad846 | ||
|
|
ebfac638de | ||
|
|
839536661b | ||
|
|
b1b3639dc9 | ||
|
|
56c832ba06
|
||
|
|
884019d803 | ||
|
|
dfc714ff3d
|
@@ -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-disabled-elt="find input[type='submit']"
|
hx-disable="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"
|
||||||
|
|||||||
-11
@@ -3,7 +3,6 @@ from typing import Annotated, 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
|
||||||
@@ -18,7 +17,6 @@ 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,
|
||||||
@@ -28,18 +26,9 @@ from core.schemas import (
|
|||||||
UserSchema,
|
UserSchema,
|
||||||
ValidationErrorSchema,
|
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(
|
||||||
|
|||||||
@@ -161,10 +161,6 @@ 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
|
||||||
|
|||||||
@@ -6,10 +6,15 @@
|
|||||||
* for more efficient tree-shaking and gzip compression.
|
* for more efficient tree-shaking and gzip compression.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// Must be loaded before Apline
|
||||||
|
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 { 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";
|
||||||
@@ -44,16 +49,16 @@ polyfillCountryFlagEmojis();
|
|||||||
* HTMX
|
* HTMX
|
||||||
*/
|
*/
|
||||||
document.body.addEventListener(
|
document.body.addEventListener(
|
||||||
"htmx:beforeRequest" as keyof HTMLElementEventMap,
|
"htmx:before:request" as keyof HTMLElementEventMap,
|
||||||
(event) => {
|
(event) => {
|
||||||
(event as CustomEvent).detail.target.ariaBusy = true;
|
(event as CustomEvent).detail.ctx.target.ariaBusy = true;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
document.body.addEventListener(
|
document.body.addEventListener(
|
||||||
"htmx:beforeSwap" as keyof HTMLElementEventMap,
|
"htmx:before:swap" as keyof HTMLElementEventMap,
|
||||||
(event) => {
|
(event) => {
|
||||||
(event as CustomEvent).detail.target.ariaBusy = null;
|
(event as CustomEvent).detail.ctx.target.ariaBusy = null;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -3,16 +3,12 @@
|
|||||||
import "codemirror/lib/codemirror.css";
|
import "codemirror/lib/codemirror.css";
|
||||||
// @ts-expect-error 2307
|
// @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";
|
import type CodeMirror from "codemirror"; // biome-ignore lint/style/useNamingConvention: This is how they called their namespace
|
||||||
// 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";
|
||||||
import {
|
import { type UploadUploadImageErrors, uploadUploadImage } from "#openapi";
|
||||||
markdownRenderMarkdown,
|
|
||||||
type UploadUploadImageErrors,
|
|
||||||
uploadUploadImage,
|
|
||||||
} from "#openapi";
|
|
||||||
|
|
||||||
const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
||||||
const easymde = new EasyMDE({
|
const easymde = new EasyMDE({
|
||||||
@@ -64,19 +60,7 @@ const loadEasyMde = (textarea: HTMLTextAreaElement) => {
|
|||||||
});
|
});
|
||||||
easymde.codemirror.replaceSelection("\n");
|
easymde.codemirror.replaceSelection("\n");
|
||||||
},
|
},
|
||||||
previewRender: (plainText, preview) => {
|
previewRender: (plainText) => markdown(plainText),
|
||||||
/* This is wrapped this way to allow time for Alpine to be loaded on the page */
|
|
||||||
return Alpine.debounce(() => {
|
|
||||||
const func = async () => {
|
|
||||||
preview.innerHTML = (
|
|
||||||
await markdownRenderMarkdown({ body: { text: plainText } })
|
|
||||||
).data as string;
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
func().then();
|
|
||||||
return null;
|
|
||||||
}, 300)();
|
|
||||||
},
|
|
||||||
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."),
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
|
|
||||||
<div id="page">
|
<div id="page">
|
||||||
<h3>{% trans %}404, Not Found{% endtrans %}</h3>
|
<h3>{% trans %}404, Not Found{% endtrans %}</h3>
|
||||||
|
|
||||||
|
<blockquote>Impossible, perhaps the archives are incomplete</blockquote>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<form
|
<form
|
||||||
hx-post="{{ url("core:user_visibility_fragment", user_id=form.instance.id) }}"
|
hx-post="{{ url("core:user_visibility_fragment", user_id=form.instance.id) }}"
|
||||||
hx-disabled-elt="find input[type='submit']"
|
hx-disable="find input[type='submit']"
|
||||||
hx-swap="outerHTML" x-data="{ isViewable: {{ form.is_viewable.value()|tojson }} }"
|
hx-swap="outerHTML" x-data="{ isViewable: {{ form.is_viewable.value()|tojson }} }"
|
||||||
>
|
>
|
||||||
{% for message in messages %}
|
{% for message in messages %}
|
||||||
|
|||||||
@@ -141,6 +141,22 @@ class TestSearchUsersView(TestSearchUsers):
|
|||||||
response = self.client.get(reverse("core:search"))
|
response = self.client.get(reverse("core:search"))
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
|
|
||||||
|
def test_search_with_whitelist_unique(self):
|
||||||
|
"""Test that when a user has a whitelist and appears in the results,
|
||||||
|
it appears only once.
|
||||||
|
|
||||||
|
This is a regression test (cf #1463)
|
||||||
|
"""
|
||||||
|
user = subscriber_user.make(is_viewable=False)
|
||||||
|
user.whitelisted_users.add(
|
||||||
|
*subscriber_user.make(_quantity=4, _bulk_create=True)
|
||||||
|
)
|
||||||
|
self.client.force_login(user)
|
||||||
|
response = self.client.get(
|
||||||
|
reverse("core:search", query={"query": user.last_name})
|
||||||
|
)
|
||||||
|
assert response.context_data["users"] == [user]
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_user_account_not_found(client: Client):
|
def test_user_account_not_found(client: Client):
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ class SearchView(LoginRequiredMixin, TemplateView):
|
|||||||
UserFilterSchema(search=query)
|
UserFilterSchema(search=query)
|
||||||
.filter(User.objects.viewable_by(self.request.user))
|
.filter(User.objects.viewable_by(self.request.user))
|
||||||
.order_by(F("last_login").desc(nulls_last=True))
|
.order_by(F("last_login").desc(nulls_last=True))
|
||||||
|
.distinct()
|
||||||
)
|
)
|
||||||
clubs = list(Club.objects.filter(name__icontains=query)[:5])
|
clubs = list(Club.objects.filter(name__icontains=query)[:5])
|
||||||
return super().get_context_data(**kwargs) | {"users": users, "clubs": clubs}
|
return super().get_context_data(**kwargs) | {"users": users, "clubs": clubs}
|
||||||
|
|||||||
@@ -28,18 +28,23 @@ export class ProductAjaxSelect extends AjaxSelect {
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
private getName(item: SimpleProductSchema, sanitize: typeof escape_html): string {
|
// In the context in which this method is called, `this` might be shadowed
|
||||||
|
// We need to call it explicitly from the class itself
|
||||||
|
private static getName(
|
||||||
|
item: SimpleProductSchema,
|
||||||
|
sanitize: typeof escape_html,
|
||||||
|
): string {
|
||||||
return item.code ? `${sanitize(item.code)} - ${sanitize(item.name)}` : item.name;
|
return item.code ? `${sanitize(item.code)} - ${sanitize(item.name)}` : item.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected renderOption(item: SimpleProductSchema, sanitize: typeof escape_html) {
|
protected renderOption(item: SimpleProductSchema, sanitize: typeof escape_html) {
|
||||||
return `<div class="select-item">
|
return `<div class="select-item">
|
||||||
<span class="select-item-text">${this.getName(item, sanitize)}</span>
|
<span class="select-item-text">${ProductAjaxSelect.getName(item, sanitize)}</span>
|
||||||
</div>`;
|
</div>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected renderItem(item: SimpleProductSchema, sanitize: typeof escape_html) {
|
protected renderItem(item: SimpleProductSchema, sanitize: typeof escape_html) {
|
||||||
return `<span>${this.getName(item, sanitize)}</span>`;
|
return `<span>${ProductAjaxSelect.getName(item, sanitize)}</span>`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
<div id="student_card_form">
|
<div id="student_card_form">
|
||||||
<form hx-post="{{ action }}" hx-swap="outerHTML" hx-target="#student_card_form">
|
<form
|
||||||
|
hx-post="{{ action }}"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
hx-target="#student_card_form"
|
||||||
|
hx-disable="input[type='submit']"
|
||||||
|
>
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<p>{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}</p>
|
<p>{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}</p>
|
||||||
<input type="submit" value="{% trans %}Confirm{% endtrans %}" />
|
<input type="submit" value="{% trans %}Confirm{% endtrans %}" />
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ C'est une technologie simple et puissante qui se veut comme le jQuery du web mod
|
|||||||
|
|
||||||
### Htmx
|
### Htmx
|
||||||
|
|
||||||
[Site officiel](https://htmx.org/)
|
[Site officiel](https://four.htmx.org/)
|
||||||
|
|
||||||
En plus de AlpineJS, l’interactivité sur le site est augmentée via Htmx.
|
En plus de AlpineJS, l’interactivité sur le site est augmentée via Htmx.
|
||||||
C'est une librairie js qui s'utilise également au moyen d'attributs HTML à
|
C'est une librairie js qui s'utilise également au moyen d'attributs HTML à
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
## syntaxe aemark
|
||||||
|
|
||||||
|
Le site AE utilise markdown pour le rendu de la plupart
|
||||||
|
des textes saisis par les utilisateurs.
|
||||||
|
Cependant, la syntaxe utilisée n'est pas celle officielle
|
||||||
|
telle que définie par John Gruber,
|
||||||
|
mais est basée sur [CommonMark](https://commonmark.org/),
|
||||||
|
avec quelques variations pour les usages particuliers du site AE.
|
||||||
|
|
||||||
|
Les deux principaux ajouts sont :
|
||||||
|
|
||||||
|
- Les urls commençant par `page://` sont modifiées pour commencer par `/page/`
|
||||||
|
- Des modificateurs de taille peuvent être indiqués directement dans la source
|
||||||
|
d'une image
|
||||||
|
|
||||||
|
Les variations d'aemark sont documentées sur
|
||||||
|
[le site AE](https://ae.utbm.fr/page/Aide_sur_la_syntaxe/).
|
||||||
|
|
||||||
|
Le code est hébergé sur le dépôt Git [aemark](https://github.com/ae-utbm/ae-markdown).
|
||||||
|
|
||||||
|
## Utiliser aemark
|
||||||
|
|
||||||
|
Le code du parser aemark est écrit en Rust dans une librairie
|
||||||
|
indépendante, avec des bindings vers différents langages.
|
||||||
|
Les librairies mises à disposition exposent une seule fonction,
|
||||||
|
qui prend simplement du markdown en entrée et renvoie l'HTML correspondant.
|
||||||
|
|
||||||
|
Les librairies pour les différents langages sont toutes
|
||||||
|
basées sur le même code Rust.
|
||||||
|
La seule différence entre chacune tient uniquement dans la manière
|
||||||
|
d'intégrer ce code dans les bindings.
|
||||||
|
De cette manière, le comportement est assuré d'être le même
|
||||||
|
sur toutes les plateformes disponibles, avec en prime des performances
|
||||||
|
respectables.
|
||||||
|
|
||||||
|
|
||||||
|
=== ":simple-python: Python"
|
||||||
|
|
||||||
|
```python
|
||||||
|
from aemark import markdown
|
||||||
|
|
||||||
|
result = markdown("this is some *markdown text* with __formatting__")
|
||||||
|
```
|
||||||
|
|
||||||
|
=== ":simple-javascript: Javascript"
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { markdown } from "@ae_utbm/aemark"
|
||||||
|
|
||||||
|
const result = markdown("this is some *markdown text* with __formatting__");
|
||||||
|
```
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
hx-post="{{ url("election:apply_result", election_id=form.election.id) }}"
|
hx-post="{{ url("election:apply_result", election_id=form.election.id) }}"
|
||||||
hx-swap="outerHTML"
|
hx-swap="outerHTML"
|
||||||
hx-target="#apply-election-result-fragment"
|
hx-target="#apply-election-result-fragment"
|
||||||
hx-disabled-elt="find input[type='submit']"
|
hx-disable="find input[type='submit']"
|
||||||
>
|
>
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form }}
|
{{ form }}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2026-08-21 14:10+0200\n"
|
"POT-Creation-Date: 2026-09-01 18:32+0200\n"
|
||||||
"PO-Revision-Date: 2016-07-18\n"
|
"PO-Revision-Date: 2016-07-18\n"
|
||||||
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
|
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
|
||||||
"Language-Team: AE info <ae.info@utbm.fr>\n"
|
"Language-Team: AE info <ae.info@utbm.fr>\n"
|
||||||
@@ -5089,6 +5089,10 @@ msgstr "signalant"
|
|||||||
msgid "A guide of courses available at UTBM."
|
msgid "A guide of courses available at UTBM."
|
||||||
msgstr "Un guide de tous les cours disponibles à l'UTBM."
|
msgstr "Un guide de tous les cours disponibles à l'UTBM."
|
||||||
|
|
||||||
|
#: pedagogy/templates/pedagogy/guide.jinja
|
||||||
|
msgid "Search UE"
|
||||||
|
msgstr "Recherche d'UE"
|
||||||
|
|
||||||
#: pedagogy/templates/pedagogy/guide.jinja
|
#: pedagogy/templates/pedagogy/guide.jinja
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(display_name)s"
|
msgid "%(display_name)s"
|
||||||
@@ -5758,6 +5762,18 @@ msgstr "fin de la cotisation"
|
|||||||
msgid "location"
|
msgid "location"
|
||||||
msgstr "lieu"
|
msgstr "lieu"
|
||||||
|
|
||||||
|
#: subscription/models.py
|
||||||
|
msgid "created_at"
|
||||||
|
msgstr "créé le"
|
||||||
|
|
||||||
|
#: subscription/models.py
|
||||||
|
msgid ""
|
||||||
|
"When this subscription was created. This date may differ from the start of "
|
||||||
|
"the subscription."
|
||||||
|
msgstr ""
|
||||||
|
"Quand la cotisation a été créée. Cette date peut différer du début effectif de "
|
||||||
|
"la cotisation."
|
||||||
|
|
||||||
#: subscription/models.py
|
#: subscription/models.py
|
||||||
msgid "You can not subscribe many time for the same period"
|
msgid "You can not subscribe many time for the same period"
|
||||||
msgstr "Vous ne pouvez pas cotiser plusieurs fois pour la même période"
|
msgstr "Vous ne pouvez pas cotiser plusieurs fois pour la même période"
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ nav:
|
|||||||
- API:
|
- API:
|
||||||
- Développement: tutorial/api/dev.md
|
- Développement: tutorial/api/dev.md
|
||||||
- Connexion à l'API: tutorial/api/connect.md
|
- Connexion à l'API: tutorial/api/connect.md
|
||||||
|
- Markdown AE: tutorial/markdown.md
|
||||||
- Etransactions: tutorial/etransaction.md
|
- Etransactions: tutorial/etransaction.md
|
||||||
- How-to:
|
- How-to:
|
||||||
- L'ORM de Django: howto/querysets.md
|
- L'ORM de Django: howto/querysets.md
|
||||||
|
|||||||
Generated
+17
-5
@@ -9,6 +9,7 @@
|
|||||||
"version": "3",
|
"version": "3",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@ae_utbm/aemark": "^0.1.3",
|
||||||
"@alpinejs/sort": "^3.16.2",
|
"@alpinejs/sort": "^3.16.2",
|
||||||
"@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
|
"@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
|
||||||
"@floating-ui/dom": "^1.8.0",
|
"@floating-ui/dom": "^1.8.0",
|
||||||
@@ -30,7 +31,7 @@
|
|||||||
"easymde": "^2.21.0",
|
"easymde": "^2.21.0",
|
||||||
"glob": "^13.0.6",
|
"glob": "^13.0.6",
|
||||||
"html2canvas": "^1.4.1",
|
"html2canvas": "^1.4.1",
|
||||||
"htmx.org": "^2.0.10",
|
"htmx.org": "^4.0.0",
|
||||||
"js-cookie": "^3.0.8",
|
"js-cookie": "^3.0.8",
|
||||||
"lit-html": "^3.3.3",
|
"lit-html": "^3.3.3",
|
||||||
"native-file-system-adapter": "^3.0.1",
|
"native-file-system-adapter": "^3.0.1",
|
||||||
@@ -56,6 +57,11 @@
|
|||||||
"vite": "^8.2.2"
|
"vite": "^8.2.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@ae_utbm/aemark": {
|
||||||
|
"version": "0.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@ae_utbm/aemark/-/aemark-0.1.3.tgz",
|
||||||
|
"integrity": "sha512-JHb9XDgYxy9J0f7bUWtS7eVptKbeB/4+VQoHO3g1ASwNHZpIpW+RRdJPXA+oi2/RDrdPbEtCMkkVROc+8ifFYQ=="
|
||||||
|
},
|
||||||
"node_modules/@alpinejs/sort": {
|
"node_modules/@alpinejs/sort": {
|
||||||
"version": "3.16.2",
|
"version": "3.16.2",
|
||||||
"resolved": "https://registry.npmjs.org/@alpinejs/sort/-/sort-3.16.2.tgz",
|
"resolved": "https://registry.npmjs.org/@alpinejs/sort/-/sort-3.16.2.tgz",
|
||||||
@@ -3801,10 +3807,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/htmx.org": {
|
"node_modules/htmx.org": {
|
||||||
"version": "2.0.10",
|
"version": "4.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.10.tgz",
|
"resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-4.0.0.tgz",
|
||||||
"integrity": "sha512-kdeJe7ZVwaS6QMz/ebBIVtZdpwen6L0OQ5GOhPV9MKBb196TCZeZu4yA7ZIQsaLKv7EpXz+So7KSXNuHXhj7Cw==",
|
"integrity": "sha512-T/171FUY93Kdfp8t+DnHdk45QvKRiBhVhhrwSzrXgUi4pHKvhp77dUA/qg8FAjsFWPIHNbmUuIdCrcVHuiZWng==",
|
||||||
"license": "0BSD"
|
"license": "BSD-0-Clause",
|
||||||
|
"workspaces": [
|
||||||
|
"ext/*"
|
||||||
|
],
|
||||||
|
"bin": {
|
||||||
|
"upgrade-check": "dist/scripts/upgrade-check.js"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"node_modules/ical.js": {
|
"node_modules/ical.js": {
|
||||||
"version": "1.5.0",
|
"version": "1.5.0",
|
||||||
|
|||||||
+3
-2
@@ -34,12 +34,13 @@
|
|||||||
"@types/cytoscape-klay": "^3.1.5",
|
"@types/cytoscape-klay": "^3.1.5",
|
||||||
"@types/js-cookie": "^3.0.6",
|
"@types/js-cookie": "^3.0.6",
|
||||||
"@types/node": "^26.2.0",
|
"@types/node": "^26.2.0",
|
||||||
"rollup-plugin-visualizer": "^7.1.1",
|
|
||||||
"@typescript/native": "npm:typescript@^7.0.2",
|
"@typescript/native": "npm:typescript@^7.0.2",
|
||||||
|
"rollup-plugin-visualizer": "^7.1.1",
|
||||||
"typescript": "npm:@typescript/typescript6@^6.0.2",
|
"typescript": "npm:@typescript/typescript6@^6.0.2",
|
||||||
"vite": "^8.2.2"
|
"vite": "^8.2.2"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@ae_utbm/aemark": "^0.1.3",
|
||||||
"@alpinejs/sort": "^3.16.2",
|
"@alpinejs/sort": "^3.16.2",
|
||||||
"@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
|
"@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
|
||||||
"@floating-ui/dom": "^1.8.0",
|
"@floating-ui/dom": "^1.8.0",
|
||||||
@@ -61,7 +62,7 @@
|
|||||||
"easymde": "^2.21.0",
|
"easymde": "^2.21.0",
|
||||||
"glob": "^13.0.6",
|
"glob": "^13.0.6",
|
||||||
"html2canvas": "^1.4.1",
|
"html2canvas": "^1.4.1",
|
||||||
"htmx.org": "^2.0.10",
|
"htmx.org": "^4.0.0",
|
||||||
"js-cookie": "^3.0.8",
|
"js-cookie": "^3.0.8",
|
||||||
"lit-html": "^3.3.3",
|
"lit-html": "^3.3.3",
|
||||||
"native-file-system-adapter": "^3.0.1",
|
"native-file-system-adapter": "^3.0.1",
|
||||||
|
|||||||
@@ -64,100 +64,23 @@ $pedagogy-white-text: #f0f0f0;
|
|||||||
}
|
}
|
||||||
|
|
||||||
#search_form {
|
#search_form {
|
||||||
.search-form-container {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: auto auto;
|
|
||||||
grid-template-rows: auto auto auto;
|
|
||||||
grid-template-areas:
|
|
||||||
"action-bar action-bar"
|
|
||||||
"search-bar search-bar"
|
|
||||||
"radio-department radio-department"
|
|
||||||
"radio-credit-type radio-semester";
|
|
||||||
}
|
|
||||||
|
|
||||||
.action-bar {
|
.radio-guide fieldset {
|
||||||
grid-area: action-bar;
|
input[type="checkbox"] {
|
||||||
margin-bottom: 10px;
|
display: none;
|
||||||
}
|
|
||||||
|
|
||||||
.search-bar {
|
|
||||||
grid-area: search-bar;
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: auto 200px;
|
|
||||||
grid-template-rows: auto;
|
|
||||||
grid-template-areas: "search-bar-input search-bar-button";
|
|
||||||
|
|
||||||
@media screen and (max-width: $medium-devices) {
|
|
||||||
grid-template-columns: auto auto;
|
|
||||||
grid-template-rows: auto;
|
|
||||||
grid-template-areas: "search-bar-input search-bar-button";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: $small-devices) {
|
|
||||||
grid-template-columns: auto;
|
|
||||||
grid-template-rows: auto;
|
|
||||||
grid-template-areas: "search-bar-input";
|
|
||||||
|
|
||||||
.search-bar-button {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-bar-input {
|
|
||||||
grid-area: search-bar-input;
|
|
||||||
background: $pedagogy-light-blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-bar-button {
|
|
||||||
grid-area: search-bar-button;
|
|
||||||
background: $pedagogy-orange;
|
|
||||||
color: white;
|
|
||||||
font-weight: bold;
|
|
||||||
margin-left: 20px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-department {
|
|
||||||
grid-area: radio-department;
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-credit-type {
|
|
||||||
grid-area: radio-credit-type;
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-semester {
|
|
||||||
grid-area: radio-semester;
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-guide input[type="radio"],
|
|
||||||
input[type="checkbox"] {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-guide {
|
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
|
margin-bottom: 0;
|
||||||
color: white;
|
color: white;
|
||||||
}
|
|
||||||
|
|
||||||
.radio-guide label {
|
label {
|
||||||
display: inline-block;
|
padding: 10px 20px;
|
||||||
background-color: $pedagogy-blue;
|
}
|
||||||
padding: 10px 20px;
|
|
||||||
font-family: Arial, sans-serif;
|
|
||||||
font-size: 16px;
|
|
||||||
border-radius: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-guide input[type="radio"]:checked+label {
|
input[type="checkbox"]:checked+label {
|
||||||
background-color: $pedagogy-orange;
|
background-color: $pedagogy-orange;
|
||||||
}
|
@include shadow;
|
||||||
|
}
|
||||||
.radio-guide input[type="checkbox"]:checked+label {
|
|
||||||
background-color: $pedagogy-orange;
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-guide label:hover {
|
|
||||||
background-color: $pedagogy-hover-blue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block additional_js %}
|
{% block additional_js %}
|
||||||
<script type="module" src="{{ static('bundled/pedagogy/guide-index.js') }}"></script>
|
<script type="module" src="{{ static('bundled/pedagogy/guide-index.ts') }}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
@@ -24,30 +24,28 @@
|
|||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% if user.has_perm("pedagogy.add_ue") %}
|
{% if user.has_perm("pedagogy.add_ue") %}
|
||||||
<div class="action-bar">
|
<div class="row gap">
|
||||||
<p>
|
<a href="{{ url('pedagogy:ue_create') }}" class="btn btn-blue"><i class="fa fa-plus"></i>{% trans %}Create UE{% endtrans %}</a>
|
||||||
<a href="{{ url('pedagogy:ue_create') }}">{% trans %}Create UE{% endtrans %}</a>
|
<a href="{{ url('pedagogy:moderation') }}" class="btn btn-grey">{% trans %}Moderate comments{% endtrans %}</a>
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<a href="{{ url('pedagogy:moderation') }}">{% trans %}Moderate comments{% endtrans %}</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
<br/>
|
<br/>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<div class="pedagogy" x-data="ue_search" x-cloak>
|
<div class="pedagogy" x-data="ue_search" x-cloak>
|
||||||
<form id="search_form">
|
<form id="search_form" class="">
|
||||||
<div class="search-form-container">
|
<div class="search-form-container">
|
||||||
<div class="search-bar">
|
<fieldset>
|
||||||
|
<label for="search_input">{% trans %}Search UE{% endtrans %}</label>
|
||||||
<input
|
<input
|
||||||
id="search_input"
|
id="search_input"
|
||||||
class="search-bar-input"
|
class="search-bar-input"
|
||||||
type="text"
|
type="search"
|
||||||
name="search"
|
name="search"
|
||||||
|
placeholder=""
|
||||||
x-model.debounce.500ms="search"
|
x-model.debounce.500ms="search"
|
||||||
/>
|
/>
|
||||||
</div>
|
</fieldset>
|
||||||
<div class="radio-department">
|
<div class="row gap-3x margin-bottom radio-guide">
|
||||||
<div class="radio-guide">
|
<fieldset>
|
||||||
{% set departments = [
|
{% set departments = [
|
||||||
("EDIM", "EDIM"), ("ENERGIE", "EE"), ("IMSI", "IMSI"),
|
("EDIM", "EDIM"), ("ENERGIE", "EE"), ("IMSI", "IMSI"),
|
||||||
("INFO", "GI"), ("GMC", "MC"), ("HUMA", "HUMA"), ("TC", "TC")
|
("INFO", "GI"), ("GMC", "MC"), ("HUMA", "HUMA"), ("TC", "TC")
|
||||||
@@ -56,16 +54,16 @@
|
|||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
name="department"
|
name="department"
|
||||||
id="radio{{ real_name }}"
|
id="radio_{{ real_name }}"
|
||||||
value="{{ real_name }}"
|
value="{{ real_name }}"
|
||||||
x-model="department"
|
x-model="department"
|
||||||
/>
|
/>
|
||||||
<label for="radio{{ real_name }}">{% trans %}{{ display_name }}{% endtrans %}</label>
|
<label for="radio_{{ real_name }}" class="btn btn-blue">
|
||||||
|
{% trans %}{{ display_name }}{% endtrans %}
|
||||||
|
</label>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</fieldset>
|
||||||
</div>
|
<fieldset>
|
||||||
<div class="radio-credit-type">
|
|
||||||
<div class="radio-guide">
|
|
||||||
{% for credit_type in ["CS", "TM", "EC", "QC", "OM"] %}
|
{% for credit_type in ["CS", "TM", "EC", "QC", "OM"] %}
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
@@ -74,18 +72,21 @@
|
|||||||
value="{{ credit_type }}"
|
value="{{ credit_type }}"
|
||||||
x-model="credit_type"
|
x-model="credit_type"
|
||||||
/>
|
/>
|
||||||
<label for="radio{{ credit_type }}">{% trans %}{{ credit_type }}{% endtrans %}</label>
|
<label for="radio{{ credit_type }}" class="btn btn-blue">
|
||||||
|
{% trans %}{{ credit_type }}{% endtrans %}
|
||||||
|
</label>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</fieldset>
|
||||||
</div>
|
<fieldset>
|
||||||
|
|
||||||
<div class="radio-semester">
|
|
||||||
<div class="radio-guide">
|
|
||||||
<input type="checkbox" name="semester" id="radioAUTUMN" value="AUTUMN" x-model="semester"/>
|
<input type="checkbox" name="semester" id="radioAUTUMN" value="AUTUMN" x-model="semester"/>
|
||||||
<label for="radioAUTUMN"><i class="fa fa-leaf"></i></label>
|
<label for="radioAUTUMN" class="btn btn-no-text btn-blue">
|
||||||
|
<i class="fa fa-leaf"></i>
|
||||||
|
</label>
|
||||||
<input type="checkbox" name="semester" id="radioSPRING" value="SPRING" x-model="semester"/>
|
<input type="checkbox" name="semester" id="radioSPRING" value="SPRING" x-model="semester"/>
|
||||||
<label for="radioSPRING"><i class="fa-regular fa-sun"></i></label>
|
<label for="radioSPRING" class="btn btn-no-text btn-blue">
|
||||||
</div>
|
<i class="fa-regular fa-sun"></i>
|
||||||
|
</label>
|
||||||
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
# Generated by Django 5.2.17 on 2026-09-01 08:44
|
||||||
|
|
||||||
|
import django.utils.timezone
|
||||||
|
from django.db import migrations, models
|
||||||
|
from django.db.migrations.state import StateApps
|
||||||
|
from django.db.models import F, Value
|
||||||
|
from django.db.models.functions import Least
|
||||||
|
from django.utils.timezone import now
|
||||||
|
|
||||||
|
|
||||||
|
def make_default_creation_date(apps: StateApps, schema_editor):
|
||||||
|
Subscription = apps.get_model("subscription", "Subscription")
|
||||||
|
Subscription.objects.update(
|
||||||
|
created_at=Least(
|
||||||
|
F("subscription_start"), Value(now()), output_field=models.DateTimeField()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [("subscription", "0016_alter_subscription_subscription_type")]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="subscription",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(
|
||||||
|
auto_now_add=True,
|
||||||
|
default=django.utils.timezone.now,
|
||||||
|
help_text=(
|
||||||
|
"When this subscription was created. "
|
||||||
|
"This date may differ from the start of the subscription."
|
||||||
|
),
|
||||||
|
verbose_name="created_at",
|
||||||
|
),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
migrations.RunPython(
|
||||||
|
make_default_creation_date,
|
||||||
|
reverse_code=migrations.RunPython.noop,
|
||||||
|
elidable=True,
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -64,6 +64,14 @@ class Subscription(models.Model):
|
|||||||
max_length=20,
|
max_length=20,
|
||||||
verbose_name=_("location"),
|
verbose_name=_("location"),
|
||||||
)
|
)
|
||||||
|
created_at = models.DateTimeField(
|
||||||
|
_("created_at"),
|
||||||
|
help_text=_(
|
||||||
|
"When this subscription was created. "
|
||||||
|
"This date may differ from the start of the subscription."
|
||||||
|
),
|
||||||
|
auto_now_add=True,
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ["subscription_start"]
|
ordering = ["subscription_start"]
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<form
|
<form
|
||||||
hx-post="{{ url("subscription:fragment-existing-user") }}"
|
hx-post="{{ url("subscription:fragment-existing-user") }}"
|
||||||
hx-target="this"
|
hx-target="this"
|
||||||
hx-disabled-elt="find input[type='submit']"
|
hx-disable="find input[type='submit']"
|
||||||
hx-swap="outerHTML"
|
hx-swap="outerHTML"
|
||||||
>
|
>
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<form
|
<form
|
||||||
hx-post="{{ url("subscription:fragment-new-user") }}"
|
hx-post="{{ url("subscription:fragment-new-user") }}"
|
||||||
hx-target="this"
|
hx-target="this"
|
||||||
hx-disabled-elt="find input[type='submit']"
|
hx-disable="find input[type='submit']"
|
||||||
hx-swap="outerHTML"
|
hx-swap="outerHTML"
|
||||||
>
|
>
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
|||||||
Reference in New Issue
Block a user