From bed7823cbeb802f72810c4b89ef3cfebf10db927 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Fri, 24 Jun 2022 16:33:52 +0200
Subject: [PATCH] Fix filter
---
aleksis/apps/paweljong/filters.py | 2 +-
aleksis/apps/paweljong/tables.py | 3 ---
.../apps/paweljong/templates/paweljong/event/detail.html | 6 ------
.../templates/paweljong/event_registration/full.html | 4 ++++
aleksis/apps/paweljong/views.py | 4 ++--
5 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/aleksis/apps/paweljong/filters.py b/aleksis/apps/paweljong/filters.py
index a98056c..15b5df5 100644
--- a/aleksis/apps/paweljong/filters.py
+++ b/aleksis/apps/paweljong/filters.py
@@ -21,7 +21,7 @@ class EventRegistrationFilter(FilterSet):
model = EventRegistration
fields = ["states", "retracted"]
- def __init__(self, event, *args, **kwargs):
+ def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.form.layout = Layout(
diff --git a/aleksis/apps/paweljong/tables.py b/aleksis/apps/paweljong/tables.py
index 49a3ac6..b93ff3c 100644
--- a/aleksis/apps/paweljong/tables.py
+++ b/aleksis/apps/paweljong/tables.py
@@ -63,10 +63,7 @@ class EventRegistrationsTable(tables.Table):
attrs = {"class": "responsive-table highlight"}
person = tables.Column()
- event = tables.Column()
- date_registered = tables.Column()
states = tables.Column()
- checked_in = tables.Column()
checked_in_date = tables.Column()
retracted = tables.Column()
view = tables.LinkColumn(
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/detail.html b/aleksis/apps/paweljong/templates/paweljong/event/detail.html
index 4a8dba9..f553959 100644
--- a/aleksis/apps/paweljong/templates/paweljong/event/detail.html
+++ b/aleksis/apps/paweljong/templates/paweljong/event/detail.html
@@ -65,12 +65,6 @@
{% endfor %}
</td>
</tr>
- <tr>
- <td>{% trans "Description" %}</td>
- <td colspan="3">
- {{ event.information|add_class_to_el:"ul, browser-default"|safe }}
- </td>
- </tr>
</table>
</div>
</div>
diff --git a/aleksis/apps/paweljong/templates/paweljong/event_registration/full.html b/aleksis/apps/paweljong/templates/paweljong/event_registration/full.html
index 792c87b..a077f75 100644
--- a/aleksis/apps/paweljong/templates/paweljong/event_registration/full.html
+++ b/aleksis/apps/paweljong/templates/paweljong/event_registration/full.html
@@ -24,6 +24,10 @@
<i class="material-icons left iconify" data-icon="mdi:edit"></i>
{% trans "Edit" %}
</a>
+ <a href="{% url 'check_in_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light">
+ <i class="material-icons left iconify" data-icon="akar-icons:check-in"></i>
+ {% trans "Check in" %}
+ </a>
{% endif %}
{% if can_retract_registration %}
<a href="{% url 'retract_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light">
diff --git a/aleksis/apps/paweljong/views.py b/aleksis/apps/paweljong/views.py
index 908ad7e..3b1f542 100644
--- a/aleksis/apps/paweljong/views.py
+++ b/aleksis/apps/paweljong/views.py
@@ -900,7 +900,7 @@ class RetractRegistration(PermissionRequiredMixin, View):
registration.retract()
messages.success(self.request, _("Registration successfully retracted."))
- return redirect("registrations")
+ return redirect("event_detail_by_name", slug=registration.event.slug)
class EventDetailView(PermissionRequiredMixin, DetailView):
@@ -988,4 +988,4 @@ class CheckInRegistration(PermissionRequiredMixin, View):
except ValidationError:
messages.error(self.request, _("Person is already checked in!"))
- return redirect("event_detail_by_name", kwargs={"slug": registration.event.pk})
+ return redirect("event_detail_by_name", slug=registration.event.slug)
--
GitLab