diff --git a/aleksis/apps/paweljong/filters.py b/aleksis/apps/paweljong/filters.py index a98056c20b9861a65fe56d3e2d6331b27303ba44..15b5df5a74773f918bbfdb48436edaab847809e3 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 49a3ac677c869537dc6447eaba0a3ab750d223e6..b93ff3ce92c4fbb75b37cd44c47b788d15539a70 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 4a8dba9787fb916ceeeb3cb9281f7a6ce55c032e..f553959001486dc0e850f2a090d0a614c02cb880 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 792c87bf72fd5629ca48a703d23bf99fdd080a11..a077f759dbc303df89ce9fd60607c1f7e585ec38 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 908ad7e84275676ded9e07789b7c6abd0893e350..3b1f54228b131fe5ce8cdce5d6d6b771ff3016e9 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)