mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-12-06 11:57:41 +01:00
Merge branch 'main' into potvieux
This commit is contained in:
@@ -9,7 +9,7 @@ from django.contrib.contenttypes.models import ContentType
|
||||
from django.core.exceptions import PermissionDenied
|
||||
from django.db import transaction
|
||||
from django.db.models import F, Q
|
||||
from django.http import HttpResponse
|
||||
from django.http import HttpResponse, JsonResponse
|
||||
from django.urls import reverse_lazy
|
||||
from django.utils import timezone
|
||||
from django.utils.decorators import method_decorator
|
||||
@@ -67,32 +67,65 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
|
||||
tables = [
|
||||
lambda data: ActivityTable(data, prefix="all-"),
|
||||
lambda data: ActivityTable(data, prefix="upcoming-"),
|
||||
lambda data: ActivityTable(data, prefix="search-"),
|
||||
]
|
||||
extra_context = {"title": _("Activities")}
|
||||
|
||||
def get_queryset(self, **kwargs):
|
||||
return super().get_queryset(**kwargs).distinct()
|
||||
"""
|
||||
Filter the user list with the given pattern.
|
||||
"""
|
||||
return super().get_queryset().distinct()
|
||||
|
||||
def get_tables_data(self):
|
||||
# first table = all activities, second table = upcoming
|
||||
# first table = all activities, second table = upcoming, third table = search
|
||||
|
||||
# table search
|
||||
qs = self.get_queryset().order_by('-date_start')
|
||||
if "search" in self.request.GET and self.request.GET['search']:
|
||||
pattern = self.request.GET['search']
|
||||
|
||||
# check regex
|
||||
valid_regex = is_regex(pattern)
|
||||
suffix = '__iregex' if valid_regex else '__istartswith'
|
||||
prefix = '^' if valid_regex else ''
|
||||
qs = qs.filter(Q(**{f'name{suffix}': prefix + pattern})
|
||||
| Q(**{f'organizer__name{suffix}': prefix + pattern})
|
||||
| Q(**{f'organizer__note__alias__name{suffix}': prefix + pattern}))
|
||||
else:
|
||||
qs = qs.none()
|
||||
search_table = qs.filter(PermissionBackend.filter_queryset(self.request, Activity, 'view'))
|
||||
|
||||
return [
|
||||
self.get_queryset().order_by("-date_start"),
|
||||
Activity.objects.filter(date_end__gt=timezone.now())
|
||||
.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))
|
||||
.distinct()
|
||||
.order_by("date_start")
|
||||
.order_by("date_start"),
|
||||
search_table,
|
||||
]
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
|
||||
tables = context["tables"]
|
||||
for name, table in zip(["table", "upcoming"], tables):
|
||||
for name, table in zip(["all", "upcoming", "table"], tables):
|
||||
context[name] = table
|
||||
|
||||
started_activities = self.get_queryset().filter(open=True, valid=True).distinct().all()
|
||||
context["started_activities"] = started_activities
|
||||
|
||||
entries_count = {}
|
||||
show_entries = {}
|
||||
for activity in started_activities:
|
||||
if activity.activity_type.manage_entries:
|
||||
entries = Entry.objects.filter(activity=activity)
|
||||
entries_count[activity] = entries.count()
|
||||
|
||||
show_entries[activity] = True
|
||||
context["entries_count"] = entries_count
|
||||
context["show_entries"] = show_entries
|
||||
|
||||
return context
|
||||
|
||||
|
||||
@@ -103,20 +136,74 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMix
|
||||
model = Activity
|
||||
context_object_name = "activity"
|
||||
extra_context = {"title": _("Activity detail")}
|
||||
export_formats = ["csv"]
|
||||
|
||||
tables = [
|
||||
lambda data: GuestTable(data, prefix="guests-"),
|
||||
lambda data: OpenerTable(data, prefix="opener-"),
|
||||
GuestTable,
|
||||
OpenerTable,
|
||||
]
|
||||
|
||||
def get_tables(self):
|
||||
tables = super().get_tables()
|
||||
tables[0].prefix = "guests"
|
||||
tables[1].prefix = "opener"
|
||||
return tables
|
||||
|
||||
def get_tables_data(self):
|
||||
return [
|
||||
Guest.objects.filter(activity=self.object)
|
||||
.filter(PermissionBackend.filter_queryset(self.request, Guest, "view")),
|
||||
.filter(PermissionBackend.filter_queryset(self.request, Guest, "view"))
|
||||
.distinct(),
|
||||
self.object.opener.filter(activity=self.object)
|
||||
.filter(PermissionBackend.filter_queryset(self.request, Opener, "view")),
|
||||
.filter(PermissionBackend.filter_queryset(self.request, Opener, "view"))
|
||||
.distinct(),
|
||||
]
|
||||
|
||||
def render_to_response(self, context, **response_kwargs):
|
||||
"""
|
||||
Gère l'export CSV manuel pour MultiTableMixin.
|
||||
"""
|
||||
if "_export" in self.request.GET:
|
||||
import tablib
|
||||
table_name = self.request.GET.get("table")
|
||||
if table_name:
|
||||
tables = self.get_tables()
|
||||
data_list = self.get_tables_data()
|
||||
|
||||
for t, d in zip(tables, data_list):
|
||||
if t.prefix == table_name:
|
||||
# Préparer le CSV
|
||||
dataset = tablib.Dataset()
|
||||
columns = list(t.base_columns) # noms des colonnes
|
||||
dataset.headers = columns
|
||||
|
||||
for row in d:
|
||||
values = []
|
||||
for col in columns:
|
||||
try:
|
||||
val = getattr(row, col, "")
|
||||
# Gestion spéciale pour la colonne 'entry'
|
||||
if col == "entry":
|
||||
if getattr(row, "has_entry", False):
|
||||
val = timezone.localtime(row.entry.time).strftime("%Y-%m-%d %H:%M:%S")
|
||||
else:
|
||||
val = ""
|
||||
values.append(str(val) if val is not None else "")
|
||||
except Exception: # RelatedObjectDoesNotExist ou autre
|
||||
values.append("")
|
||||
dataset.append(values)
|
||||
|
||||
csv_bytes = dataset.export("csv")
|
||||
if isinstance(csv_bytes, str):
|
||||
csv_bytes = csv_bytes.encode("utf-8")
|
||||
|
||||
response = HttpResponse(csv_bytes, content_type="text/csv")
|
||||
response["Content-Disposition"] = f'attachment; filename="{table_name}.csv"'
|
||||
return response
|
||||
|
||||
# Sinon rendu normal
|
||||
return super().render_to_response(context, **response_kwargs)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data()
|
||||
|
||||
@@ -137,6 +224,14 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMix
|
||||
"placeholder": ""
|
||||
}
|
||||
}
|
||||
if self.object.activity_type.manage_entries:
|
||||
entries = Entry.objects.filter(activity=self.object)
|
||||
context["entries_count"] = {self.object: entries.count()}
|
||||
|
||||
context["show_entries"] = {self.object: timezone.now() > timezone.localtime(self.object.date_start)}
|
||||
else:
|
||||
context["entries_count"] = {self.object: 0}
|
||||
context["show_entries"] = {self.object: False}
|
||||
|
||||
return context
|
||||
|
||||
@@ -153,6 +248,34 @@ class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
|
||||
return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
|
||||
|
||||
|
||||
class ActivityDeleteView(View):
|
||||
"""
|
||||
Deletes an Activity
|
||||
"""
|
||||
def delete(self, request, pk):
|
||||
try:
|
||||
activity = Activity.objects.get(pk=pk)
|
||||
activity.delete()
|
||||
return JsonResponse({"message": "Activity deleted"})
|
||||
except Activity.DoesNotExist:
|
||||
return JsonResponse({"error": "Activity not found"}, status=404)
|
||||
|
||||
def dispatch(self, *args, **kwargs):
|
||||
"""
|
||||
Don't display the delete button if the user has no right to delete.
|
||||
"""
|
||||
if not self.request.user.is_authenticated:
|
||||
return self.handle_no_permission()
|
||||
|
||||
activity = Activity.objects.get(pk=self.kwargs["pk"])
|
||||
if not PermissionBackend.check_perm(self.request, "activity.delete_activity", activity):
|
||||
raise PermissionDenied(_("You are not allowed to delete this activity."))
|
||||
|
||||
if activity.valid:
|
||||
raise PermissionDenied(_("This activity is valid."))
|
||||
return super().dispatch(*args, **kwargs)
|
||||
|
||||
|
||||
class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
|
||||
"""
|
||||
Invite a Guest, The rules to invites someone are defined in `forms:activity.GuestForm`
|
||||
@@ -188,7 +311,7 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
|
||||
@transaction.atomic
|
||||
def form_valid(self, form):
|
||||
form.instance.activity = Activity.objects\
|
||||
.filter(PermissionBackend.filter_queryset(self.request, Activity, "view")).get(pk=self.kwargs["pk"])
|
||||
.filter(PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().get(pk=self.kwargs["pk"])
|
||||
return super().form_valid(form)
|
||||
|
||||
def get_success_url(self, **kwargs):
|
||||
|
||||
Reference in New Issue
Block a user