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

Beautify registration flow

parent b7144bdb
No related branches found
No related tags found
1 merge request!1Reformat and cleanup
Pipeline #55969 failed
Stage: prepare
Stage: test
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 124 additions and 85 deletions
aleksis/apps/paweljong/forms.py
+ 6
− 37
View file @ 2cc65e51
......@@ -255,8 +255,8 @@ class RegisterEventContactDetails(ExtensibleForm):
layout = Layout(
Fieldset(
_("Personal data"),
Row("first_name", "additional_name", "last_name"),
Row("date_of_birth", "place_of_birth", "sex"),
Row("first_name", "last_name"),
Row("date_of_birth", "sex"),
),
Fieldset(
_("Address data"),
......@@ -265,7 +265,7 @@ class RegisterEventContactDetails(ExtensibleForm):
),
Fieldset(
_("Contact details"),
Row("mobile_number", "phone_number", "email"),
Row("mobile_number", "email"),
),
Fieldset(
_("School details"),
......@@ -278,13 +278,6 @@ class RegisterEventContactDetails(ExtensibleForm):
disabled=True,
)
additional_name = forms.CharField(
label=_("Additional names"),
help_text=_("Please enter any additional names."),
required=False,
disabled=True,
)
last_name = forms.CharField(
label=_("Last name"),
disabled=True,
......@@ -316,20 +309,10 @@ class RegisterEventContactDetails(ExtensibleForm):
),
)
phone_number = PhoneNumberField(
label=_("Phone number"),
required=False,
)
date_of_birth = forms.DateField(
label=_("Date of birth"),
)
place_of_birth = forms.CharField(
label=_("Place of birth"),
required=False,
)
sex = forms.ChoiceField(
label=_("Sex"),
help_text=_(
......@@ -344,11 +327,6 @@ class RegisterEventContactDetails(ExtensibleForm):
email = forms.EmailField(
label=_("Email address"),
help_text=_(
"If you don't have an email address, leave this field empty. You can "
"register an email address in the next step."
),
required=False,
)
school = forms.CharField(
......@@ -553,13 +531,13 @@ class RegisterEventAccount(SignupForm, ExtensibleForm):
"""Form to register new user accounts."""
class Meta:
model = Person
model = EventRegistration
fields = []
layout = Layout(
Fieldset(
_("Base data"),
Row("first_name", "last_name"),
Row("first_name", "last_name", "date_of_birth"),
),
Fieldset(
_("Account data"),
......@@ -571,13 +549,4 @@ class RegisterEventAccount(SignupForm, ExtensibleForm):
first_name = forms.CharField(label=_("First name"))
last_name = forms.CharField(label=_("Last name"))
password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
password2 = forms.CharField(label=_("Password (again)"), widget=forms.PasswordInput)
def save(self, request):
adapter = get_adapter(request)
user = adapter.new_user(request)
adapter.save_user(request, user, self)
self.custom_signup(request, user)
setup_user_email(request, user, [])
return user
date_of_birth = forms.DateField(label=_("Date of birth"))
aleksis/apps/paweljong/templates/paweljong/event/full.html
+ 2
− 35
View file @ 2cc65e51
......@@ -53,41 +53,8 @@
</div>
</div>
</div>
<div class="card-tabs">
<ul class="tabs tabs-fixed-width">
{% if can_register %}
<li class="tab">
<a href="#with_email">
Register now (i have an email)
</a>
</li>
<li class="tab">
<a href="#without_email">
Register now (i don't have an email)
</a>
</li>
{% else %}
<li class="tab">
<a href="#not_possible">{% trans "Not available" %}</a>
</li>
{% endif %}
</div>
<div class="card-content grey lighten-4">
{% if can_register %}
<div id="with_email">
<p>Lorem Ipsum dolor sit amet (mit Mail)</p>
</div>
<div id="without_email">
<p>Lorem Ipsum dolor sit amet (ohne Mail)</p>
</div>
{% else %}
<div id="not_possible">
<p>
{% blocktrans %}
Registration is no longer possible.
{% endblocktrans %}
</div>
{% endif %}
<div class="card-action">
<a href="{% url "register_event_by_name" event.linked_group.name %}">{% trans "Register now" %}</a>
</div>
</div>
......
aleksis/apps/paweljong/templates/paweljong/event/register_start.html 0 → 100644
+ 73
− 0
View file @ 2cc65e51
{% extends "core/base.html" %}
{% load i18n static %}
{% block browser_title %}{% blocktrans %}Register for{% endblocktrans %} {{ event.display_name }}{% endblock %}
{% block extra_head %}
<link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
{% endblock %}
{% block content %}
<div class="card">
<div class="card-content">
<div class="row">
<div class="col s12">
<span class="card-title">
{{ event.display_name }}
</span>
<p>
Hier könnte Ihr Erklärungstext stehen…
</p>
</div>
</div>
</div>
<div class="card-tabs">
<ul class="tabs tabs-fixed-width">
{% if can_register %}
<li class="tab">
<a href="#already_registered">
{% trans "I already have an account" %}
</a>
</li>
<li class="tab">
<a href="#without_email">
{% trans "I have an email address" %}
</a>
</li>
<li class="tab">
<a href="#with_email">
{% trans "I don't have an email address" %}
</a>
</li>
{% else %}
<li class="tab">
<a href="#not_possible">{% trans "Not available" %}</a>
</li>
{% endif %}
</div>
<div class="card-content grey lighten-4">
{% if can_register %}
<div id="already_registered">
<p>Ick hab schon nen Account, hier einloggen, blafoo und so</p>
<a href="{% url "login" %}?next=/app/paweljong/event/{{ event.id }}/register">{% trans "Login" %}</a>
</div>
<div id="without_email">
<p>Lorem Ipsum dolor sit amet (Braucht keine Mail)</p>
<a href="{% url "register_event_by_id" event.id %}">{% trans "Register now" %}</a>
</div>
<div id="with_email">
<p>Lorem Ipsum dolor sit amet (Braucht Mail)</p>
<a href="{% url "set_email_needed" event.id %}">{% trans "Register now" %}</a>
</div>
{% else %}
<div id="not_possible">
<p>
{% blocktrans %}
Registration is no longer possible.
{% endblocktrans %}
</div>
{% endif %}
</div>
</div>
{% endblock %}
aleksis/apps/paweljong/templates/paweljong/event_registration/full.html
+ 23
− 4
View file @ 2cc65e51
......@@ -10,8 +10,8 @@
{% block content %}
<h4>{{ registration }} </h4>
{% has_perm 'ticdesk.manage_registration' user registration as can_manage_registration %}
{% has_perm 'ticdesk.delete_registration' user registration as can_delete_registration %}
{% has_perm 'paweljong.manage_registration' user registration as can_manage_registration %}
{% has_perm 'paweljong.delete_registration' user registration as can_delete_registration %}
{% if can_manage_registration or can_manage_registration_preferences or can_delete_registration %}
<p>
......@@ -113,7 +113,7 @@
<td>
<i class="material-icons small">redeem</i>
</td>
<td colspan="3">{{ registration.donation }}</td>
<td colspan="3">{{ registration.donation }}€</td>
</tr>
<tr>
<td>
......@@ -136,8 +136,27 @@
</tr>
{% endfor %}
{% endif %}
<tr>
<tr>
<td>
<i class="material-icons small">medical_services</i>
</td>
<td>
{{ medical_information }}
</td>
</tr>
</tr>
<tr>
<tr>
<td>
<i class="material-icons small">question_answer</i>
</td>
<td>
{{ comment }}
</td>
</tr>
</tr>
</table>
</p>
</div>
</div>
......
aleksis/apps/paweljong/urls.py
+ 1
− 0
View file @ 2cc65e51
......@@ -35,6 +35,7 @@ urlpatterns = [
name="register_event_by_id",
),
path("event/<slug:slug>", views.EventFullView.as_view(), name="event_by_name"),
path("event/<slug:slug>/register", views.RegisterEventStart.as_view(), name="register_event_by_name"),
path("misc/set_email_needed/<int:pk>", views.set_email_needed, name="set_email_needed"),
path("events/create", views.CreateEventView.as_view(), name="create_event"),
path("events/manage", views.manage_events, name="manage_events"),
......
aleksis/apps/paweljong/views.py
+ 19
− 9
View file @ 2cc65e51
......@@ -87,7 +87,7 @@ def feedback_event(request, pk):
act = Activity(
title=_("You submitted feedback"),
description=_("You submitted feedback for %s" % event.display_name),
app="TIC-Desk",
app="Paweljong",
user=request.user.person,
)
act.save()
......@@ -463,7 +463,6 @@ class RegisterEventWizardView(SessionWizardView):
initial.update(
{
"first_name": person.first_name,
"additional_name": person.additional_name,
"last_name": person.last_name,
"school": person.school,
"school_place": person.school_place,
......@@ -486,6 +485,8 @@ class RegisterEventWizardView(SessionWizardView):
{
"first_name": cleaned_data_register["first_name"],
"last_name": cleaned_data_register["last_name"],
"email": cleaned_data_register["email"],
"date_of_birth": cleaned_data_register["date_of_birth"],
}
)
......@@ -525,10 +526,7 @@ class RegisterEventWizardView(SessionWizardView):
defaults={
"email": cleaned_data_contact_details["email"],
"first_name": cleaned_data_contact_details["first_name"],
"additional_name": cleaned_data_contact_details["additional_name"],
"last_name": cleaned_data_contact_details["last_name"],
"phone_number": cleaned_data_contact_details["phone_number"],
"place_of_birth": cleaned_data_contact_details["place_of_birth"],
}
)
......@@ -560,8 +558,7 @@ class RegisterEventWizardView(SessionWizardView):
person.street = cleaned_data_contact_details["street"]
person.postal_code = cleaned_data_contact_details["postal_code"]
person.place = cleaned_data_contact_details["place"]
person.housenumber = cleaned_data_contact_details["housenumber"],
person.housenumber = cleaned_data_contact_details["housenumber"]
person.save()
if (
......@@ -648,7 +645,7 @@ class RegisterEventWizardView(SessionWizardView):
act = Activity(
title=_("You registred for an event"),
description=_("You registred for the event %s" % event.display_name),
app="TIC-Desk",
app="Paweljong",
user=person,
)
act.save()
......@@ -664,7 +661,20 @@ class EventFullView(DetailView):
object_context_name = "event"
def get_context_data(self, **kwargs):
context = super(EventFullView, self).get_context_data(**kwargs)
context = super().get_context_data(**kwargs)
context["can_register"] = context["event"].can_register(request=self.request)
return context
class RegisterEventStart(DetailView):
model = Event
slug_field = "linked_group__name"
template_name = "paweljong/event/register_start.html"
object_context_name = "event"
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["can_register"] = context["event"].can_register(request=self.request)
return context
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment