mirror of
https://github.com/ae-utbm/sith.git
synced 2025-11-03 18:43:04 +00:00
Compare commits
1 Commits
room-reser
...
update_sub
| Author | SHA1 | Date | |
|---|---|---|---|
|
2550fd0af7 |
@@ -1,63 +1,25 @@
|
||||
{% 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 %}
|
||||
<h3>{% trans %}Club tools{% endtrans %} ({{ club.name }})</h3>
|
||||
<h3>{% trans %}Club tools{% endtrans %}</h3>
|
||||
<div>
|
||||
<h4>{% trans %}Communication:{% endtrans %}</h4>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="{{ url('com:news_new') }}?club={{ object.id }}">
|
||||
{% trans %}Create a news{% endtrans %}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ url('com:weekmail_article') }}?club={{ object.id }}">
|
||||
{% trans %}Post in the Weekmail{% endtrans %}
|
||||
</a>
|
||||
</li>
|
||||
<li> <a href="{{ url('com:news_new') }}?club={{ object.id }}">{% trans %}Create a news{% endtrans %}</a></li>
|
||||
<li> <a href="{{ url('com:weekmail_article') }}?club={{ object.id }}">{% trans %}Post in the Weekmail{% endtrans %}</a></li>
|
||||
{% 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 %}
|
||||
<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('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>
|
||||
{% endif %}
|
||||
</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>
|
||||
<ul>
|
||||
{% for counter in counters %}
|
||||
<li>{{ counter }}:
|
||||
<a href="{{ url('counter:details', counter_id=counter.id) }}">View</a>
|
||||
<a href="{{ url('counter:admin', counter_id=counter.id) }}">Edit</a>
|
||||
{% for c in object.counters.filter(type="OFFICE") %}
|
||||
<li>{{ c }}:
|
||||
<a href="{{ url('counter:details', counter_id=c.id) }}">View</a>
|
||||
<a href="{{ url('counter:admin', counter_id=c.id) }}">Edit</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
@@ -262,12 +262,6 @@ class ClubToolsView(ClubTabsMixin, CanEditMixin, DetailView):
|
||||
template_name = "club/club_tools.jinja"
|
||||
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(
|
||||
FragmentMixin, PermissionRequiredMixin, SuccessMessageMixin, CreateView
|
||||
|
||||
@@ -16,74 +16,14 @@
|
||||
--event-details-padding: 20px;
|
||||
--event-details-border: 1px solid #EEEEEE;
|
||||
--event-details-border-radius: 4px;
|
||||
--event-details-box-shadow: 0 6px 20px 4px rgb(0 0 0 / 16%);
|
||||
--event-details-box-shadow: 0px 6px 20px 4px rgb(0 0 0 / 16%);
|
||||
--event-details-max-width: 600px;
|
||||
}
|
||||
|
||||
ics-calendar,
|
||||
room-scheduler {
|
||||
ics-calendar {
|
||||
border: 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 {
|
||||
z-index: 10;
|
||||
max-width: 1151px;
|
||||
@@ -120,60 +60,82 @@ ics-calendar {
|
||||
align-items: start;
|
||||
flex-direction: row;
|
||||
background-color: var(--event-details-background-color);
|
||||
margin-top: 0;
|
||||
margin-top: 0px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Reset from style.scss
|
||||
thead {
|
||||
background-color: white;
|
||||
color: black;
|
||||
}
|
||||
|
||||
// Reset from style.scss
|
||||
tbody > tr {
|
||||
&:nth-child(even):not(.highlight) {
|
||||
background: white;
|
||||
a.fc-col-header-cell-cushion,
|
||||
a.fc-col-header-cell-cushion:hover {
|
||||
color: black;
|
||||
}
|
||||
}
|
||||
|
||||
.fc .fc-toolbar.fc-footer-toolbar {
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
a.fc-daygrid-day-number,
|
||||
a.fc-daygrid-day-number:hover {
|
||||
color: rgb(34, 34, 34);
|
||||
}
|
||||
|
||||
button.text-copy,
|
||||
button.text-copy:focus,
|
||||
button.text-copy:hover {
|
||||
background-color: #67AE6E !important;
|
||||
transition: 500ms ease-in;
|
||||
}
|
||||
td {
|
||||
overflow: visible; // Show events on multiple days
|
||||
}
|
||||
|
||||
button.text-copied,
|
||||
button.text-copied:focus,
|
||||
button.text-copied:hover {
|
||||
transition: 500ms ease-out;
|
||||
}
|
||||
//Reset from style.scss
|
||||
table {
|
||||
box-shadow: none;
|
||||
border-radius: 0px;
|
||||
-moz-border-radius: 0px;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
.fc .fc-getCalendarLink-button {
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
// Reset from style.scss
|
||||
thead {
|
||||
background-color: white;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
// 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;
|
||||
}
|
||||
|
||||
.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 {
|
||||
background-color: rgba(20, 20, 20, 0.6);
|
||||
.fc .fc-helpButton-button:hover {
|
||||
background-color: rgba(20, 20, 20, 0.6);
|
||||
}
|
||||
}
|
||||
|
||||
.tooltip.calendar-copy-tooltip {
|
||||
@@ -81,9 +81,9 @@
|
||||
}
|
||||
|
||||
#links_content {
|
||||
overflow: auto;
|
||||
box-shadow: $shadow-color 1px 1px 1px;
|
||||
min-height: 20em;
|
||||
padding-bottom: 1em;
|
||||
height: 20em;
|
||||
|
||||
h4 {
|
||||
margin-left: 5px;
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
{% from "com/macros.jinja" import news_moderation_alert %}
|
||||
|
||||
{% block title %}AE UTBM{% endblock %}
|
||||
|
||||
{% block additional_css %}
|
||||
<link rel="stylesheet" href="{{ static('com/css/news-list.scss') }}">
|
||||
<link rel="stylesheet" href="{{ static('core/components/calendar.scss') }}">
|
||||
<link rel="stylesheet" href="{{ static('com/components/ics-calendar.scss') }}">
|
||||
|
||||
{# 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") }}">
|
||||
@@ -207,20 +205,10 @@
|
||||
<i class="fa-solid fa-graduation-cap fa-xl"></i>
|
||||
<a href="{{ url("pedagogy:guide") }}">{% trans %}UV Guide{% endtrans %}</a>
|
||||
</li>
|
||||
<li>
|
||||
<i class="fa-solid fa-calendar-days fa-xl"></i>
|
||||
<a href="{{ url("timetable:generator") }}">{% trans %}Timetable{% endtrans %}</a>
|
||||
</li>
|
||||
<li>
|
||||
<i class="fa-solid fa-magnifying-glass fa-xl"></i>
|
||||
<a href="{{ url("matmat:search_clear") }}">{% trans %}Matmatronch{% endtrans %}</a>
|
||||
</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>
|
||||
<i class="fa-solid fa-check-to-slot fa-xl"></i>
|
||||
<a href="{{ url("election:list") }}">{% trans %}Elections{% endtrans %}</a>
|
||||
|
||||
@@ -789,11 +789,7 @@ class Command(BaseCommand):
|
||||
|
||||
subscribers = Group.objects.create(name="Cotisants")
|
||||
subscribers.permissions.add(
|
||||
*list(
|
||||
perms.filter(
|
||||
codename__in=["add_news", "add_uvcomment", "view_reservationslot"]
|
||||
)
|
||||
)
|
||||
*list(perms.filter(codename__in=["add_news", "add_uvcomment"]))
|
||||
)
|
||||
old_subscribers = Group.objects.create(name="Anciens cotisants")
|
||||
old_subscribers.permissions.add(
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import random
|
||||
from datetime import date, timedelta
|
||||
from datetime import timezone as tz
|
||||
from math import ceil
|
||||
from typing import Iterator
|
||||
|
||||
from dateutil.relativedelta import relativedelta
|
||||
@@ -25,7 +24,6 @@ from counter.models import (
|
||||
)
|
||||
from forum.models import Forum, ForumMessage, ForumTopic
|
||||
from pedagogy.models import UV
|
||||
from reservation.models import ReservationSlot, Room
|
||||
from subscription.models import Subscription
|
||||
|
||||
|
||||
@@ -42,20 +40,45 @@ class Command(BaseCommand):
|
||||
|
||||
self.stdout.write("Creating users...")
|
||||
users = self.create_users()
|
||||
# len(subscribers) is approximately 480
|
||||
subscribers = random.sample(users, k=int(0.8 * len(users)))
|
||||
self.stdout.write("Creating subscriptions...")
|
||||
self.create_subscriptions(subscribers)
|
||||
self.stdout.write("Creating club memberships...")
|
||||
self.create_club_memberships(subscribers)
|
||||
self.stdout.write("Creating rooms and reservation...")
|
||||
self.create_resources_and_reservations(random.sample(subscribers, k=40))
|
||||
users_qs = User.objects.filter(id__in=[s.id for s in subscribers])
|
||||
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))),
|
||||
)
|
||||
self.stdout.write("Creating uvs...")
|
||||
self.create_uvs()
|
||||
self.stdout.write("Creating products...")
|
||||
self.create_products()
|
||||
self.stdout.write("Creating sales and refills...")
|
||||
sellers = list(User.objects.order_by("?")[:100])
|
||||
sellers = random.sample(list(User.objects.all()), 100)
|
||||
self.create_sales(sellers)
|
||||
self.stdout.write("Creating permanences...")
|
||||
self.create_permanences(sellers)
|
||||
@@ -169,97 +192,6 @@ class Command(BaseCommand):
|
||||
memberships = Membership.objects.bulk_create(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_uvs(self):
|
||||
root = User.objects.get(username="root")
|
||||
categories = ["CS", "TM", "OM", "QC", "EC"]
|
||||
@@ -457,7 +389,7 @@ class Command(BaseCommand):
|
||||
Permanency.objects.bulk_create(perms)
|
||||
|
||||
def create_forums(self):
|
||||
forumers = list(User.objects.order_by("?")[:100])
|
||||
forumers = random.sample(list(User.objects.all()), 100)
|
||||
most_actives = random.sample(forumers, 10)
|
||||
categories = list(Forum.objects.filter(is_category=True))
|
||||
new_forums = [
|
||||
@@ -475,7 +407,7 @@ class Command(BaseCommand):
|
||||
for _ in range(100)
|
||||
]
|
||||
ForumTopic.objects.bulk_create(new_topics)
|
||||
topics = list(ForumTopic.objects.values_list("id", flat=True))
|
||||
topics = list(ForumTopic.objects.all())
|
||||
|
||||
def get_author():
|
||||
if random.random() > 0.5:
|
||||
@@ -483,7 +415,7 @@ class Command(BaseCommand):
|
||||
return random.choice(forumers)
|
||||
|
||||
messages = []
|
||||
for topic_id in topics:
|
||||
for t in topics:
|
||||
nb_messages = max(1, int(random.normalvariate(mu=90, sigma=50)))
|
||||
dates = sorted(
|
||||
[
|
||||
@@ -495,7 +427,7 @@ class Command(BaseCommand):
|
||||
messages.extend(
|
||||
[
|
||||
ForumMessage(
|
||||
topic_id=topic_id,
|
||||
topic=t,
|
||||
author=get_author(),
|
||||
date=d,
|
||||
message="\n\n".join(
|
||||
|
||||
@@ -651,6 +651,9 @@ class User(AbstractUser):
|
||||
|
||||
|
||||
class AnonymousUser(AuthAnonymousUser):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
|
||||
@property
|
||||
def was_subscribed(self):
|
||||
return False
|
||||
@@ -659,6 +662,10 @@ class AnonymousUser(AuthAnonymousUser):
|
||||
def is_subscribed(self):
|
||||
return False
|
||||
|
||||
@property
|
||||
def subscribed(self):
|
||||
return False
|
||||
|
||||
@property
|
||||
def is_root(self):
|
||||
return False
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import { alpinePlugin } from "#core:utils/notifications";
|
||||
import { morph } from "@alpinejs/morph";
|
||||
import sort from "@alpinejs/sort";
|
||||
import Alpine from "alpinejs";
|
||||
|
||||
Alpine.plugin([sort, morph]);
|
||||
Alpine.plugin(sort);
|
||||
Alpine.magic("notifications", alpinePlugin);
|
||||
window.Alpine = Alpine;
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import htmx from "htmx.org";
|
||||
import "htmx-ext-alpine-morph";
|
||||
|
||||
document.body.addEventListener("htmx:beforeRequest", (event) => {
|
||||
event.target.ariaBusy = true;
|
||||
|
||||
@@ -16,13 +16,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
.card-group {
|
||||
display: flex;
|
||||
gap: 15px;
|
||||
margin-bottom: 30px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.card {
|
||||
background-color: $primary-neutral-light-color;
|
||||
border-radius: 5px;
|
||||
@@ -99,23 +92,13 @@
|
||||
}
|
||||
|
||||
@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,
|
||||
// whatever the size of the screen.
|
||||
&.card-row {
|
||||
@include row-layout;
|
||||
|
||||
&.card-row-m {
|
||||
//width: 50%;
|
||||
max-width: 50%;
|
||||
}
|
||||
|
||||
&.card-row-s {
|
||||
//width: 33%;
|
||||
max-width: 33%;
|
||||
}
|
||||
@include row-layout
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,9 +10,10 @@
|
||||
border-radius: 5px;
|
||||
padding: 5px 10px;
|
||||
position: absolute;
|
||||
white-space: nowrap;
|
||||
opacity: 0;
|
||||
transition: opacity 500ms ease-out;
|
||||
width: max-content;
|
||||
|
||||
white-space: normal;
|
||||
|
||||
left: 0;
|
||||
|
||||
@@ -39,8 +39,9 @@ from django.forms import (
|
||||
DateInput,
|
||||
DateTimeInput,
|
||||
TextInput,
|
||||
Widget,
|
||||
)
|
||||
from django.utils.timezone import localtime, now
|
||||
from django.utils.timezone import now
|
||||
from django.utils.translation import gettext
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from phonenumber_field.widgets import RegionalPhoneNumberWidget
|
||||
@@ -114,7 +115,7 @@ class SelectUser(TextInput):
|
||||
|
||||
def validate_future_timestamp(value: date | datetime):
|
||||
if value <= now():
|
||||
raise ValidationError(_("Ensure this timestamp is set in the future"))
|
||||
raise ValueError(_("Ensure this timestamp is set in the future"))
|
||||
|
||||
|
||||
class FutureDateTimeField(forms.DateTimeField):
|
||||
@@ -122,8 +123,8 @@ class FutureDateTimeField(forms.DateTimeField):
|
||||
|
||||
default_validators = [validate_future_timestamp]
|
||||
|
||||
def widget_attrs(self, widget: forms.Widget) -> dict[str, str]:
|
||||
return {"min": widget.format_value(localtime())}
|
||||
def widget_attrs(self, widget: Widget) -> dict[str, str]:
|
||||
return {"min": widget.format_value(now())}
|
||||
|
||||
|
||||
# Forms
|
||||
|
||||
@@ -78,7 +78,7 @@ class FragmentMixin(TemplateResponseMixin, ContextMixin):
|
||||
return render(
|
||||
request,
|
||||
"app/template.jinja",
|
||||
context={"fragment": fragment(request)}
|
||||
context={"fragment": fragment(request)
|
||||
}
|
||||
|
||||
# in urls.py
|
||||
|
||||
@@ -39,7 +39,6 @@
|
||||
flex: auto;
|
||||
margin: 0.2em;
|
||||
width: 20%;
|
||||
min-width: 350px;
|
||||
|
||||
ul {
|
||||
list-style-type: none;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-09-26 22:40+0200\n"
|
||||
"POT-Creation-Date: 2025-09-26 17:36+0200\n"
|
||||
"PO-Revision-Date: 2016-07-18\n"
|
||||
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
|
||||
"Language-Team: AE info <ae.info@utbm.fr>\n"
|
||||
@@ -239,7 +239,7 @@ msgid "role"
|
||||
msgstr "rôle"
|
||||
|
||||
#: club/models.py core/models.py counter/models.py election/models.py
|
||||
#: forum/models.py reservation/models.py
|
||||
#: forum/models.py
|
||||
msgid "description"
|
||||
msgstr "description"
|
||||
|
||||
@@ -514,18 +514,6 @@ msgstr "Nouveau Trombi"
|
||||
msgid "Posters"
|
||||
msgstr "Affiches"
|
||||
|
||||
#: club/templates/club/club_tools.jinja
|
||||
msgid "Reservable rooms"
|
||||
msgstr "Salles réservables"
|
||||
|
||||
#: club/templates/club/club_tools.jinja
|
||||
msgid "Add a room"
|
||||
msgstr "Ajouter une salle"
|
||||
|
||||
#: club/templates/club/club_tools.jinja
|
||||
msgid "This club manages no reservable room"
|
||||
msgstr "Ce club ne gère pas de salle réservable"
|
||||
|
||||
#: club/templates/club/club_tools.jinja
|
||||
msgid "Counters:"
|
||||
msgstr "Comptoirs : "
|
||||
@@ -789,7 +777,7 @@ msgstr "Une description plus détaillée et exhaustive de l'évènement."
|
||||
msgid "The club which organizes the event."
|
||||
msgstr "Le club qui organise l'évènement."
|
||||
|
||||
#: com/models.py pedagogy/models.py reservation/models.py trombi/models.py
|
||||
#: com/models.py pedagogy/models.py trombi/models.py
|
||||
msgid "author"
|
||||
msgstr "auteur"
|
||||
|
||||
@@ -1073,19 +1061,10 @@ msgstr "Nos services"
|
||||
msgid "UV Guide"
|
||||
msgstr "Guide des UVs"
|
||||
|
||||
#: com/templates/com/news_list.jinja
|
||||
msgid "Timetable"
|
||||
msgstr "Emploi du temps"
|
||||
|
||||
#: com/templates/com/news_list.jinja core/templates/core/base/navbar.jinja
|
||||
msgid "Matmatronch"
|
||||
msgstr "Matmatronch"
|
||||
|
||||
#: com/templates/com/news_list.jinja
|
||||
#: reservation/templates/reservation/schedule.jinja
|
||||
msgid "Room reservation"
|
||||
msgstr "Réservation de salle"
|
||||
|
||||
#: com/templates/com/news_list.jinja core/templates/core/base/navbar.jinja
|
||||
#: core/templates/core/user_tools.jinja
|
||||
msgid "Elections"
|
||||
@@ -1952,7 +1931,6 @@ msgstr "Confirmation"
|
||||
#: core/templates/core/file_delete_confirm.jinja
|
||||
#: counter/templates/counter/counter_click.jinja
|
||||
#: counter/templates/counter/fragments/delete_student_card.jinja
|
||||
#: reservation/templates/reservation/fragments/create_reservation.jinja
|
||||
#: sas/templates/sas/ask_picture_removal.jinja
|
||||
msgid "Cancel"
|
||||
msgstr "Annuler"
|
||||
@@ -3077,7 +3055,7 @@ msgstr "Mettre à True si le mail a reçu une erreur"
|
||||
msgid "The operation that emptied the account."
|
||||
msgstr "L'opération qui a vidé le compte."
|
||||
|
||||
#: counter/models.py pedagogy/models.py reservation/models.py
|
||||
#: counter/models.py pedagogy/models.py
|
||||
msgid "comment"
|
||||
msgstr "commentaire"
|
||||
|
||||
@@ -4616,73 +4594,6 @@ msgstr "Signaler ce commentaire"
|
||||
msgid "Edit UE"
|
||||
msgstr "Éditer l'UE"
|
||||
|
||||
#: reservation/forms.py
|
||||
msgid "The start must be set before the end"
|
||||
msgstr "Le début doit être placé avant la fin"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "room name"
|
||||
msgstr "Nom de la salle"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "room owner"
|
||||
msgstr "propriétaire de la salle"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "The club which manages this room"
|
||||
msgstr "Le club qui gère cette salle"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "site"
|
||||
msgstr "site"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "reservable room"
|
||||
msgstr "salle réservable"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "reservable rooms"
|
||||
msgstr "salles réservables"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "reserved room"
|
||||
msgstr "salle réservée"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "slot start"
|
||||
msgstr "début du créneau"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "slot end"
|
||||
msgstr "fin du créneau"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "reservation slot"
|
||||
msgstr "créneau de réservation"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "reservation slots"
|
||||
msgstr "créneaux de réservation"
|
||||
|
||||
#: reservation/models.py
|
||||
msgid "There is already a reservation on this slot."
|
||||
msgstr "Il y a déjà une réservation sur ce créneau."
|
||||
|
||||
#: reservation/templates/reservation/fragments/create_reservation.jinja
|
||||
msgid "Book a room"
|
||||
msgstr "Réserver une salle"
|
||||
|
||||
#: reservation/templates/reservation/schedule.jinja
|
||||
msgid "You can book a room by selecting a free slot in the calendar."
|
||||
msgstr ""
|
||||
"Vous pouvez réserver une salle en sélectionnant un emplacement libre dans le "
|
||||
"calendrier."
|
||||
|
||||
#: reservation/views.py
|
||||
#, python-format
|
||||
msgid "%(name)s was updated successfully"
|
||||
msgstr "%(name)s a été mis à jour avec succès"
|
||||
|
||||
#: rootplace/forms.py
|
||||
msgid "User that will be kept"
|
||||
msgstr "Utilisateur qui sera conservé"
|
||||
@@ -5063,47 +4974,47 @@ msgstr "Suppression de rechargement"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "One semester"
|
||||
msgstr "Un semestre, 20 €"
|
||||
msgstr "Un semestre"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Two semesters"
|
||||
msgstr "Deux semestres, 35 €"
|
||||
msgstr "Deux semestres"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Common core cursus"
|
||||
msgstr "Cursus tronc commun, 60 €"
|
||||
msgstr "Cursus tronc commun"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Branch cursus"
|
||||
msgstr "Cursus branche, 60 €"
|
||||
msgstr "Cursus branche"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Alternating cursus"
|
||||
msgstr "Cursus alternant, 30 €"
|
||||
msgstr "Cursus alternant"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Honorary member"
|
||||
msgstr "Membre honoraire, 0 €"
|
||||
msgstr "Membre honoraire"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Assidu member"
|
||||
msgstr "Membre d'Assidu, 0 €"
|
||||
msgstr "Membre d'Assidu"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Amicale/DOCEO member"
|
||||
msgstr "Membre de l'Amicale/DOCEO, 0 €"
|
||||
msgstr "Membre de l'Amicale/DOCEO"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "UT network member"
|
||||
msgstr "Cotisant du réseau UT, 0 €"
|
||||
msgstr "Cotisant du réseau UT"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "CROUS member"
|
||||
msgstr "Membres du CROUS, 0 €"
|
||||
msgstr "Membres du CROUS"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Sbarro/ESTA member"
|
||||
msgstr "Membre de Sbarro ou de l'ESTA, 20 €"
|
||||
msgstr "Membre de Sbarro ou de l'ESTA"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "One semester Welcome Week"
|
||||
@@ -5130,28 +5041,28 @@ msgid "One day"
|
||||
msgstr "Un jour"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "GA staff member"
|
||||
msgstr "Membre staff GA (2 semaines), 1 €"
|
||||
msgid "GA staff member (2 weeks)"
|
||||
msgstr "Membre staff GA (2 semaines)"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "One semester (-20%)"
|
||||
msgstr "Un semestre (-20%), 12 €"
|
||||
msgstr "Un semestre (-20%)"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Two semesters (-20%)"
|
||||
msgstr "Deux semestres (-20%), 22 €"
|
||||
msgstr "Deux semestres (-20%)"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Common core cursus (-20%)"
|
||||
msgstr "Cursus tronc commun (-20%), 36 €"
|
||||
msgstr "Cursus tronc commun (-20%)"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Branch cursus (-20%)"
|
||||
msgstr "Cursus branche (-20%), 36 €"
|
||||
msgstr "Cursus branche (-20%)"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "Alternating cursus (-20%)"
|
||||
msgstr "Cursus alternant (-20%), 24 €"
|
||||
msgstr "Cursus alternant (-20%)"
|
||||
|
||||
#: sith/settings.py
|
||||
msgid "One year for free(CA offer)"
|
||||
@@ -5325,18 +5236,6 @@ msgstr "Membre existant"
|
||||
msgid "the groups that can create subscriptions"
|
||||
msgstr "les groupes pouvant créer des cotisations"
|
||||
|
||||
#: timetable/templates/timetable/generator.jinja
|
||||
msgid "Timetable generator"
|
||||
msgstr "Générateur d'emploi du temps"
|
||||
|
||||
#: timetable/templates/timetable/generator.jinja
|
||||
msgid "Generate"
|
||||
msgstr "Générer"
|
||||
|
||||
#: timetable/templates/timetable/generator.jinja
|
||||
msgid "Save to PNG"
|
||||
msgstr "Sauver en PNG"
|
||||
|
||||
#: trombi/models.py
|
||||
msgid "subscription deadline"
|
||||
msgstr "fin des inscriptions"
|
||||
|
||||
@@ -251,14 +251,6 @@ msgstr "Types de produits réordonnés !"
|
||||
msgid "Product type reorganisation failed with status code : %d"
|
||||
msgstr "La réorganisation des types de produit a échoué avec le code : %d"
|
||||
|
||||
#: reservation/static/bundled/reservation/components/room-scheduler-index.ts
|
||||
msgid "Rooms"
|
||||
msgstr "Salles"
|
||||
|
||||
#: reservation/static/bundled/reservation/slot-reservation-index.ts
|
||||
msgid "This slot has been successfully moved"
|
||||
msgstr "Ce créneau a été bougé avec succès"
|
||||
|
||||
#: sas/static/bundled/sas/pictures-download-index.ts
|
||||
msgid "pictures.%(extension)s"
|
||||
msgstr "photos.%(extension)s"
|
||||
|
||||
147
package-lock.json
generated
147
package-lock.json
generated
@@ -9,18 +9,14 @@
|
||||
"version": "3",
|
||||
"license": "GPL-3.0-only",
|
||||
"dependencies": {
|
||||
"@alpinejs/morph": "^3.14.9",
|
||||
"@alpinejs/sort": "^3.14.7",
|
||||
"@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
|
||||
"@floating-ui/dom": "^1.6.13",
|
||||
"@fortawesome/fontawesome-free": "^6.6.0",
|
||||
"@fullcalendar/core": "^6.1.19",
|
||||
"@fullcalendar/daygrid": "^6.1.19",
|
||||
"@fullcalendar/icalendar": "^6.1.19",
|
||||
"@fullcalendar/interaction": "^6.1.19",
|
||||
"@fullcalendar/list": "^6.1.19",
|
||||
"@fullcalendar/resource": "^6.1.19",
|
||||
"@fullcalendar/resource-timeline": "^6.1.19",
|
||||
"@fullcalendar/core": "^6.1.15",
|
||||
"@fullcalendar/daygrid": "^6.1.15",
|
||||
"@fullcalendar/icalendar": "^6.1.15",
|
||||
"@fullcalendar/list": "^6.1.15",
|
||||
"@sentry/browser": "^9.29.0",
|
||||
"@zip.js/zip.js": "^2.7.52",
|
||||
"3d-force-graph": "^1.73.4",
|
||||
@@ -33,8 +29,6 @@
|
||||
"d3-force-3d": "^3.0.5",
|
||||
"easymde": "^2.19.0",
|
||||
"glob": "^11.0.0",
|
||||
"html2canvas": "^1.4.1",
|
||||
"htmx-ext-alpine-morph": "^2.0.1",
|
||||
"htmx.org": "^2.0.3",
|
||||
"js-cookie": "^3.0.5",
|
||||
"lit-html": "^3.3.0",
|
||||
@@ -59,12 +53,6 @@
|
||||
"vite-plugin-static-copy": "^3.1.2"
|
||||
}
|
||||
},
|
||||
"node_modules/@alpinejs/morph": {
|
||||
"version": "3.14.9",
|
||||
"resolved": "https://registry.npmjs.org/@alpinejs/morph/-/morph-3.14.9.tgz",
|
||||
"integrity": "sha512-i1mrH5Gza/egszxnCVwQWypRhsKGq28RFWHWuW7aI0+rWo1pvFw+aPhJLImbpt7hx44DtDOr5m4l9Ah+JPFmFw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@alpinejs/sort": {
|
||||
"version": "3.14.9",
|
||||
"resolved": "https://registry.npmjs.org/@alpinejs/sort/-/sort-3.14.9.tgz",
|
||||
@@ -2282,15 +2270,6 @@
|
||||
"ical.js": "^1.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@fullcalendar/interaction": {
|
||||
"version": "6.1.19",
|
||||
"resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.19.tgz",
|
||||
"integrity": "sha512-GOciy79xe8JMVp+1evAU3ytdwN/7tv35t5i1vFkifiuWcQMLC/JnLg/RA2s4sYmQwoYhTw/p4GLcP0gO5B3X5w==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"@fullcalendar/core": "~6.1.19"
|
||||
}
|
||||
},
|
||||
"node_modules/@fullcalendar/list": {
|
||||
"version": "6.1.19",
|
||||
"resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-6.1.19.tgz",
|
||||
@@ -2300,67 +2279,6 @@
|
||||
"@fullcalendar/core": "~6.1.19"
|
||||
}
|
||||
},
|
||||
"node_modules/@fullcalendar/premium-common": {
|
||||
"version": "6.1.19",
|
||||
"resolved": "https://registry.npmjs.org/@fullcalendar/premium-common/-/premium-common-6.1.19.tgz",
|
||||
"integrity": "sha512-bOWHm1u1dUy6M4fQ0hNK7qEI7SrVWrN1ovv/z4/FE/ybfM19ukz7SFs907Ur7KUBWLNKTQYXBtdrY/ginwWraw==",
|
||||
"license": "SEE LICENSE IN LICENSE.md",
|
||||
"peerDependencies": {
|
||||
"@fullcalendar/core": "~6.1.19"
|
||||
}
|
||||
},
|
||||
"node_modules/@fullcalendar/resource": {
|
||||
"version": "6.1.19",
|
||||
"resolved": "https://registry.npmjs.org/@fullcalendar/resource/-/resource-6.1.19.tgz",
|
||||
"integrity": "sha512-br1ylX/aIOfd8m7Tzl2LpJBSI+N9Q6aS1qw7K9qnQjYXWQyHBlfLG6ZcPmmkjfaqTUJc8ARRbtNWj1ts5qOZgQ==",
|
||||
"license": "SEE LICENSE IN LICENSE.md",
|
||||
"dependencies": {
|
||||
"@fullcalendar/premium-common": "~6.1.19"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@fullcalendar/core": "~6.1.19"
|
||||
}
|
||||
},
|
||||
"node_modules/@fullcalendar/resource-timeline": {
|
||||
"version": "6.1.19",
|
||||
"resolved": "https://registry.npmjs.org/@fullcalendar/resource-timeline/-/resource-timeline-6.1.19.tgz",
|
||||
"integrity": "sha512-oC3aVR++dLqJNeBwmLHq9sDgRDFfIG0qSteV7bgBekvNlqEMqXx8wPjUxnELrq8rrhMmK4iV3wO7AB/48IVgyg==",
|
||||
"license": "SEE LICENSE IN LICENSE.md",
|
||||
"dependencies": {
|
||||
"@fullcalendar/premium-common": "~6.1.19",
|
||||
"@fullcalendar/scrollgrid": "~6.1.19",
|
||||
"@fullcalendar/timeline": "~6.1.19"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@fullcalendar/core": "~6.1.19",
|
||||
"@fullcalendar/resource": "~6.1.19"
|
||||
}
|
||||
},
|
||||
"node_modules/@fullcalendar/scrollgrid": {
|
||||
"version": "6.1.19",
|
||||
"resolved": "https://registry.npmjs.org/@fullcalendar/scrollgrid/-/scrollgrid-6.1.19.tgz",
|
||||
"integrity": "sha512-S1pbiYHvmV0ep6z5sWXJQfgW4Y/jrS5iLIAqSagDFPK0jr327nBxl7Ryi3Zb5UdMIP0/O4GXs8jwZabQPd8SOg==",
|
||||
"license": "SEE LICENSE IN LICENSE.md",
|
||||
"dependencies": {
|
||||
"@fullcalendar/premium-common": "~6.1.19"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@fullcalendar/core": "~6.1.19"
|
||||
}
|
||||
},
|
||||
"node_modules/@fullcalendar/timeline": {
|
||||
"version": "6.1.19",
|
||||
"resolved": "https://registry.npmjs.org/@fullcalendar/timeline/-/timeline-6.1.19.tgz",
|
||||
"integrity": "sha512-d2P961mnUTXtJeWNmIq1neoDmZcrPUaK7nGFoc+jQAlnmG3aNSVWQmD1ia694AMqLWtcWkwipW9MuaJgx2QvrA==",
|
||||
"license": "SEE LICENSE IN LICENSE.md",
|
||||
"dependencies": {
|
||||
"@fullcalendar/premium-common": "~6.1.19",
|
||||
"@fullcalendar/scrollgrid": "~6.1.19"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@fullcalendar/core": "~6.1.19"
|
||||
}
|
||||
},
|
||||
"node_modules/@hey-api/json-schema-ref-parser": {
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@hey-api/json-schema-ref-parser/-/json-schema-ref-parser-1.0.6.tgz",
|
||||
@@ -3187,15 +3105,6 @@
|
||||
"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/base64-arraybuffer": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
|
||||
"integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 0.6.0"
|
||||
}
|
||||
},
|
||||
"node_modules/binary-extensions": {
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
|
||||
@@ -3584,15 +3493,6 @@
|
||||
"node": ">= 8"
|
||||
}
|
||||
},
|
||||
"node_modules/css-line-break": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
|
||||
"integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"utrie": "^1.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/cytoscape": {
|
||||
"version": "3.33.1",
|
||||
"resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.1.tgz",
|
||||
@@ -4265,27 +4165,6 @@
|
||||
"node": ">= 0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/html2canvas": {
|
||||
"version": "1.4.1",
|
||||
"resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
|
||||
"integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"css-line-break": "^2.1.0",
|
||||
"text-segmentation": "^1.0.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/htmx-ext-alpine-morph": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/htmx-ext-alpine-morph/-/htmx-ext-alpine-morph-2.0.1.tgz",
|
||||
"integrity": "sha512-teGpcVatx5IjDUYQs959x9FcePM1TIksjfW5tSe1KVQVEVSmbGxEoemneC7XV6RYpX+27i/xn1fPjduwvHDrAw==",
|
||||
"dependencies": {
|
||||
"htmx.org": "^2.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/htmx.org": {
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.6.tgz",
|
||||
@@ -5575,15 +5454,6 @@
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/text-segmentation": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
|
||||
"integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"utrie": "^1.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/three": {
|
||||
"version": "0.177.0",
|
||||
"resolved": "https://registry.npmjs.org/three/-/three-0.177.0.tgz",
|
||||
@@ -5841,15 +5711,6 @@
|
||||
"browserslist": ">= 4.21.0"
|
||||
}
|
||||
},
|
||||
"node_modules/utrie": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
|
||||
"integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"base64-arraybuffer": "^1.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/vite": {
|
||||
"version": "6.3.6",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
|
||||
|
||||
17
package.json
17
package.json
@@ -21,8 +21,7 @@
|
||||
"#core:*": "./core/static/bundled/*",
|
||||
"#pedagogy:*": "./pedagogy/static/bundled/*",
|
||||
"#counter:*": "./counter/static/bundled/*",
|
||||
"#com:*": "./com/static/bundled/*",
|
||||
"#reservation:*": "./reservation/static/bundled/*"
|
||||
"#com:*": "./com/static/bundled/*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.25.2",
|
||||
@@ -40,18 +39,14 @@
|
||||
"vite-plugin-static-copy": "^3.1.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@alpinejs/morph": "^3.14.9",
|
||||
"@alpinejs/sort": "^3.14.7",
|
||||
"@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
|
||||
"@floating-ui/dom": "^1.6.13",
|
||||
"@fortawesome/fontawesome-free": "^6.6.0",
|
||||
"@fullcalendar/core": "^6.1.19",
|
||||
"@fullcalendar/daygrid": "^6.1.19",
|
||||
"@fullcalendar/icalendar": "^6.1.19",
|
||||
"@fullcalendar/interaction": "^6.1.19",
|
||||
"@fullcalendar/list": "^6.1.19",
|
||||
"@fullcalendar/resource": "^6.1.19",
|
||||
"@fullcalendar/resource-timeline": "^6.1.19",
|
||||
"@fullcalendar/core": "^6.1.15",
|
||||
"@fullcalendar/daygrid": "^6.1.15",
|
||||
"@fullcalendar/icalendar": "^6.1.15",
|
||||
"@fullcalendar/list": "^6.1.15",
|
||||
"@sentry/browser": "^9.29.0",
|
||||
"@zip.js/zip.js": "^2.7.52",
|
||||
"3d-force-graph": "^1.73.4",
|
||||
@@ -64,8 +59,6 @@
|
||||
"d3-force-3d": "^3.0.5",
|
||||
"easymde": "^2.19.0",
|
||||
"glob": "^11.0.0",
|
||||
"html2canvas": "^1.4.1",
|
||||
"htmx-ext-alpine-morph": "^2.0.1",
|
||||
"htmx.org": "^2.0.3",
|
||||
"js-cookie": "^3.0.5",
|
||||
"lit-html": "^3.3.0",
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from reservation.models import ReservationSlot, Room
|
||||
|
||||
|
||||
@admin.register(Room)
|
||||
class RoomAdmin(admin.ModelAdmin):
|
||||
list_display = ("name", "club")
|
||||
list_filter = (("club", admin.RelatedOnlyFieldListFilter), "location")
|
||||
autocomplete_fields = ("club",)
|
||||
search_fields = ("name",)
|
||||
|
||||
|
||||
@admin.register(ReservationSlot)
|
||||
class ReservationSlotAdmin(admin.ModelAdmin):
|
||||
list_display = ("room", "start_at", "end_at", "author")
|
||||
autocomplete_fields = ("author",)
|
||||
list_filter = ("room",)
|
||||
date_hierarchy = "start_at"
|
||||
@@ -1,64 +0,0 @@
|
||||
from typing import Any, Literal
|
||||
|
||||
from django.core.exceptions import ValidationError
|
||||
from ninja import Query
|
||||
from ninja_extra import ControllerBase, api_controller, paginate, route
|
||||
from ninja_extra.pagination import PageNumberPaginationExtra
|
||||
from ninja_extra.schemas import PaginatedResponseSchema
|
||||
|
||||
from api.permissions import HasPerm
|
||||
from reservation.models import ReservationSlot, Room
|
||||
from reservation.schemas import (
|
||||
RoomFilterSchema,
|
||||
RoomSchema,
|
||||
SlotFilterSchema,
|
||||
SlotSchema,
|
||||
UpdateReservationSlotSchema,
|
||||
)
|
||||
|
||||
|
||||
@api_controller("/reservation/room")
|
||||
class ReservableRoomController(ControllerBase):
|
||||
@route.get(
|
||||
"",
|
||||
response=list[RoomSchema],
|
||||
permissions=[HasPerm("reservation.view_room")],
|
||||
url_name="fetch_reservable_rooms",
|
||||
)
|
||||
def fetch_rooms(self, filters: Query[RoomFilterSchema]):
|
||||
return filters.filter(Room.objects.select_related("club"))
|
||||
|
||||
|
||||
@api_controller("/reservation/slot")
|
||||
class ReservationSlotController(ControllerBase):
|
||||
@route.get(
|
||||
"",
|
||||
response=PaginatedResponseSchema[SlotSchema],
|
||||
permissions=[HasPerm("reservation.view_reservationslot")],
|
||||
url_name="fetch_reservation_slots",
|
||||
)
|
||||
@paginate(PageNumberPaginationExtra)
|
||||
def fetch_slots(self, filters: Query[SlotFilterSchema]):
|
||||
return filters.filter(
|
||||
ReservationSlot.objects.select_related("author").order_by("start_at")
|
||||
)
|
||||
|
||||
@route.patch(
|
||||
"/reservation/slot/{int:slot_id}",
|
||||
permissions=[HasPerm("reservation.change_reservationslot")],
|
||||
response={
|
||||
200: None,
|
||||
409: dict[Literal["detail"], dict[str, list[str]]],
|
||||
422: dict[Literal["detail"], list[dict[str, Any]]],
|
||||
},
|
||||
url_name="change_reservation_slot",
|
||||
)
|
||||
def update_slot(self, slot_id: int, params: UpdateReservationSlotSchema):
|
||||
slot = self.get_object_or_exception(ReservationSlot, id=slot_id)
|
||||
slot.start_at = params.start_at
|
||||
slot.end_at = params.end_at
|
||||
try:
|
||||
slot.full_clean()
|
||||
slot.save()
|
||||
except ValidationError as e:
|
||||
return self.create_response({"detail": dict(e)}, status_code=409)
|
||||
@@ -1,6 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class ReservationConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "reservation"
|
||||
@@ -1,60 +0,0 @@
|
||||
from django import forms
|
||||
from django.core.exceptions import NON_FIELD_ERRORS
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from club.widgets.ajax_select import AutoCompleteSelectClub
|
||||
from core.models import User
|
||||
from core.views.forms import FutureDateTimeField, SelectDateTime
|
||||
from reservation.models import ReservationSlot, Room
|
||||
|
||||
|
||||
class RoomCreateForm(forms.ModelForm):
|
||||
required_css_class = "required"
|
||||
error_css_class = "error"
|
||||
|
||||
class Meta:
|
||||
model = Room
|
||||
fields = ["name", "club", "location", "description"]
|
||||
widgets = {"club": AutoCompleteSelectClub}
|
||||
|
||||
|
||||
class RoomUpdateForm(forms.ModelForm):
|
||||
required_css_class = "required"
|
||||
error_css_class = "error"
|
||||
|
||||
class Meta:
|
||||
model = Room
|
||||
fields = ["name", "club", "location", "description"]
|
||||
widgets = {"club": AutoCompleteSelectClub}
|
||||
|
||||
def __init__(self, *args, request_user: User, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
if not request_user.has_perm("reservation.change_room"):
|
||||
# if the user doesn't have the global edition permission
|
||||
# (i.e. it's a club board member, but not a sith admin)
|
||||
# some fields aren't editable
|
||||
del self.fields["club"]
|
||||
|
||||
|
||||
class ReservationForm(forms.ModelForm):
|
||||
required_css_class = "required"
|
||||
error_css_class = "error"
|
||||
|
||||
class Meta:
|
||||
model = ReservationSlot
|
||||
fields = ["room", "start_at", "end_at", "comment"]
|
||||
field_classes = {"start_at": FutureDateTimeField, "end_at": FutureDateTimeField}
|
||||
widgets = {"start_at": SelectDateTime(), "end_at": SelectDateTime()}
|
||||
error_messages = {
|
||||
NON_FIELD_ERRORS: {
|
||||
"start_after_end": _("The start must be set before the end")
|
||||
}
|
||||
}
|
||||
|
||||
def __init__(self, *args, author: User, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.author = author
|
||||
|
||||
def save(self, commit: bool = True): # noqa FBT001
|
||||
self.instance.author = self.author
|
||||
return super().save(commit)
|
||||
@@ -1,117 +0,0 @@
|
||||
# Generated by Django 5.2.1 on 2025-06-05 10:44
|
||||
|
||||
import django.core.validators
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
("club", "0014_alter_club_options_rename_unix_name_club_slug_name_and_more"),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="Room",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.BigAutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
),
|
||||
),
|
||||
("name", models.CharField(max_length=100, verbose_name="room name")),
|
||||
(
|
||||
"description",
|
||||
models.TextField(
|
||||
blank=True, default="", verbose_name="description"
|
||||
),
|
||||
),
|
||||
(
|
||||
"location",
|
||||
models.CharField(
|
||||
blank=True,
|
||||
choices=[
|
||||
("BELFORT", "Belfort"),
|
||||
("SEVENANS", "Sévenans"),
|
||||
("MONTBELIARD", "Montbéliard"),
|
||||
],
|
||||
verbose_name="site",
|
||||
),
|
||||
),
|
||||
(
|
||||
"club",
|
||||
models.ForeignKey(
|
||||
help_text="The club which manages this room",
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="reservable_rooms",
|
||||
to="club.club",
|
||||
verbose_name="room owner",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "reservable room",
|
||||
"verbose_name_plural": "reservable rooms",
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="ReservationSlot",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.BigAutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
),
|
||||
),
|
||||
(
|
||||
"comment",
|
||||
models.TextField(blank=True, default="", verbose_name="comment"),
|
||||
),
|
||||
(
|
||||
"start_at",
|
||||
models.DateTimeField(db_index=True, verbose_name="slot start"),
|
||||
),
|
||||
("end_at", models.DateTimeField(verbose_name="slot end")),
|
||||
("created_at", models.DateTimeField(auto_now_add=True)),
|
||||
(
|
||||
"author",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name="author",
|
||||
),
|
||||
),
|
||||
(
|
||||
"room",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="slots",
|
||||
to="reservation.room",
|
||||
verbose_name="reserved room",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "reservation slot",
|
||||
"verbose_name_plural": "reservation slots",
|
||||
"constraints": [
|
||||
models.CheckConstraint(
|
||||
condition=models.Q(("end_at__gt", models.F("start_at"))),
|
||||
name="reservation_slot_end_after_start",
|
||||
violation_error_code="start_after_end",
|
||||
)
|
||||
],
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -1,100 +0,0 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Self
|
||||
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db import models
|
||||
from django.db.models import F, Q
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from club.models import Club
|
||||
from core.models import User
|
||||
|
||||
|
||||
class Room(models.Model):
|
||||
name = models.CharField(_("room name"), max_length=100)
|
||||
description = models.TextField(_("description"), blank=True, default="")
|
||||
club = models.ForeignKey(
|
||||
Club,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="reservable_rooms",
|
||||
verbose_name=_("room owner"),
|
||||
help_text=_("The club which manages this room"),
|
||||
)
|
||||
location = models.CharField(
|
||||
_("site"),
|
||||
blank=True,
|
||||
choices=[
|
||||
("BELFORT", "Belfort"),
|
||||
("SEVENANS", "Sévenans"),
|
||||
("MONTBELIARD", "Montbéliard"),
|
||||
],
|
||||
)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("reservable room")
|
||||
verbose_name_plural = _("reservable rooms")
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
def can_be_edited_by(self, user: User) -> bool:
|
||||
# a user may edit a room if it has the global perm
|
||||
# or is in the owner club board
|
||||
return user.has_perm("reservation.change_room") or self.club.board_group_id in [
|
||||
g.id for g in user.cached_groups
|
||||
]
|
||||
|
||||
|
||||
class ReservationSlotQuerySet(models.QuerySet):
|
||||
def overlapping_with(self, slot: ReservationSlot) -> Self:
|
||||
return self.filter(
|
||||
Q(start_at__lt=slot.start_at, end_at__gt=slot.start_at)
|
||||
| Q(start_at__lt=slot.end_at, end_at__gt=slot.end_at)
|
||||
)
|
||||
|
||||
|
||||
class ReservationSlot(models.Model):
|
||||
room = models.ForeignKey(
|
||||
Room,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="slots",
|
||||
verbose_name=_("reserved room"),
|
||||
)
|
||||
author = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=_("author"))
|
||||
comment = models.TextField(_("comment"), blank=True, default="")
|
||||
start_at = models.DateTimeField(_("slot start"), db_index=True)
|
||||
end_at = models.DateTimeField(_("slot end"))
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
objects = ReservationSlotQuerySet.as_manager()
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("reservation slot")
|
||||
verbose_name_plural = _("reservation slots")
|
||||
constraints = [
|
||||
models.CheckConstraint(
|
||||
condition=Q(end_at__gt=F("start_at")),
|
||||
name="reservation_slot_end_after_start",
|
||||
violation_error_code="start_after_end",
|
||||
)
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.room.name} : {self.start_at} - {self.end_at}"
|
||||
|
||||
def clean(self):
|
||||
super().clean()
|
||||
if self.end_at is None or self.start_at is None:
|
||||
# if there is no start or no end, then there is no
|
||||
# point to check if this perm overlap with another,
|
||||
# so in this case, don't do the overlap check and let
|
||||
# Django manage the non-null constraint error.
|
||||
return
|
||||
overlapping = ReservationSlot.objects.overlapping_with(self).filter(
|
||||
room_id=self.room_id
|
||||
)
|
||||
if self.id is not None:
|
||||
overlapping = overlapping.exclude(id=self.id)
|
||||
if overlapping.exists():
|
||||
raise ValidationError(_("There is already a reservation on this slot."))
|
||||
@@ -1,46 +0,0 @@
|
||||
from datetime import datetime
|
||||
|
||||
from ninja import FilterSchema, ModelSchema, Schema
|
||||
from pydantic import Field, FutureDatetime
|
||||
|
||||
from club.schemas import SimpleClubSchema
|
||||
from core.schemas import SimpleUserSchema
|
||||
from reservation.models import ReservationSlot, Room
|
||||
|
||||
|
||||
class RoomFilterSchema(FilterSchema):
|
||||
club: set[int] | None = Field(None, q="club_id__in")
|
||||
|
||||
|
||||
class RoomSchema(ModelSchema):
|
||||
class Meta:
|
||||
model = Room
|
||||
fields = ["id", "name", "description", "location"]
|
||||
|
||||
club: SimpleClubSchema
|
||||
|
||||
@staticmethod
|
||||
def resolve_location(obj: Room):
|
||||
return obj.get_location_display()
|
||||
|
||||
|
||||
class SlotFilterSchema(FilterSchema):
|
||||
after: datetime = Field(default=None, q="end_at__gt")
|
||||
before: datetime = Field(default=None, q="start_at__lt")
|
||||
room: set[int] | None = None
|
||||
club: set[int] | None = None
|
||||
|
||||
|
||||
class SlotSchema(ModelSchema):
|
||||
class Meta:
|
||||
model = ReservationSlot
|
||||
fields = ["id", "room", "comment"]
|
||||
|
||||
start: datetime = Field(alias="start_at")
|
||||
end: datetime = Field(alias="end_at")
|
||||
author: SimpleUserSchema
|
||||
|
||||
|
||||
class UpdateReservationSlotSchema(Schema):
|
||||
start_at: FutureDatetime
|
||||
end_at: FutureDatetime
|
||||
@@ -1,138 +0,0 @@
|
||||
import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
|
||||
import {
|
||||
Calendar,
|
||||
type DateSelectArg,
|
||||
type EventDropArg,
|
||||
type EventSourceFuncArg,
|
||||
} from "@fullcalendar/core";
|
||||
import enLocale from "@fullcalendar/core/locales/en-gb";
|
||||
import frLocale from "@fullcalendar/core/locales/fr";
|
||||
|
||||
import {
|
||||
type ReservationslotFetchSlotsData,
|
||||
type SlotSchema,
|
||||
reservableroomFetchRooms,
|
||||
reservationslotFetchSlots,
|
||||
reservationslotUpdateSlot,
|
||||
} from "#openapi";
|
||||
|
||||
import { paginated } from "#core:utils/api";
|
||||
import type { SlotSelectedEventArg } from "#reservation:reservation/types";
|
||||
import interactionPlugin, { type EventResizeDoneArg } from "@fullcalendar/interaction";
|
||||
import resourceTimelinePlugin from "@fullcalendar/resource-timeline";
|
||||
|
||||
@registerComponent("room-scheduler")
|
||||
export class RoomScheduler extends inheritHtmlElement("div") {
|
||||
static observedAttributes = ["locale", "can_edit_slot", "can_create_slot"];
|
||||
private scheduler: Calendar;
|
||||
private locale = "en";
|
||||
private canEditSlot = false;
|
||||
private canBookSlot = false;
|
||||
private canDeleteSlot = false;
|
||||
|
||||
attributeChangedCallback(name: string, _oldValue?: string, newValue?: string) {
|
||||
if (name === "locale") {
|
||||
this.locale = newValue;
|
||||
}
|
||||
if (name === "can_edit_slot") {
|
||||
this.canEditSlot = newValue.toLowerCase() === "true";
|
||||
}
|
||||
if (name === "can_create_slot") {
|
||||
this.canBookSlot = newValue.toLowerCase() === "true";
|
||||
}
|
||||
if (name === "can_delete_slot") {
|
||||
this.canDeleteSlot = newValue.toLowerCase() === "true";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch the events displayed in the timeline.
|
||||
* cf https://fullcalendar.io/docs/events-function
|
||||
*/
|
||||
async fetchEvents(fetchInfo: EventSourceFuncArg) {
|
||||
const res: SlotSchema[] = await paginated(reservationslotFetchSlots, {
|
||||
query: { after: fetchInfo.startStr, before: fetchInfo.endStr },
|
||||
} as ReservationslotFetchSlotsData);
|
||||
return res.map((i) =>
|
||||
Object.assign(i, {
|
||||
title: `${i.author.first_name} ${i.author.last_name}`,
|
||||
resourceId: i.room,
|
||||
editable: new Date(i.start) > new Date(),
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch the resources which events are associated with.
|
||||
* cf https://fullcalendar.io/docs/resources-function
|
||||
*/
|
||||
async fetchResources() {
|
||||
const res = await reservableroomFetchRooms();
|
||||
return res.data.map((i) => Object.assign(i, { title: i.name, group: i.location }));
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a request to the API to change
|
||||
* the start and the duration of a reservation slot
|
||||
*/
|
||||
async changeReservation(args: EventDropArg | EventResizeDoneArg) {
|
||||
const response = await reservationslotUpdateSlot({
|
||||
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
||||
path: { slot_id: Number.parseInt(args.event.id) },
|
||||
// biome-ignore lint/style/useNamingConvention: api is snake_case
|
||||
body: { start_at: args.event.startStr, end_at: args.event.endStr },
|
||||
});
|
||||
if (response.response.ok) {
|
||||
document.dispatchEvent(new CustomEvent("reservationSlotChanged"));
|
||||
this.scheduler.refetchEvents();
|
||||
}
|
||||
}
|
||||
|
||||
selectFreeSlot(infos: DateSelectArg) {
|
||||
document.dispatchEvent(
|
||||
new CustomEvent<SlotSelectedEventArg>("timeSlotSelected", {
|
||||
detail: {
|
||||
ressource: Number.parseInt(infos.resource.id),
|
||||
start: infos.startStr,
|
||||
end: infos.endStr,
|
||||
},
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
connectedCallback() {
|
||||
super.connectedCallback();
|
||||
this.scheduler = new Calendar(this.node, {
|
||||
schedulerLicenseKey: "GPL-My-Project-Is-Open-Source",
|
||||
initialView: "resourceTimelineDay",
|
||||
headerToolbar: {
|
||||
left: "prev,next today",
|
||||
center: "title",
|
||||
right: "resourceTimelineDay,resourceTimelineWeek",
|
||||
},
|
||||
plugins: [resourceTimelinePlugin, interactionPlugin],
|
||||
locales: [frLocale, enLocale],
|
||||
height: "auto",
|
||||
locale: this.locale,
|
||||
resourceGroupField: "group",
|
||||
resourceAreaHeaderContent: gettext("Rooms"),
|
||||
editable: this.canEditSlot,
|
||||
snapDuration: "00:15",
|
||||
eventConstraint: { start: new Date() }, // forbid edition of past events
|
||||
eventOverlap: false,
|
||||
eventResourceEditable: false,
|
||||
refetchResourcesOnNavigate: true,
|
||||
resourceAreaWidth: "20%",
|
||||
resources: this.fetchResources,
|
||||
events: this.fetchEvents,
|
||||
select: this.selectFreeSlot,
|
||||
selectOverlap: false,
|
||||
selectable: this.canBookSlot,
|
||||
selectConstraint: { start: new Date() },
|
||||
nowIndicator: true,
|
||||
eventDrop: this.changeReservation,
|
||||
eventResize: this.changeReservation,
|
||||
});
|
||||
this.scheduler.render();
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
import { AlertMessage } from "#core:utils/alert-message";
|
||||
import type { SlotSelectedEventArg } from "#reservation:reservation/types";
|
||||
|
||||
document.addEventListener("alpine:init", () => {
|
||||
Alpine.data("slotReservation", () => ({
|
||||
start: null as string,
|
||||
end: null as string,
|
||||
room: null as number,
|
||||
showForm: false,
|
||||
|
||||
init() {
|
||||
document.addEventListener(
|
||||
"timeSlotSelected",
|
||||
(event: CustomEvent<SlotSelectedEventArg>) => {
|
||||
this.start = event.detail.start.split("+")[0];
|
||||
this.end = event.detail.end.split("+")[0];
|
||||
this.room = event.detail.ressource;
|
||||
this.showForm = true;
|
||||
this.$nextTick(() => this.$el.scrollIntoView({ behavior: "smooth" })).then();
|
||||
},
|
||||
);
|
||||
},
|
||||
}));
|
||||
|
||||
/**
|
||||
* Component that will catch events sent from the scheduler
|
||||
* to display success messages accordingly.
|
||||
*/
|
||||
Alpine.data("scheduleMessages", () => ({
|
||||
alertMessage: new AlertMessage({ defaultDuration: 2000 }),
|
||||
init() {
|
||||
document.addEventListener("reservationSlotChanged", (_event: CustomEvent) => {
|
||||
this.alertMessage.display(gettext("This slot has been successfully moved"), {
|
||||
success: true,
|
||||
});
|
||||
});
|
||||
},
|
||||
}));
|
||||
});
|
||||
@@ -1,5 +0,0 @@
|
||||
export interface SlotSelectedEventArg {
|
||||
start: string;
|
||||
end: string;
|
||||
ressource: number;
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
#slot-reservation {
|
||||
margin-top: 3em;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
h3 {
|
||||
display: block;
|
||||
margin: auto;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.alert, .error {
|
||||
display: block;
|
||||
margin: 1em auto auto;
|
||||
max-width: 400px;
|
||||
word-wrap: break-word;
|
||||
text-wrap: wrap;
|
||||
}
|
||||
|
||||
form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: .5em;
|
||||
justify-content: center;
|
||||
|
||||
.buttons-row {
|
||||
input[type="submit"], button {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
textarea {
|
||||
max-width: unset;
|
||||
width: 100%;
|
||||
margin-top: unset;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
<section
|
||||
id="slot-reservation"
|
||||
x-data="slotReservation"
|
||||
x-show="showForm"
|
||||
hx-target="this"
|
||||
hx-ext="alpine-morph"
|
||||
hx-swap="morph"
|
||||
>
|
||||
<h3>{% trans %}Book a room{% endtrans %}</h3>
|
||||
{% set non_field_errors = form.non_field_errors() %}
|
||||
{% if non_field_errors %}
|
||||
<div class="alert alert-red">
|
||||
{% for error in non_field_errors %}
|
||||
<span>{{ error }}</span>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<form
|
||||
id="slot-reservation-form"
|
||||
hx-post="{{ url("reservation:make_reservation") }}"
|
||||
hx-disabled-elt="find input[type='submit']"
|
||||
>
|
||||
{% csrf_token %}
|
||||
<div class="form-group">
|
||||
{{ form.room.errors }}
|
||||
{{ form.room.label_tag() }}
|
||||
{{ form.room|add_attr("x-model=room") }}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{{ form.start_at.errors }}
|
||||
{{ form.start_at.label_tag() }}
|
||||
{{ form.start_at|add_attr("x-model=start") }}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{{ form.end_at.errors }}
|
||||
{{ form.end_at.label_tag() }}
|
||||
{{ form.end_at|add_attr("x-model=end") }}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{{ form.comment.errors }}
|
||||
{{ form.comment.label_tag() }}
|
||||
{{ form.comment }}
|
||||
</div>
|
||||
<div class="row gap buttons-row">
|
||||
<button class="btn btn-grey grow" @click.prevent="showForm = false">
|
||||
{% trans %}Cancel{% endtrans %}
|
||||
</button>
|
||||
<input class="btn btn-blue grow" type="submit">
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
@@ -1,27 +0,0 @@
|
||||
{% macro room_detail(room, can_edit, can_delete) %}
|
||||
<div class="card card-row card-row-m">
|
||||
<div class="card-content">
|
||||
<strong class="card-title">{{ room.name }}</strong>
|
||||
<em>{{ room.get_location_display() }}</em>
|
||||
<p>{{ room.description|truncate(250) }}</p>
|
||||
</div>
|
||||
<div class="card-top-left">
|
||||
{% if can_edit %}
|
||||
<a
|
||||
class="btn btn-grey btn-no-text"
|
||||
href="{{ url("reservation:room_edit", room_id=room.id) }}"
|
||||
>
|
||||
<i class="fa fa-edit"></i>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if can_delete %}
|
||||
<a
|
||||
class="btn btn-red btn-no-text"
|
||||
href="{{ url("reservation:room_delete", room_id=room.id) }}"
|
||||
>
|
||||
<i class="fa fa-trash"></i>
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
@@ -1,33 +0,0 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
|
||||
{% block additional_js %}
|
||||
<script type="module" src="{{ static("bundled/reservation/components/room-scheduler-index.ts") }}"></script>
|
||||
<script type="module" src="{{ static("bundled/reservation/slot-reservation-index.ts") }}"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% block additional_css %}
|
||||
<link rel="stylesheet" href="{{ static('core/components/calendar.scss') }}">
|
||||
<link rel="stylesheet" href="{{ static('reservation/reservation.scss') }}">
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<h2 class="margin-bottom">{% trans %}Room reservation{% endtrans %}</h2>
|
||||
<p
|
||||
x-data="scheduleMessages"
|
||||
class="alert snackbar"
|
||||
:class="alertMessage.success ? 'alert-green' : 'alert-red'"
|
||||
x-show="alertMessage.open"
|
||||
x-transition.duration.500ms
|
||||
x-text="alertMessage.content"
|
||||
></p>
|
||||
<room-scheduler
|
||||
locale="{{ LANGUAGE_CODE }}"
|
||||
can_edit_slot="{{ user.has_perm("reservation.change_reservationslot") }}"
|
||||
can_create_slot="{{ user.has_perm("reservation.add_reservationslot") }}"
|
||||
></room-scheduler>
|
||||
{% if user.has_perm("reservation.add_reservationslot") %}
|
||||
<p><em>{% trans %}You can book a room by selecting a free slot in the calendar.{% endtrans %}</em></p>
|
||||
{{ add_slot_fragment }}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -1,113 +0,0 @@
|
||||
import pytest
|
||||
from django.contrib.auth.models import Permission
|
||||
from django.test import Client
|
||||
from django.urls import reverse
|
||||
from model_bakery import baker
|
||||
from pytest_django.asserts import assertNumQueries, assertRedirects
|
||||
|
||||
from club.models import Club
|
||||
from core.models import User
|
||||
from reservation.forms import RoomUpdateForm
|
||||
from reservation.models import Room
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestFetchRoom:
|
||||
@pytest.fixture
|
||||
def user(self):
|
||||
return baker.make(
|
||||
User,
|
||||
user_permissions=[Permission.objects.get(codename="view_room")],
|
||||
)
|
||||
|
||||
def test_fetch_simple(self, client: Client, user: User):
|
||||
rooms = baker.make(Room, _quantity=3, _bulk_create=True)
|
||||
client.force_login(user)
|
||||
response = client.get(reverse("api:fetch_reservable_rooms"))
|
||||
assert response.status_code == 200
|
||||
assert response.json() == [
|
||||
{
|
||||
"id": room.id,
|
||||
"name": room.name,
|
||||
"description": room.description,
|
||||
"location": room.location,
|
||||
"club": {"id": room.club.id, "name": room.club.name},
|
||||
}
|
||||
for room in rooms
|
||||
]
|
||||
|
||||
def test_nb_queries(self, client: Client, user: User):
|
||||
client.force_login(user)
|
||||
with assertNumQueries(5):
|
||||
# 4 for authentication
|
||||
# 1 to fetch the actual data
|
||||
client.get(reverse("api:fetch_reservable_rooms"))
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestCreateRoom:
|
||||
def test_ok(self, client: Client):
|
||||
perm = Permission.objects.get(codename="add_room")
|
||||
club = baker.make(Club)
|
||||
client.force_login(
|
||||
baker.make(User, user_permissions=[perm], groups=[club.board_group])
|
||||
)
|
||||
response = client.post(
|
||||
reverse("reservation:room_create"),
|
||||
data={"club": club.id, "name": "test", "location": "BELFORT"},
|
||||
)
|
||||
assertRedirects(response, reverse("club:tools", kwargs={"club_id": club.id}))
|
||||
room = Room.objects.last()
|
||||
assert room is not None
|
||||
assert room.club == club
|
||||
assert room.name == "test"
|
||||
assert room.location == "BELFORT"
|
||||
|
||||
def test_permission_denied(self, client: Client):
|
||||
club = baker.make(Club)
|
||||
client.force_login(baker.make(User))
|
||||
response = client.get(reverse("reservation:room_create"))
|
||||
assert response.status_code == 403
|
||||
response = client.post(
|
||||
reverse("reservation:room_create"),
|
||||
data={"club": club.id, "name": "test", "location": "BELFORT"},
|
||||
)
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestUpdateRoom:
|
||||
def test_ok(self, client: Client):
|
||||
club = baker.make(Club)
|
||||
room = baker.make(Room, club=club)
|
||||
client.force_login(baker.make(User, groups=[club.board_group]))
|
||||
url = reverse("reservation:room_edit", kwargs={"room_id": room.id})
|
||||
response = client.post(url, data={"name": "test", "location": "BELFORT"})
|
||||
assertRedirects(response, url)
|
||||
room.refresh_from_db()
|
||||
assert room.club == club
|
||||
assert room.name == "test"
|
||||
assert room.location == "BELFORT"
|
||||
|
||||
def test_permission_denied(self, client: Client):
|
||||
club = baker.make(Club)
|
||||
room = baker.make(Room, club=club)
|
||||
client.force_login(baker.make(User))
|
||||
url = reverse("reservation:room_edit", kwargs={"room_id": room.id})
|
||||
response = client.get(url)
|
||||
assert response.status_code == 403
|
||||
response = client.post(url, data={"name": "test", "location": "BELFORT"})
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestUpdateRoomForm:
|
||||
def test_form_club_edition_rights(self):
|
||||
"""The club field should appear only if the request user can edit it."""
|
||||
room = baker.make(Room)
|
||||
perm = Permission.objects.get(codename="change_room")
|
||||
user_authorized = baker.make(User, user_permissions=[perm])
|
||||
assert "club" in RoomUpdateForm(request_user=user_authorized).fields
|
||||
|
||||
user_forbidden = baker.make(User, groups=[room.club.board_group])
|
||||
assert "club" not in RoomUpdateForm(request_user=user_forbidden).fields
|
||||
@@ -1,207 +0,0 @@
|
||||
from datetime import timedelta
|
||||
|
||||
import pytest
|
||||
from django.contrib.auth.models import Permission
|
||||
from django.test import Client
|
||||
from django.urls import reverse
|
||||
from django.utils.timezone import now
|
||||
from model_bakery import baker
|
||||
from pytest_django.asserts import assertNumQueries
|
||||
|
||||
from core.models import User
|
||||
from reservation.forms import ReservationForm
|
||||
from reservation.models import ReservationSlot, Room
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestFetchReservationSlotsApi:
|
||||
@pytest.fixture
|
||||
def user(self):
|
||||
perm = Permission.objects.get(codename="view_reservationslot")
|
||||
return baker.make(User, user_permissions=[perm])
|
||||
|
||||
def test_fetch_simple(self, client: Client, user: User):
|
||||
slots = baker.make(ReservationSlot, _quantity=5, _bulk_create=True)
|
||||
client.force_login(user)
|
||||
response = client.get(reverse("api:fetch_reservation_slots"))
|
||||
assert response.json()["results"] == [
|
||||
{
|
||||
"id": slot.id,
|
||||
"room": slot.room_id,
|
||||
"comment": slot.comment,
|
||||
"start": slot.start_at.isoformat(timespec="milliseconds").replace(
|
||||
"+00:00", "Z"
|
||||
),
|
||||
"end": slot.end_at.isoformat(timespec="milliseconds").replace(
|
||||
"+00:00", "Z"
|
||||
),
|
||||
"author": {
|
||||
"id": slot.author.id,
|
||||
"first_name": slot.author.first_name,
|
||||
"last_name": slot.author.last_name,
|
||||
"nick_name": slot.author.nick_name,
|
||||
},
|
||||
}
|
||||
for slot in slots
|
||||
]
|
||||
|
||||
def test_nb_queries(self, client: Client, user: User):
|
||||
client.force_login(user)
|
||||
with assertNumQueries(5):
|
||||
# 4 for authentication
|
||||
# 1 to fetch the actual data
|
||||
client.get(reverse("api:fetch_reservation_slots"))
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestUpdateReservationSlotApi:
|
||||
@pytest.fixture
|
||||
def user(self):
|
||||
perm = Permission.objects.get(codename="change_reservationslot")
|
||||
return baker.make(User, user_permissions=[perm])
|
||||
|
||||
@pytest.fixture
|
||||
def slot(self):
|
||||
return baker.make(
|
||||
ReservationSlot,
|
||||
start_at=now() + timedelta(hours=2),
|
||||
end_at=now() + timedelta(hours=4),
|
||||
)
|
||||
|
||||
def test_ok(self, client: Client, user: User, slot: ReservationSlot):
|
||||
client.force_login(user)
|
||||
new_start = (slot.start_at + timedelta(hours=1)).replace(microsecond=0)
|
||||
response = client.patch(
|
||||
reverse("api:change_reservation_slot", kwargs={"slot_id": slot.id}),
|
||||
{"start_at": new_start, "end_at": new_start + timedelta(hours=2)},
|
||||
content_type="application/json",
|
||||
)
|
||||
assert response.status_code == 200
|
||||
slot.refresh_from_db()
|
||||
assert slot.start_at.replace(microsecond=0) == new_start
|
||||
assert slot.end_at.replace(microsecond=0) == new_start + timedelta(hours=2)
|
||||
|
||||
def test_change_past_event(self, client, user: User, slot: ReservationSlot):
|
||||
"""Test that moving a slot that already began is impossible."""
|
||||
client.force_login(user)
|
||||
new_start = now() - timedelta(hours=1)
|
||||
response = client.patch(
|
||||
reverse("api:change_reservation_slot", kwargs={"slot_id": slot.id}),
|
||||
{"start_at": new_start, "end_at": new_start + timedelta(hours=2)},
|
||||
content_type="application/json",
|
||||
)
|
||||
|
||||
assert response.status_code == 422
|
||||
|
||||
def test_move_event_to_occupied_slot(
|
||||
self, client: Client, user: User, slot: ReservationSlot
|
||||
):
|
||||
client.force_login(user)
|
||||
other_slot = baker.make(
|
||||
ReservationSlot,
|
||||
room=slot.room,
|
||||
start_at=slot.end_at + timedelta(hours=1),
|
||||
end_at=slot.end_at + timedelta(hours=3),
|
||||
)
|
||||
response = client.patch(
|
||||
reverse("api:change_reservation_slot", kwargs={"slot_id": slot.id}),
|
||||
{
|
||||
"start_at": other_slot.start_at - timedelta(hours=1),
|
||||
"end_at": other_slot.start_at + timedelta(hours=1),
|
||||
},
|
||||
content_type="application/json",
|
||||
)
|
||||
assert response.status_code == 409
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestReservationForm:
|
||||
def test_ok(self):
|
||||
start = now() + timedelta(hours=2)
|
||||
end = start + timedelta(hours=1)
|
||||
form = ReservationForm(
|
||||
author=baker.make(User),
|
||||
data={"room": baker.make(Room), "start_at": start, "end_at": end},
|
||||
)
|
||||
assert form.is_valid()
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("start_date", "end_date", "errors"),
|
||||
[
|
||||
(
|
||||
now() - timedelta(hours=2),
|
||||
now() + timedelta(hours=2),
|
||||
{"start_at": ["Assurez-vous que cet horodatage est dans le futur"]},
|
||||
),
|
||||
(
|
||||
now() + timedelta(hours=3),
|
||||
now() + timedelta(hours=2),
|
||||
{"__all__": ["Le début doit être placé avant la fin"]},
|
||||
),
|
||||
],
|
||||
)
|
||||
def test_invalid_timedates(self, start_date, end_date, errors):
|
||||
form = ReservationForm(
|
||||
author=baker.make(User),
|
||||
data={"room": baker.make(Room), "start_at": start_date, "end_at": end_date},
|
||||
)
|
||||
assert not form.is_valid()
|
||||
assert form.errors == errors
|
||||
|
||||
def test_unavailable_room(self):
|
||||
room = baker.make(Room)
|
||||
baker.make(
|
||||
ReservationSlot,
|
||||
room=room,
|
||||
start_at=now() + timedelta(hours=2),
|
||||
end_at=now() + timedelta(hours=4),
|
||||
)
|
||||
form = ReservationForm(
|
||||
author=baker.make(User),
|
||||
data={
|
||||
"room": room,
|
||||
"start_at": now() + timedelta(hours=1),
|
||||
"end_at": now() + timedelta(hours=3),
|
||||
},
|
||||
)
|
||||
assert not form.is_valid()
|
||||
assert form.errors == {
|
||||
"__all__": ["Il y a déjà une réservation sur ce créneau."]
|
||||
}
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestCreateReservationSlot:
|
||||
@pytest.fixture
|
||||
def user(self):
|
||||
perms = Permission.objects.filter(
|
||||
codename__in=["add_reservationslot", "view_reservationslot"]
|
||||
)
|
||||
return baker.make(User, user_permissions=list(perms))
|
||||
|
||||
def test_ok(self, client: Client, user: User):
|
||||
client.force_login(user)
|
||||
start = now() + timedelta(hours=2)
|
||||
end = start + timedelta(hours=1)
|
||||
room = baker.make(Room)
|
||||
response = client.post(
|
||||
reverse("reservation:make_reservation"),
|
||||
{"room": room.id, "start_at": start, "end_at": end},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert response.headers.get("HX-Redirect", "") == reverse("reservation:main")
|
||||
slot = ReservationSlot.objects.filter(room=room).last()
|
||||
assert slot is not None
|
||||
assert slot.start_at == start
|
||||
assert slot.end_at == end
|
||||
assert slot.author == user
|
||||
|
||||
def test_permissions_denied(self, client: Client):
|
||||
client.force_login(baker.make(User))
|
||||
start = now() + timedelta(hours=2)
|
||||
end = start + timedelta(hours=1)
|
||||
response = client.post(
|
||||
reverse("reservation:make_reservation"),
|
||||
{"room": baker.make(Room), "start_at": start, "end_at": end},
|
||||
)
|
||||
assert response.status_code == 403
|
||||
@@ -1,19 +0,0 @@
|
||||
from django.urls import path
|
||||
|
||||
from reservation.views import (
|
||||
ReservationFragment,
|
||||
ReservationScheduleView,
|
||||
RoomCreateView,
|
||||
RoomDeleteView,
|
||||
RoomUpdateView,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
path("", ReservationScheduleView.as_view(), name="main"),
|
||||
path("room/create/", RoomCreateView.as_view(), name="room_create"),
|
||||
path("room/<int:room_id>/edit", RoomUpdateView.as_view(), name="room_edit"),
|
||||
path("room/<int:room_id>/delete", RoomDeleteView.as_view(), name="room_delete"),
|
||||
path(
|
||||
"fragment/reservation", ReservationFragment.as_view(), name="make_reservation"
|
||||
),
|
||||
]
|
||||
@@ -1,72 +0,0 @@
|
||||
# Create your views here.
|
||||
|
||||
from django.contrib.auth.mixins import PermissionRequiredMixin
|
||||
from django.contrib.messages.views import SuccessMessageMixin
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.views.generic import CreateView, DeleteView, TemplateView, UpdateView
|
||||
|
||||
from club.models import Club
|
||||
from core.auth.mixins import CanEditMixin
|
||||
from core.views import UseFragmentsMixin
|
||||
from core.views.mixins import FragmentMixin
|
||||
from reservation.forms import ReservationForm, RoomCreateForm, RoomUpdateForm
|
||||
from reservation.models import ReservationSlot, Room
|
||||
|
||||
|
||||
class ReservationFragment(PermissionRequiredMixin, FragmentMixin, CreateView):
|
||||
model = ReservationSlot
|
||||
form_class = ReservationForm
|
||||
permission_required = "reservation.add_reservationslot"
|
||||
template_name = "reservation/fragments/create_reservation.jinja"
|
||||
success_url = reverse_lazy("reservation:main")
|
||||
reload_on_redirect = True
|
||||
object = None
|
||||
|
||||
def get_form_kwargs(self):
|
||||
return super().get_form_kwargs() | {"author": self.request.user}
|
||||
|
||||
|
||||
class ReservationScheduleView(PermissionRequiredMixin, UseFragmentsMixin, TemplateView):
|
||||
template_name = "reservation/schedule.jinja"
|
||||
permission_required = "reservation.view_reservationslot"
|
||||
fragments = {"add_slot_fragment": ReservationFragment}
|
||||
|
||||
|
||||
class RoomCreateView(PermissionRequiredMixin, CreateView):
|
||||
form_class = RoomCreateForm
|
||||
template_name = "core/create.jinja"
|
||||
permission_required = "reservation.add_room"
|
||||
|
||||
def get_initial(self):
|
||||
init = super().get_initial()
|
||||
if "club" in self.request.GET:
|
||||
club_id = self.request.GET["club"]
|
||||
if club_id.isdigit() and int(club_id) > 0:
|
||||
init["club"] = Club.objects.filter(id=int(club_id)).first()
|
||||
return init
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse("club:tools", kwargs={"club_id": self.object.club_id})
|
||||
|
||||
|
||||
class RoomUpdateView(SuccessMessageMixin, CanEditMixin, UpdateView):
|
||||
model = Room
|
||||
pk_url_kwarg = "room_id"
|
||||
form_class = RoomUpdateForm
|
||||
template_name = "core/edit.jinja"
|
||||
success_message = _("%(name)s was updated successfully")
|
||||
|
||||
def get_form_kwargs(self):
|
||||
return super().get_form_kwargs() | {"request_user": self.request.user}
|
||||
|
||||
def get_success_url(self):
|
||||
return self.request.path
|
||||
|
||||
|
||||
class RoomDeleteView(PermissionRequiredMixin, DeleteView):
|
||||
model = Room
|
||||
pk_url_kwarg = "room_id"
|
||||
template_name = "core/delete_confirm.jinja"
|
||||
success_url = reverse_lazy("reservation:room_list")
|
||||
permission_required = "reservation.delete_room"
|
||||
@@ -123,10 +123,8 @@ INSTALLED_APPS = (
|
||||
"trombi",
|
||||
"matmat",
|
||||
"pedagogy",
|
||||
"reservation",
|
||||
"galaxy",
|
||||
"antispam",
|
||||
"timetable",
|
||||
"api",
|
||||
)
|
||||
|
||||
@@ -276,7 +274,7 @@ LOGGING = {
|
||||
# Internationalization
|
||||
# https://docs.djangoproject.com/en/1.8/topics/i18n/
|
||||
|
||||
LANGUAGE_CODE = "fr"
|
||||
LANGUAGE_CODE = "fr-FR"
|
||||
|
||||
LANGUAGES = [("en", _("English")), ("fr", _("French"))]
|
||||
|
||||
@@ -543,7 +541,7 @@ SITH_SUBSCRIPTIONS = {
|
||||
"duration": 4,
|
||||
},
|
||||
"cursus-branche": {"name": _("Branch cursus"), "price": 60, "duration": 6},
|
||||
"cursus-alternant": {"name": _("Alternating cursus"), "price": 30, "duration": 6},
|
||||
"cursus-alternant": {"name": _("Alternating cursus"), "price": 35, "duration": 6},
|
||||
"membre-honoraire": {"name": _("Honorary member"), "price": 0, "duration": 666},
|
||||
"assidu": {"name": _("Assidu member"), "price": 0, "duration": 2},
|
||||
"amicale/doceo": {"name": _("Amicale/DOCEO member"), "price": 0, "duration": 2},
|
||||
@@ -555,8 +553,6 @@ SITH_SUBSCRIPTIONS = {
|
||||
"price": 0,
|
||||
"duration": 1,
|
||||
},
|
||||
"un-mois-essai": {"name": _("One month for free"), "price": 0, "duration": 0.166},
|
||||
"deux-mois-essai": {"name": _("Two months for free"), "price": 0, "duration": 0.33},
|
||||
"benevoles-euroks": {"name": _("Eurok's volunteer"), "price": 5, "duration": 0.1},
|
||||
"six-semaines-essai": {
|
||||
"name": _("Six weeks for free"),
|
||||
|
||||
@@ -49,15 +49,10 @@ urlpatterns = [
|
||||
path("trombi/", include(("trombi.urls", "trombi"), namespace="trombi")),
|
||||
path("matmatronch/", include(("matmat.urls", "matmat"), namespace="matmat")),
|
||||
path("pedagogy/", include(("pedagogy.urls", "pedagogy"), namespace="pedagogy")),
|
||||
path(
|
||||
"reservation/",
|
||||
include(("reservation.urls", "reservation"), namespace="reservation"),
|
||||
),
|
||||
path("admin/", admin.site.urls),
|
||||
path("i18n/", include("django.conf.urls.i18n")),
|
||||
path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"),
|
||||
path("captcha/", include("captcha.urls")),
|
||||
path("edt/", include(("timetable.urls", "timetable"), namespace="timetable")),
|
||||
]
|
||||
|
||||
if settings.DEBUG:
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
# Generated by Django 5.2.3 on 2025-10-06 11:24
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
import subscription.models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("subscription", "0015_alter_subscription_location_and_more")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="subscription",
|
||||
name="subscription_type",
|
||||
field=models.CharField(
|
||||
choices=subscription.models.get_subscription_types,
|
||||
max_length=255,
|
||||
verbose_name="subscription type",
|
||||
),
|
||||
)
|
||||
]
|
||||
@@ -38,16 +38,19 @@ def validate_payment(value):
|
||||
raise ValidationError(_("Bad payment method"))
|
||||
|
||||
|
||||
def get_subscription_types():
|
||||
return (
|
||||
(k, f"{v['name']}, {v['price']}€")
|
||||
for k, v in sorted(settings.SITH_SUBSCRIPTIONS.items())
|
||||
)
|
||||
|
||||
|
||||
class Subscription(models.Model):
|
||||
member = models.ForeignKey(
|
||||
User, related_name="subscriptions", on_delete=models.CASCADE
|
||||
)
|
||||
subscription_type = models.CharField(
|
||||
_("subscription type"),
|
||||
max_length=255,
|
||||
choices=(
|
||||
(k, v["name"]) for k, v in sorted(settings.SITH_SUBSCRIPTIONS.items())
|
||||
),
|
||||
_("subscription type"), max_length=255, choices=get_subscription_types
|
||||
)
|
||||
subscription_start = models.DateField(_("subscription start"))
|
||||
subscription_end = models.DateField(_("subscription end"))
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
# Register your models here.
|
||||
@@ -1,6 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class TimetableConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "timetable"
|
||||
@@ -1 +0,0 @@
|
||||
# Create your models here.
|
||||
@@ -1,184 +0,0 @@
|
||||
import html2canvas from "html2canvas";
|
||||
|
||||
// see https://regex101.com/r/QHSaPM/2
|
||||
const TIMETABLE_ROW_RE: RegExp =
|
||||
/^(?<ueCode>\w.+\w)\s+(?<courseType>[A-Z]{2}\d)\s+((?<weekGroup>[AB])\s+)?(?<weekday>(lundi)|(mardi)|(mercredi)|(jeudi)|(vendredi)|(samedi)|(dimanche))\s+(?<startHour>\d{2}:\d{2})\s+(?<endHour>\d{2}:\d{2})\s+[\dA-B]\s+((?<attendance>[\wé]*)\s+)?(?<room>\w+(?:, \w+)?)$/;
|
||||
|
||||
const DEFAULT_TIMETABLE: string = `DS52\t\tCM1\t\tlundi\t08:00\t10:00\t1\tPrésentiel\tA113
|
||||
DS53\t\tCM1\t\tlundi\t10:15\t12:15\t1\tPrésentiel\tA101
|
||||
DS53\t\tTP1\t\tlundi\t13:00\t16:00\t1\tPrésentiel\tH010
|
||||
SO03\t\tCM1\t\tlundi\t16:15\t17:45\t1\tPrésentiel\tA103
|
||||
SO03\t\tTD1\t\tlundi\t17:45\t19:45\t1\tPrésentiel\tA103
|
||||
DS50\t\tTP1\t\tmardi\t08:00\t10:00\t1\tPrésentiel\tA216
|
||||
DS51\t\tCM1\t\tmardi\t10:15\t12:15\t1\tPrésentiel\tA216
|
||||
DS51\t\tTP1\t\tmardi\t14:00\t18:00\t1\tPrésentiel\tH010
|
||||
DS52\t\tTP2\tA\tjeudi\t08:00\t10:00\tA\tPrésentiel\tA110a, A110b
|
||||
DS52\t\tTD1\t\tjeudi\t10:15\t12:15\t1\tPrésentiel\tA110a, A110b
|
||||
LC02\t\tTP1\t\tjeudi\t15:00\t16:00\t1\tPrésentiel\tA209
|
||||
LC02\t\tTD1\t\tjeudi\t16:15\t18:15\t1\tPrésentiel\tA206`;
|
||||
|
||||
type WeekDay =
|
||||
| "lundi"
|
||||
| "mardi"
|
||||
| "mercredi"
|
||||
| "jeudi"
|
||||
| "vendredi"
|
||||
| "samedi"
|
||||
| "dimanche";
|
||||
|
||||
const WEEKDAYS = [
|
||||
"lundi",
|
||||
"mardi",
|
||||
"mercredi",
|
||||
"jeudi",
|
||||
"vendredi",
|
||||
"samedi",
|
||||
"dimanche",
|
||||
] as const;
|
||||
|
||||
const SLOT_HEIGHT = 20 as const; // Each 15min has a height of 20px in the timetable
|
||||
const SLOT_WIDTH = 250 as const; // Each weekday ha a width of 400px in the timetable
|
||||
const MINUTES_PER_SLOT = 15 as const;
|
||||
|
||||
interface TimetableSlot {
|
||||
courseType: string;
|
||||
room: string;
|
||||
startHour: string;
|
||||
endHour: string;
|
||||
startSlot: number;
|
||||
endSlot: number;
|
||||
ueCode: string;
|
||||
weekGroup?: string;
|
||||
weekday: WeekDay;
|
||||
}
|
||||
|
||||
function parseSlots(s: string): TimetableSlot[] {
|
||||
return s
|
||||
.split("\n")
|
||||
.filter((s: string) => s.length > 0)
|
||||
.map((row: string) => {
|
||||
const parsed = TIMETABLE_ROW_RE.exec(row);
|
||||
if (!parsed) {
|
||||
throw new Error(`Couldn't parse row ${row}`);
|
||||
}
|
||||
const [startHour, startMin] = parsed.groups.startHour
|
||||
.split(":")
|
||||
.map((i) => Number.parseInt(i));
|
||||
const [endHour, endMin] = parsed.groups.endHour
|
||||
.split(":")
|
||||
.map((i) => Number.parseInt(i));
|
||||
return {
|
||||
...parsed.groups,
|
||||
startSlot: Math.floor((startHour * 60 + startMin) / MINUTES_PER_SLOT),
|
||||
endSlot: Math.floor((endHour * 60 + endMin) / MINUTES_PER_SLOT),
|
||||
} as unknown as TimetableSlot;
|
||||
});
|
||||
}
|
||||
|
||||
document.addEventListener("alpine:init", () => {
|
||||
Alpine.data("timetableGenerator", () => ({
|
||||
content: DEFAULT_TIMETABLE,
|
||||
error: "",
|
||||
displayedWeekdays: [] as WeekDay[],
|
||||
courses: [] as TimetableSlot[],
|
||||
startSlot: 0,
|
||||
endSlot: 0,
|
||||
table: {
|
||||
height: 0,
|
||||
width: 0,
|
||||
},
|
||||
|
||||
colors: {} as Record<string, string>,
|
||||
colorPalette: [
|
||||
"#27ae60",
|
||||
"#2980b9",
|
||||
"#c0392b",
|
||||
"#7f8c8d",
|
||||
"#f1c40f",
|
||||
"#1abc9c",
|
||||
"#95a5a6",
|
||||
"#26C6DA",
|
||||
"#c2185b",
|
||||
"#e64a19",
|
||||
"#1b5e20",
|
||||
],
|
||||
|
||||
generate() {
|
||||
try {
|
||||
this.courses = parseSlots(this.content);
|
||||
} catch {
|
||||
this.error = gettext(
|
||||
"Wrong timetable format. Make sure you copied if from your student folder.",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
// color each UE
|
||||
let colorIndex = 0;
|
||||
for (const slot of this.courses) {
|
||||
if (!this.colors[slot.ueCode]) {
|
||||
this.colors[slot.ueCode] =
|
||||
this.colorPalette[colorIndex % this.colorPalette.length];
|
||||
colorIndex++;
|
||||
}
|
||||
}
|
||||
|
||||
this.displayedWeekdays = WEEKDAYS.filter((day) =>
|
||||
this.courses.some((slot: TimetableSlot) => slot.weekday === day),
|
||||
);
|
||||
this.startSlot = this.courses.reduce(
|
||||
(acc: number, curr: TimetableSlot) => Math.min(acc, curr.startSlot),
|
||||
25 * 4,
|
||||
);
|
||||
this.endSlot = this.courses.reduce(
|
||||
(acc: number, curr: TimetableSlot) => Math.max(acc, curr.endSlot),
|
||||
1,
|
||||
);
|
||||
this.table.height = SLOT_HEIGHT * (this.endSlot - this.startSlot);
|
||||
this.table.width = SLOT_WIDTH * this.displayedWeekdays.length;
|
||||
},
|
||||
|
||||
getStyle(slot: TimetableSlot) {
|
||||
const hasWeekGroup = slot.weekGroup !== undefined;
|
||||
const width = hasWeekGroup ? SLOT_WIDTH / 2 : SLOT_WIDTH;
|
||||
const leftOffset = slot.weekGroup === "B" ? SLOT_WIDTH / 2 : 0;
|
||||
return {
|
||||
height: `${(slot.endSlot - slot.startSlot) * SLOT_HEIGHT}px`,
|
||||
width: `${width}px`,
|
||||
top: `${(slot.startSlot - this.startSlot) * SLOT_HEIGHT}px`,
|
||||
left: `${this.displayedWeekdays.indexOf(slot.weekday) * SLOT_WIDTH + leftOffset}px`,
|
||||
backgroundColor: this.colors[slot.ueCode],
|
||||
};
|
||||
},
|
||||
|
||||
getHours(): [string, object][] {
|
||||
let hour: number = Number.parseInt(
|
||||
this.courses
|
||||
.map((c: TimetableSlot) => c.startHour)
|
||||
.reduce((res: string, hour: string) => (hour < res ? hour : res), "24:00")
|
||||
.split(":")[0],
|
||||
);
|
||||
const res: [string, object][] = [];
|
||||
for (let i = 0; i <= this.endSlot - this.startSlot; i += 60 / MINUTES_PER_SLOT) {
|
||||
res.push([`${hour}:00`, { top: `${i * SLOT_HEIGHT}px` }]);
|
||||
hour += 1;
|
||||
}
|
||||
return res;
|
||||
},
|
||||
|
||||
getWidth() {
|
||||
return this.displayedWeekdays.length * SLOT_WIDTH + 20;
|
||||
},
|
||||
|
||||
async savePng() {
|
||||
const elem = document.getElementById("timetable");
|
||||
const img = (await html2canvas(elem)).toDataURL();
|
||||
const downloadLink = document.createElement("a");
|
||||
downloadLink.href = img;
|
||||
downloadLink.download = "edt.png";
|
||||
document.body.appendChild(downloadLink);
|
||||
downloadLink.click();
|
||||
downloadLink.remove();
|
||||
},
|
||||
}));
|
||||
});
|
||||
@@ -1,67 +0,0 @@
|
||||
@import "core/static/core/colors";
|
||||
|
||||
#timetable {
|
||||
--hour-side-width: 60px;
|
||||
|
||||
display: block;
|
||||
margin: 2em auto;
|
||||
.header {
|
||||
background-color: $white-color;
|
||||
font-weight: bold;
|
||||
box-shadow: none;
|
||||
width: calc(100% - var(--hour-side-width) - 10px);
|
||||
margin-left: var(--hour-side-width);
|
||||
padding-left: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 0;
|
||||
span {
|
||||
flex: 1;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
.content {
|
||||
position: relative;
|
||||
}
|
||||
.hours {
|
||||
position: absolute;
|
||||
width: 40px;
|
||||
left: 0;
|
||||
top: -.5em;
|
||||
|
||||
.hour {
|
||||
position: absolute;
|
||||
|
||||
.hour-bar {
|
||||
content: "";
|
||||
position: absolute;
|
||||
height: 1px;
|
||||
background: lightgray;
|
||||
top: 50%;
|
||||
left: 100%;
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.courses {
|
||||
position: absolute;
|
||||
text-align: center;
|
||||
top: 0;
|
||||
left: var(--hour-side-width);
|
||||
|
||||
.slot {
|
||||
background-color: cadetblue;
|
||||
position: absolute;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
.course-type {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
padding: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
{% extends 'core/base.jinja' %}
|
||||
|
||||
{%- block additional_css -%}
|
||||
<link rel="stylesheet" href="{{ static('timetable/css/generator.scss') }}">
|
||||
{%- endblock -%}
|
||||
|
||||
{%- block additional_js -%}
|
||||
<script type="module" src="{{ static('bundled/timetable/generator-index.ts') }}"></script>
|
||||
{%- endblock -%}
|
||||
|
||||
{% block title %}
|
||||
{% trans %}Timetable generator{% endtrans %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div x-data="timetableGenerator">
|
||||
<form @submit.prevent="generate()">
|
||||
<h1>Générateur d'emploi du temps</h1>
|
||||
<div class="alert alert-red" x-show="!!error" x-cloak>
|
||||
<span class="alert-main" x-text="error"></span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="timetable-input">Colle ton emploi du temps (sans l'entête)</label>
|
||||
<textarea id="timetable-input" cols="30" rows="15" x-model="content"></textarea>
|
||||
</div>
|
||||
<input type="submit" class="btn btn-blue" value="{% trans %}Generate{% endtrans %}">
|
||||
</form>
|
||||
<div
|
||||
id="timetable"
|
||||
x-show="table.height > 0 && table.width > 0"
|
||||
:style="{width: `${table.width+80}px`, height: `${table.height+40}px`}"
|
||||
>
|
||||
<div class="header">
|
||||
<template x-for="weekday in displayedWeekdays">
|
||||
<span x-text="weekday"></span>
|
||||
</template>
|
||||
</div>
|
||||
<div class="content">
|
||||
<div class="hours" :height="(endSlot - endSlot%4) - (startSlot - startSlot%4)">
|
||||
<template x-for="[hour, style] in getHours()">
|
||||
<div class="hour" :style="style">
|
||||
<div x-text="hour"></div>
|
||||
<div class="hour-bar" :style="{width: `${getWidth()}px`}"></div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div class="courses">
|
||||
<template x-for="course in courses">
|
||||
<div class="slot" :style="getStyle(course)">
|
||||
<span class="course-type" x-text="course.courseType"></span>
|
||||
<span x-text="course.ueCode"></span>
|
||||
<span x-text="`${course.startHour} - ${course.endHour}`"></span>
|
||||
<span x-text="(course.weekGroup ? `\nGroupe ${course.weekGroup}` : '')"></span>
|
||||
<span x-text="course.room"></span>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
class="margin-bottom btn btn-blue"
|
||||
@click="savePng"
|
||||
x-show="table.height > 0 && table.width > 0"
|
||||
>
|
||||
{% trans %}Save to PNG{% endtrans %}
|
||||
</button>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
@@ -1 +0,0 @@
|
||||
# Create your tests here.
|
||||
@@ -1,5 +0,0 @@
|
||||
from django.urls import path
|
||||
|
||||
from timetable.views import GeneratorView
|
||||
|
||||
urlpatterns = [path("", GeneratorView.as_view(), name="generator")]
|
||||
@@ -1,8 +0,0 @@
|
||||
# Create your views here.
|
||||
from django.views.generic import TemplateView
|
||||
|
||||
from core.auth.mixins import FormerSubscriberMixin
|
||||
|
||||
|
||||
class GeneratorView(FormerSubscriberMixin, TemplateView):
|
||||
template_name = "timetable/generator.jinja"
|
||||
@@ -18,8 +18,7 @@
|
||||
"#core:*": ["./core/static/bundled/*"],
|
||||
"#pedagogy:*": ["./pedagogy/static/bundled/*"],
|
||||
"#counter:*": ["./counter/static/bundled/*"],
|
||||
"#com:*": ["./com/static/bundled/*"],
|
||||
"#reservation:*": ["./reservation/static/bundled/*"]
|
||||
"#com:*": ["./com/static/bundled/*"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user