mirror of
https://github.com/ae-utbm/sith.git
synced 2025-10-14 08:48:30 +00:00
Compare commits
7 Commits
room-reser
...
auto-archi
| Author | SHA1 | Date | |
|---|---|---|---|
|
dac52db434 | ||
|
|
f398c9901c | ||
|
|
5b91fe2145 | ||
|
|
abd905c24d | ||
|
|
42b53a39f3 | ||
|
|
5306001f6f | ||
|
|
83a4ac2a7e |
@@ -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>
|
||||
|
||||
@@ -31,11 +31,7 @@ from django.contrib.messages.views import SuccessMessageMixin
|
||||
from django.core.exceptions import NON_FIELD_ERRORS, PermissionDenied, ValidationError
|
||||
from django.core.paginator import InvalidPage, Paginator
|
||||
from django.db.models import Q, Sum
|
||||
from django.http import (
|
||||
Http404,
|
||||
HttpResponseRedirect,
|
||||
StreamingHttpResponse,
|
||||
)
|
||||
from django.http import Http404, HttpResponseRedirect, StreamingHttpResponse
|
||||
from django.shortcuts import get_object_or_404, redirect
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.utils import timezone
|
||||
@@ -55,12 +51,7 @@ from club.forms import (
|
||||
MailingForm,
|
||||
SellingsForm,
|
||||
)
|
||||
from club.models import (
|
||||
Club,
|
||||
Mailing,
|
||||
MailingSubscription,
|
||||
Membership,
|
||||
)
|
||||
from club.models import Club, Mailing, MailingSubscription, Membership
|
||||
from com.models import Poster
|
||||
from com.views import (
|
||||
PosterCreateBaseView,
|
||||
@@ -68,9 +59,7 @@ from com.views import (
|
||||
PosterEditBaseView,
|
||||
PosterListBaseView,
|
||||
)
|
||||
from core.auth.mixins import (
|
||||
CanEditMixin,
|
||||
)
|
||||
from core.auth.mixins import CanEditMixin
|
||||
from core.models import PageRev
|
||||
from core.views import DetailFormView, PageEditViewBase, UseFragmentsMixin
|
||||
from core.views.mixins import FragmentMixin, FragmentRenderer, TabedViewMixin
|
||||
@@ -262,12 +251,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,6 +81,7 @@
|
||||
}
|
||||
|
||||
#links_content {
|
||||
overflow: auto;
|
||||
box-shadow: $shadow-color 1px 1px 1px;
|
||||
min-height: 20em;
|
||||
padding-bottom: 1em;
|
||||
|
||||
@@ -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") }}">
|
||||
@@ -215,12 +213,6 @@
|
||||
<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(
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -154,10 +154,8 @@ form {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.row {
|
||||
label {
|
||||
margin: unset;
|
||||
}
|
||||
.row > label {
|
||||
margin: unset;
|
||||
}
|
||||
|
||||
// ------------- LABEL
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
135
counter/forms.py
135
counter/forms.py
@@ -1,13 +1,23 @@
|
||||
import json
|
||||
import math
|
||||
import uuid
|
||||
|
||||
from django import forms
|
||||
from django.db.models import Q
|
||||
from django.forms import BaseModelFormSet
|
||||
from django.utils.timezone import now
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django_celery_beat.models import ClockedSchedule
|
||||
from phonenumber_field.widgets import RegionalPhoneNumberWidget
|
||||
|
||||
from club.widgets.ajax_select import AutoCompleteSelectClub
|
||||
from core.models import User
|
||||
from core.views.forms import NFCTextInput, SelectDate, SelectDateTime
|
||||
from core.views.forms import (
|
||||
FutureDateTimeField,
|
||||
NFCTextInput,
|
||||
SelectDate,
|
||||
SelectDateTime,
|
||||
)
|
||||
from core.views.widgets.ajax_select import (
|
||||
AutoCompleteSelect,
|
||||
AutoCompleteSelectMultipleGroup,
|
||||
@@ -22,7 +32,9 @@ from counter.models import (
|
||||
Product,
|
||||
Refilling,
|
||||
ReturnableProduct,
|
||||
ScheduledProductAction,
|
||||
StudentCard,
|
||||
get_product_actions,
|
||||
)
|
||||
from counter.widgets.ajax_select import (
|
||||
AutoCompleteSelectMultipleCounter,
|
||||
@@ -158,7 +170,101 @@ class CounterEditForm(forms.ModelForm):
|
||||
}
|
||||
|
||||
|
||||
class ProductEditForm(forms.ModelForm):
|
||||
class ScheduledProductActionForm(forms.ModelForm):
|
||||
"""Form for automatic product archiving.
|
||||
|
||||
The `save` method will update or create tasks using celery-beat.
|
||||
"""
|
||||
|
||||
required_css_class = "required"
|
||||
prefix = "scheduled"
|
||||
|
||||
class Meta:
|
||||
model = ScheduledProductAction
|
||||
fields = ["task"]
|
||||
widgets = {"task": forms.RadioSelect(choices=get_product_actions)}
|
||||
labels = {"task": _("Action")}
|
||||
help_texts = {"task": ""}
|
||||
|
||||
trigger_at = FutureDateTimeField(
|
||||
label=_("Date and time of action"), widget=SelectDateTime
|
||||
)
|
||||
counters = forms.ModelMultipleChoiceField(
|
||||
label=_("New counters"),
|
||||
help_text=_("The selected counters will replace the current ones"),
|
||||
required=False,
|
||||
widget=AutoCompleteSelectMultipleCounter,
|
||||
queryset=Counter.objects.all(),
|
||||
)
|
||||
|
||||
def __init__(self, *args, product: Product, **kwargs):
|
||||
self.product = product
|
||||
super().__init__(*args, **kwargs)
|
||||
if not self.instance._state.adding:
|
||||
self.fields["trigger_at"].initial = self.instance.clocked.clocked_time
|
||||
self.fields["counters"].initial = json.loads(self.instance.kwargs).get(
|
||||
"counters"
|
||||
)
|
||||
|
||||
def clean(self):
|
||||
if not self.changed_data or "trigger_at" in self.errors:
|
||||
return super().clean()
|
||||
if "trigger_at" in self.changed_data:
|
||||
if not self.instance.clocked_id:
|
||||
self.instance.clocked = ClockedSchedule(
|
||||
clocked_time=self.cleaned_data["trigger_at"]
|
||||
)
|
||||
else:
|
||||
self.instance.clocked.clocked_time = self.cleaned_data["trigger_at"]
|
||||
self.instance.clocked.save()
|
||||
task_kwargs = {"product_id": self.product.id}
|
||||
if (
|
||||
self.cleaned_data["task"] == "counter.tasks.change_counters"
|
||||
and "counters" in self.changed_data
|
||||
):
|
||||
task_kwargs["counters"] = [c.id for c in self.cleaned_data["counters"]]
|
||||
self.instance.product = self.product
|
||||
self.instance.kwargs = json.dumps(task_kwargs)
|
||||
self.instance.name = (
|
||||
f"{self.cleaned_data['task']} - {self.product} - {uuid.uuid4()}"
|
||||
)
|
||||
return super().clean()
|
||||
|
||||
|
||||
class BaseScheduledProductActionFormSet(BaseModelFormSet):
|
||||
def __init__(self, *args, product: Product, **kwargs):
|
||||
if product.id:
|
||||
queryset = (
|
||||
product.scheduled_actions.filter(
|
||||
enabled=True, clocked__clocked_time__gt=now()
|
||||
)
|
||||
.order_by("clocked__clocked_time")
|
||||
.select_related("clocked")
|
||||
)
|
||||
else:
|
||||
queryset = ScheduledProductAction.objects.none()
|
||||
form_kwargs = {"product": product}
|
||||
super().__init__(*args, queryset=queryset, form_kwargs=form_kwargs, **kwargs)
|
||||
|
||||
def delete_existing(self, obj: ScheduledProductAction, commit: bool = True): # noqa FBT001
|
||||
clocked = obj.clocked
|
||||
super().delete_existing(obj, commit=commit)
|
||||
if commit:
|
||||
clocked.delete()
|
||||
|
||||
|
||||
ScheduledProductActionFormSet = forms.modelformset_factory(
|
||||
ScheduledProductAction,
|
||||
ScheduledProductActionForm,
|
||||
formset=BaseScheduledProductActionFormSet,
|
||||
absolute_max=None,
|
||||
can_delete=True,
|
||||
can_delete_extra=False,
|
||||
extra=2,
|
||||
)
|
||||
|
||||
|
||||
class ProductForm(forms.ModelForm):
|
||||
error_css_class = "error"
|
||||
required_css_class = "required"
|
||||
|
||||
@@ -199,22 +305,21 @@ class ProductEditForm(forms.ModelForm):
|
||||
queryset=Counter.objects.all(),
|
||||
)
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
def __init__(self, *args, instance=None, **kwargs):
|
||||
super().__init__(*args, instance=instance, **kwargs)
|
||||
if self.instance.id:
|
||||
self.fields["counters"].initial = self.instance.counters.all()
|
||||
self.action_formset = ScheduledProductActionFormSet(
|
||||
*args, product=self.instance, **kwargs
|
||||
)
|
||||
|
||||
def is_valid(self):
|
||||
return super().is_valid() and self.action_formset.is_valid()
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
ret = super().save(*args, **kwargs)
|
||||
if self.fields["counters"].initial:
|
||||
# Remove the product from all counter it was added to
|
||||
# It will then only be added to selected counters
|
||||
for counter in self.fields["counters"].initial:
|
||||
counter.products.remove(self.instance)
|
||||
counter.save()
|
||||
for counter in self.cleaned_data["counters"]:
|
||||
counter.products.add(self.instance)
|
||||
counter.save()
|
||||
self.instance.counters.set(self.cleaned_data["counters"])
|
||||
self.action_formset.save()
|
||||
return ret
|
||||
|
||||
|
||||
@@ -266,7 +371,7 @@ class CloseCustomerAccountForm(forms.Form):
|
||||
)
|
||||
|
||||
|
||||
class ProductForm(forms.Form):
|
||||
class BasketProductForm(forms.Form):
|
||||
quantity = forms.IntegerField(min_value=1, required=True)
|
||||
id = forms.IntegerField(min_value=0, required=True)
|
||||
|
||||
@@ -371,5 +476,5 @@ class BaseBasketForm(forms.BaseFormSet):
|
||||
|
||||
|
||||
BasketForm = forms.formset_factory(
|
||||
ProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
|
||||
BasketProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
|
||||
)
|
||||
|
||||
40
counter/migrations/0032_scheduledproductaction.py
Normal file
40
counter/migrations/0032_scheduledproductaction.py
Normal file
@@ -0,0 +1,40 @@
|
||||
# Generated by Django 5.2.3 on 2025-09-14 11:29
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("counter", "0031_alter_counter_options"),
|
||||
("django_celery_beat", "0019_alter_periodictasks_options"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="ScheduledProductAction",
|
||||
fields=[
|
||||
(
|
||||
"periodictask_ptr",
|
||||
models.OneToOneField(
|
||||
auto_created=True,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
parent_link=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
to="django_celery_beat.periodictask",
|
||||
),
|
||||
),
|
||||
(
|
||||
"product",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="scheduled_actions",
|
||||
to="counter.product",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={"verbose_name": "Product scheduled action"},
|
||||
bases=("django_celery_beat.periodictask",),
|
||||
),
|
||||
]
|
||||
@@ -34,6 +34,7 @@ from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from django.utils.functional import cached_property
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django_celery_beat.models import PeriodicTask
|
||||
from django_countries.fields import CountryField
|
||||
from ordered_model.models import OrderedModel
|
||||
from phonenumber_field.modelfields import PhoneNumberField
|
||||
@@ -445,7 +446,8 @@ class Product(models.Model):
|
||||
buying_groups = list(self.buying_groups.all())
|
||||
if not buying_groups:
|
||||
return True
|
||||
return any(user.is_in_group(pk=group.id) for group in buying_groups)
|
||||
res = any(user.is_in_group(pk=group.id) for group in buying_groups)
|
||||
return res
|
||||
|
||||
@property
|
||||
def profit(self):
|
||||
@@ -479,7 +481,7 @@ class CounterQuerySet(models.QuerySet):
|
||||
return self.annotate(has_annotated_barman=Exists(subquery))
|
||||
|
||||
def annotate_is_open(self) -> Self:
|
||||
"""Annotate tue queryset with the `is_open` field.
|
||||
"""Annotate the queryset with the `is_open` field.
|
||||
|
||||
For each counter, if `is_open=True`, then the counter is currently opened.
|
||||
Else the counter is closed.
|
||||
@@ -1357,3 +1359,39 @@ class ReturnableProductBalance(models.Model):
|
||||
f"return balance of {self.customer} "
|
||||
f"for {self.returnable.product_id} : {self.balance}"
|
||||
)
|
||||
|
||||
|
||||
def get_product_actions():
|
||||
return [
|
||||
("counter.tasks.archive_product", _("Archiving")),
|
||||
("counter.tasks.change_counters", _("Counters change")),
|
||||
]
|
||||
|
||||
|
||||
class ScheduledProductAction(PeriodicTask):
|
||||
"""Extension of celery-beat tasks dedicated to perform actions on Product."""
|
||||
|
||||
product = models.ForeignKey(
|
||||
Product, related_name="scheduled_actions", on_delete=models.CASCADE
|
||||
)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Product scheduled action")
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
self._meta.get_field("task").choices = get_product_actions()
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def full_clean(self, *args, **kwargs):
|
||||
self.one_off = True # A product action should occur one time only
|
||||
return super().full_clean(*args, **kwargs)
|
||||
|
||||
def clean_clocked(self):
|
||||
if not self.clocked:
|
||||
raise ValidationError(_("Product actions must declare a clocked schedule."))
|
||||
|
||||
def validate_unique(self, *args, **kwargs):
|
||||
# The checks done in PeriodicTask.validate_unique aren't
|
||||
# adapted in the case of scheduled product action,
|
||||
# so we skip it and execute directly Model.validate_unique
|
||||
return super(PeriodicTask, self).validate_unique(*args, **kwargs)
|
||||
|
||||
19
counter/tasks.py
Normal file
19
counter/tasks.py
Normal file
@@ -0,0 +1,19 @@
|
||||
# Create your tasks here
|
||||
|
||||
from celery import shared_task
|
||||
|
||||
from counter.models import Counter, Product
|
||||
|
||||
|
||||
@shared_task
|
||||
def archive_product(*, product_id: int, **kwargs):
|
||||
product = Product.objects.get(id=product_id)
|
||||
product.archived = True
|
||||
product.save()
|
||||
|
||||
|
||||
@shared_task
|
||||
def change_counters(*, product_id: int, counters: list[int], **kwargs):
|
||||
product = Product.objects.get(id=product_id)
|
||||
counters = Counter.objects.filter(id__in=counters)
|
||||
product.counters.set(counters)
|
||||
56
counter/templates/counter/product_form.jinja
Normal file
56
counter/templates/counter/product_form.jinja
Normal file
@@ -0,0 +1,56 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
|
||||
{% block content %}
|
||||
{% if object %}
|
||||
<h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
|
||||
{% else %}
|
||||
<h2>{% trans %}Product creation{% endtrans %}</h2>
|
||||
{% endif %}
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p() }}
|
||||
|
||||
<br />
|
||||
|
||||
<h3>{% trans %}Automatic actions{% endtrans %}</h3>
|
||||
|
||||
<p class="margin-bottom">
|
||||
<em>
|
||||
{%- trans trimmed -%}
|
||||
Automatic actions allows to schedule product changes
|
||||
ahead of time.
|
||||
{%- endtrans -%}
|
||||
</em>
|
||||
</p>
|
||||
|
||||
{{ form.action_formset.management_form }}
|
||||
{%- for action_form in form.action_formset.forms -%}
|
||||
<fieldset x-data="{action: '{{ action_form.task.initial }}'}">
|
||||
{{ action_form.non_field_errors() }}
|
||||
<div class="row gap-2x margin-bottom">
|
||||
<div>
|
||||
{{ action_form.task.errors }}
|
||||
{{ action_form.task.label_tag() }}
|
||||
{{ action_form.task|add_attr("x-model=action") }}
|
||||
</div>
|
||||
<div>{{ action_form.trigger_at.as_field_group() }}</div>
|
||||
</div>
|
||||
<div x-show="action==='counter.tasks.change_counters'" class="margin-bottom">
|
||||
{{ action_form.counters.as_field_group() }}
|
||||
</div>
|
||||
{%- if action_form.DELETE -%}
|
||||
<div class="row gap">
|
||||
{{ action_form.DELETE.as_field_group() }}
|
||||
</div>
|
||||
{%- endif -%}
|
||||
{%- for field in action_form.hidden_fields() -%}
|
||||
{{ field }}
|
||||
{%- endfor -%}
|
||||
</fieldset>
|
||||
{%- if not loop.last -%}
|
||||
<hr class="margin-bottom">
|
||||
{%- endif -%}
|
||||
{%- endfor -%}
|
||||
<p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
|
||||
</form>
|
||||
{% endblock %}
|
||||
116
counter/tests/test_auto_actions.py
Normal file
116
counter/tests/test_auto_actions.py
Normal file
@@ -0,0 +1,116 @@
|
||||
import json
|
||||
from datetime import timedelta
|
||||
|
||||
import pytest
|
||||
from django.conf import settings
|
||||
from django.test import Client
|
||||
from django.urls import reverse
|
||||
from django.utils.timezone import now
|
||||
from django_celery_beat.models import ClockedSchedule
|
||||
from model_bakery import baker
|
||||
|
||||
from core.models import Group, User
|
||||
from counter.baker_recipes import counter_recipe, product_recipe
|
||||
from counter.forms import ScheduledProductActionForm, ScheduledProductActionFormSet
|
||||
from counter.models import ScheduledProductAction
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_edit_product(client: Client):
|
||||
client.force_login(
|
||||
baker.make(
|
||||
User, groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)]
|
||||
)
|
||||
)
|
||||
product = product_recipe.make()
|
||||
url = reverse("counter:product_edit", kwargs={"product_id": product.id})
|
||||
res = client.get(url)
|
||||
assert res.status_code == 200
|
||||
|
||||
res = client.post(url, data={})
|
||||
# This is actually a failure, but we just want to check that
|
||||
# we don't have a 403 or a 500.
|
||||
# The actual behaviour will be tested directly on the form.
|
||||
assert res.status_code == 200
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestProductActionForm:
|
||||
def test_single_form_archive(self):
|
||||
product = product_recipe.make()
|
||||
trigger_at = now() + timedelta(minutes=10)
|
||||
form = ScheduledProductActionForm(
|
||||
product=product,
|
||||
data={
|
||||
"scheduled-task": "counter.tasks.archive_product",
|
||||
"scheduled-trigger_at": trigger_at,
|
||||
},
|
||||
)
|
||||
assert form.is_valid()
|
||||
instance = form.save()
|
||||
assert instance.clocked.clocked_time == trigger_at
|
||||
assert instance.enabled is True
|
||||
assert instance.one_off is True
|
||||
assert instance.task == "counter.tasks.archive_product"
|
||||
assert instance.kwargs == json.dumps({"product_id": product.id})
|
||||
|
||||
def test_single_form_change_counters(self):
|
||||
product = product_recipe.make()
|
||||
counter = counter_recipe.make()
|
||||
trigger_at = now() + timedelta(minutes=10)
|
||||
form = ScheduledProductActionForm(
|
||||
product=product,
|
||||
data={
|
||||
"scheduled-task": "counter.tasks.change_counters",
|
||||
"scheduled-trigger_at": trigger_at,
|
||||
"scheduled-counters": [counter.id],
|
||||
},
|
||||
)
|
||||
assert form.is_valid()
|
||||
instance = form.save()
|
||||
instance.refresh_from_db()
|
||||
assert instance.clocked.clocked_time == trigger_at
|
||||
assert instance.enabled is True
|
||||
assert instance.one_off is True
|
||||
assert instance.task == "counter.tasks.change_counters"
|
||||
assert instance.kwargs == json.dumps(
|
||||
{"product_id": product.id, "counters": [counter.id]}
|
||||
)
|
||||
|
||||
def test_delete(self):
|
||||
product = product_recipe.make()
|
||||
clocked = baker.make(ClockedSchedule, clocked_time=now() + timedelta(minutes=2))
|
||||
task = baker.make(
|
||||
ScheduledProductAction,
|
||||
product=product,
|
||||
one_off=True,
|
||||
clocked=clocked,
|
||||
task="counter.tasks.archive_product",
|
||||
)
|
||||
formset = ScheduledProductActionFormSet(product=product)
|
||||
formset.delete_existing(task)
|
||||
assert not ScheduledProductAction.objects.filter(id=task.id).exists()
|
||||
assert not ClockedSchedule.objects.filter(id=clocked.id).exists()
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestProductActionFormSet:
|
||||
def test_ok(self):
|
||||
product = product_recipe.make()
|
||||
counter = counter_recipe.make()
|
||||
trigger_at = now() + timedelta(minutes=10)
|
||||
formset = ScheduledProductActionFormSet(
|
||||
product=product,
|
||||
data={
|
||||
"form-TOTAL_FORMS": "2",
|
||||
"form-INITIAL_FORMS": "0",
|
||||
"form-0-task": "counter.tasks.archive_product",
|
||||
"form-0-trigger_at": trigger_at,
|
||||
"form-1-task": "counter.tasks.change_counters",
|
||||
"form-1-trigger_at": trigger_at,
|
||||
"form-1-counters": [counter.id],
|
||||
},
|
||||
)
|
||||
assert formset.is_valid()
|
||||
formset.save()
|
||||
assert ScheduledProductAction.objects.filter(product=product).count() == 2
|
||||
@@ -6,14 +6,16 @@ import pytest
|
||||
from django.conf import settings
|
||||
from django.core.cache import cache
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from django.test import Client
|
||||
from django.test import Client, TestCase
|
||||
from django.urls import reverse
|
||||
from model_bakery import baker
|
||||
from PIL import Image
|
||||
from pytest_django.asserts import assertNumQueries
|
||||
from pytest_django.asserts import assertNumQueries, assertRedirects
|
||||
|
||||
from club.models import Club
|
||||
from core.baker_recipes import board_user, subscriber_user
|
||||
from core.models import Group, User
|
||||
from counter.forms import ProductForm
|
||||
from counter.models import Product, ProductType
|
||||
|
||||
|
||||
@@ -84,3 +86,49 @@ def test_fetch_product_nb_queries(client: Client):
|
||||
# - 1 for the actual request
|
||||
# - 1 to prefetch the related buying_groups
|
||||
client.get(reverse("api:search_products_detailed"))
|
||||
|
||||
|
||||
class TestCreateProduct(TestCase):
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
cls.product_type = baker.make(ProductType)
|
||||
cls.club = baker.make(Club)
|
||||
cls.data = {
|
||||
"name": "foo",
|
||||
"description": "bar",
|
||||
"product_type": cls.product_type.id,
|
||||
"club": cls.club.id,
|
||||
"code": "FOO",
|
||||
"purchase_price": 1.0,
|
||||
"selling_price": 1.0,
|
||||
"special_selling_price": 1.0,
|
||||
"limit_age": 0,
|
||||
"form-TOTAL_FORMS": 0,
|
||||
"form-INITIAL_FORMS": 0,
|
||||
}
|
||||
|
||||
def test_form(self):
|
||||
form = ProductForm(data=self.data)
|
||||
assert form.is_valid()
|
||||
instance = form.save()
|
||||
assert instance.club == self.club
|
||||
assert instance.product_type == self.product_type
|
||||
assert instance.name == "foo"
|
||||
assert instance.selling_price == 1.0
|
||||
|
||||
def test_view(self):
|
||||
self.client.force_login(
|
||||
baker.make(
|
||||
User,
|
||||
groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
|
||||
)
|
||||
)
|
||||
url = reverse("counter:new_product")
|
||||
response = self.client.get(url)
|
||||
assert response.status_code == 200
|
||||
response = self.client.post(url, data=self.data)
|
||||
assertRedirects(response, reverse("counter:product_list"))
|
||||
product = Product.objects.last()
|
||||
assert product.name == "foo"
|
||||
assert product.club == self.club
|
||||
assert product.product_type == self.product_type
|
||||
|
||||
@@ -32,7 +32,7 @@ from core.utils import get_semester_code, get_start_of_semester
|
||||
from counter.forms import (
|
||||
CloseCustomerAccountForm,
|
||||
CounterEditForm,
|
||||
ProductEditForm,
|
||||
ProductForm,
|
||||
ReturnableProductForm,
|
||||
)
|
||||
from counter.models import (
|
||||
@@ -146,8 +146,8 @@ class ProductCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
|
||||
"""A create view for the admins."""
|
||||
|
||||
model = Product
|
||||
form_class = ProductEditForm
|
||||
template_name = "core/create.jinja"
|
||||
form_class = ProductForm
|
||||
template_name = "counter/product_form.jinja"
|
||||
current_tab = "products"
|
||||
|
||||
|
||||
@@ -155,9 +155,9 @@ class ProductEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
|
||||
"""An edit view for the admins."""
|
||||
|
||||
model = Product
|
||||
form_class = ProductEditForm
|
||||
form_class = ProductForm
|
||||
pk_url_kwarg = "product_id"
|
||||
template_name = "core/edit.jinja"
|
||||
template_name = "counter/product_form.jinja"
|
||||
current_tab = "products"
|
||||
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ from django_countries.fields import Country
|
||||
|
||||
from core.auth.mixins import CanViewMixin
|
||||
from core.views.mixins import FragmentMixin, UseFragmentsMixin
|
||||
from counter.forms import BaseBasketForm, BillingInfoForm, ProductForm
|
||||
from counter.forms import BaseBasketForm, BasketProductForm, BillingInfoForm
|
||||
from counter.models import (
|
||||
BillingInfo,
|
||||
Customer,
|
||||
@@ -78,7 +78,7 @@ class BaseEbouticBasketForm(BaseBasketForm):
|
||||
|
||||
|
||||
EbouticBasketForm = forms.formset_factory(
|
||||
ProductForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
|
||||
BasketProductForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -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"
|
||||
@@ -117,7 +117,7 @@ msgstr "S'abonner"
|
||||
msgid "Remove"
|
||||
msgstr "Retirer"
|
||||
|
||||
#: club/forms.py pedagogy/templates/pedagogy/moderation.jinja
|
||||
#: club/forms.py counter/forms.py pedagogy/templates/pedagogy/moderation.jinja
|
||||
msgid "Action"
|
||||
msgstr "Action"
|
||||
|
||||
@@ -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 : "
|
||||
@@ -568,6 +556,7 @@ msgstr ""
|
||||
#: core/templates/core/user_godfathers_tree.jinja
|
||||
#: core/templates/core/user_preferences.jinja
|
||||
#: counter/templates/counter/cash_register_summary.jinja
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
#: forum/templates/forum/reply.jinja
|
||||
#: subscription/templates/subscription/fragments/creation_form.jinja
|
||||
#: trombi/templates/trombi/comment.jinja
|
||||
@@ -789,7 +778,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"
|
||||
|
||||
@@ -1081,11 +1070,6 @@ msgstr "Emploi du temps"
|
||||
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 +1936,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"
|
||||
@@ -2973,6 +2956,18 @@ msgstr "Cet UID est invalide"
|
||||
msgid "User not found"
|
||||
msgstr "Utilisateur non trouvé"
|
||||
|
||||
#: counter/forms.py
|
||||
msgid "Date and time of action"
|
||||
msgstr "Date et heure de l'action"
|
||||
|
||||
#: counter/forms.py
|
||||
msgid "New counters"
|
||||
msgstr "Nouveaux comptoirs"
|
||||
|
||||
#: counter/forms.py
|
||||
msgid "The selected counters will replace the current ones"
|
||||
msgstr "Les comptoirs sélectionnés remplaceront les comptoirs actuels"
|
||||
|
||||
#: counter/forms.py
|
||||
msgid ""
|
||||
"Describe the product. If it's an event's click, give some insights about it, "
|
||||
@@ -3077,7 +3072,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"
|
||||
|
||||
@@ -3307,6 +3302,18 @@ msgid "The returnable product cannot be the same as the returned one"
|
||||
msgstr ""
|
||||
"Le produit consigné ne peut pas être le même que le produit de déconsigne"
|
||||
|
||||
#: counter/models.py
|
||||
msgid "Archiving"
|
||||
msgstr "Archivage"
|
||||
|
||||
#: counter/models.py
|
||||
msgid "Counters change"
|
||||
msgstr "Changement des comptoirs"
|
||||
|
||||
#: counter/models.py
|
||||
msgid "Product scheduled action"
|
||||
msgstr "Actions sur produit planifiées"
|
||||
|
||||
#: counter/templates/counter/activity.jinja
|
||||
#, python-format
|
||||
msgid "%(counter_name)s activity"
|
||||
@@ -3625,6 +3632,25 @@ msgstr ""
|
||||
"votre cotisation. Si vous ne renouvelez pas votre cotisation, il n'y aura "
|
||||
"aucune conséquence autre que le retrait de l'argent de votre compte."
|
||||
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
#, python-format
|
||||
msgid "Edit product %(name)s"
|
||||
msgstr "Édition du produit %(name)s"
|
||||
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
msgid "Product creation"
|
||||
msgstr "Création de produit"
|
||||
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
msgid "Automatic actions"
|
||||
msgstr "Actions automatiques"
|
||||
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
msgid "Automatic actions allows to schedule product changes ahead of time."
|
||||
msgstr ""
|
||||
"Les actions automatiques vous permettent de planifier des modifications du "
|
||||
"produit à l'avance."
|
||||
|
||||
#: counter/templates/counter/product_list.jinja
|
||||
msgid "Product list"
|
||||
msgstr "Liste des produits"
|
||||
@@ -4616,73 +4642,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é"
|
||||
|
||||
@@ -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"
|
||||
|
||||
97
package-lock.json
generated
97
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",
|
||||
@@ -34,7 +30,6 @@
|
||||
"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 +54,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 +2271,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 +2280,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",
|
||||
@@ -4278,14 +4197,6 @@
|
||||
"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",
|
||||
|
||||
16
package.json
16
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",
|
||||
@@ -65,7 +60,6 @@
|
||||
"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,7 +123,6 @@ INSTALLED_APPS = (
|
||||
"trombi",
|
||||
"matmat",
|
||||
"pedagogy",
|
||||
"reservation",
|
||||
"galaxy",
|
||||
"antispam",
|
||||
"timetable",
|
||||
@@ -276,7 +275,7 @@ LOGGING = {
|
||||
# Internationalization
|
||||
# https://docs.djangoproject.com/en/1.8/topics/i18n/
|
||||
|
||||
LANGUAGE_CODE = "fr"
|
||||
LANGUAGE_CODE = "fr-FR"
|
||||
|
||||
LANGUAGES = [("en", _("English")), ("fr", _("French"))]
|
||||
|
||||
|
||||
@@ -49,10 +49,6 @@ 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"),
|
||||
|
||||
@@ -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