Skip to content
Snippets Groups Projects
Commit bed7823c authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Fix filter

parent b8419ecf
No related branches found
No related tags found
1 merge request!29Resolve "User Story: Arrival at front desk / Check in"
Pipeline #75985 failed
...@@ -21,7 +21,7 @@ class EventRegistrationFilter(FilterSet): ...@@ -21,7 +21,7 @@ class EventRegistrationFilter(FilterSet):
model = EventRegistration model = EventRegistration
fields = ["states", "retracted"] fields = ["states", "retracted"]
def __init__(self, event, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.form.layout = Layout( self.form.layout = Layout(
......
...@@ -63,10 +63,7 @@ class EventRegistrationsTable(tables.Table): ...@@ -63,10 +63,7 @@ class EventRegistrationsTable(tables.Table):
attrs = {"class": "responsive-table highlight"} attrs = {"class": "responsive-table highlight"}
person = tables.Column() person = tables.Column()
event = tables.Column()
date_registered = tables.Column()
states = tables.Column() states = tables.Column()
checked_in = tables.Column()
checked_in_date = tables.Column() checked_in_date = tables.Column()
retracted = tables.Column() retracted = tables.Column()
view = tables.LinkColumn( view = tables.LinkColumn(
......
...@@ -65,12 +65,6 @@ ...@@ -65,12 +65,6 @@
{% endfor %} {% endfor %}
</td> </td>
</tr> </tr>
<tr>
<td>{% trans "Description" %}</td>
<td colspan="3">
{{ event.information|add_class_to_el:"ul, browser-default"|safe }}
</td>
</tr>
</table> </table>
</div> </div>
</div> </div>
......
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
<i class="material-icons left iconify" data-icon="mdi:edit"></i> <i class="material-icons left iconify" data-icon="mdi:edit"></i>
{% trans "Edit" %} {% trans "Edit" %}
</a> </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 %} {% endif %}
{% if can_retract_registration %} {% if can_retract_registration %}
<a href="{% url 'retract_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light"> <a href="{% url 'retract_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light">
......
...@@ -900,7 +900,7 @@ class RetractRegistration(PermissionRequiredMixin, View): ...@@ -900,7 +900,7 @@ class RetractRegistration(PermissionRequiredMixin, View):
registration.retract() registration.retract()
messages.success(self.request, _("Registration successfully retracted.")) messages.success(self.request, _("Registration successfully retracted."))
return redirect("registrations") return redirect("event_detail_by_name", slug=registration.event.slug)
class EventDetailView(PermissionRequiredMixin, DetailView): class EventDetailView(PermissionRequiredMixin, DetailView):
...@@ -988,4 +988,4 @@ class CheckInRegistration(PermissionRequiredMixin, View): ...@@ -988,4 +988,4 @@ class CheckInRegistration(PermissionRequiredMixin, View):
except ValidationError: except ValidationError:
messages.error(self.request, _("Person is already checked in!")) 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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment