diff --git a/templates/anmeldung.html b/templates/anmeldung.html index 645138c5..509bedb2 100644 --- a/templates/anmeldung.html +++ b/templates/anmeldung.html @@ -9,28 +9,28 @@
{% csrf_token %} - -{{ reservierung_form.non_field_errors }} + +{{ register_form.non_field_errors }}
-{{ reservierung_form.name.errors }} - -
{{ reservierung_form.name }}
+{{ register_form.name.errors }} + +
{{ register_form.name }}
-{{ reservierung_form.mail.errors }} - -
{{reservierung_form.mail }}
+{{ register_form.mail.errors }} + +
{{register_form.mail }}
-{{ reservierung_form.anzahl_b.errors }} - -
Reservierung nicht mehr möglich!
+{{ register_form.phone.errors }} + +
{{ register_form.phone }}
-{{ reservierung_form.anzahl_w.errors }} - -
Reservierung nicht mehr möglich!
+{{ register_form.rate_reduced.errors }} + +
{{ register_form.rate_reduced }}
-{{ reservierung_form.anzahl_l.errors }} - -
{{reservierung_form.anzahl_l }}
+{{ register_form.address.errors }} + +
{{register_form.address }}
diff --git a/website/__pycache__/models.cpython-311.pyc b/website/__pycache__/models.cpython-311.pyc index e62e0ce3..29dfdecd 100644 Binary files a/website/__pycache__/models.cpython-311.pyc and b/website/__pycache__/models.cpython-311.pyc differ diff --git a/website/__pycache__/views.cpython-311.pyc b/website/__pycache__/views.cpython-311.pyc index 932acc9d..dad71b54 100644 Binary files a/website/__pycache__/views.cpython-311.pyc and b/website/__pycache__/views.cpython-311.pyc differ diff --git a/website/migrations/0003_registrant_slug_alter_registrant_address.py b/website/migrations/0003_registrant_slug_alter_registrant_address.py new file mode 100644 index 00000000..cb2ed84d --- /dev/null +++ b/website/migrations/0003_registrant_slug_alter_registrant_address.py @@ -0,0 +1,24 @@ +# Generated by Django 4.2.6 on 2023-10-04 19:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('website', '0002_registrant'), + ] + + operations = [ + migrations.AddField( + model_name='registrant', + name='slug', + field=models.SlugField(default='TEST'), + preserve_default=False, + ), + migrations.AlterField( + model_name='registrant', + name='address', + field=models.CharField(max_length=256), + ), + ] diff --git a/website/models.py b/website/models.py index b5a41dfe..44b7a8d5 100644 --- a/website/models.py +++ b/website/models.py @@ -41,7 +41,7 @@ class Contact(models.Model): def __str__(self): return self.pseudonym -class ContactForm(ModelForm): +class ContactForm(forms.ModelForm): class Meta: model = Contact fields = ["pseudonym", "mail", "betreff", "nachricht"] @@ -53,7 +53,7 @@ class Registrant(models.Model): mail = models.EmailField() phone = models.CharField(max_length=21) rate_reduced = models.BooleanField() - address = models.TextField() + address = models.CharField(max_length=256) birthdate = models.DateField() gender = models.CharField(max_length=32, blank=False, choices=GESCHLECHTER) food = models.CharField(max_length=32, blank=False, choices=ERNÄHRUNG) @@ -67,3 +67,9 @@ class Registrant(models.Model): timestamp = models.DateTimeField(auto_now_add=True) payed = models.BooleanField() slug = models.SlugField() + + +class RegisterForm(ModelForm): + class Meta: + model = Registrant + fields = ["name","mail","phone","rate_reduced","address","birthdate","gender","food","music","cake","publish_address","publish_phone","info","message"] diff --git a/website/views.py b/website/views.py index 0b84577a..028b06be 100644 --- a/website/views.py +++ b/website/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render, redirect from django.db.models import Q -from .models import Author, Category, Post, ContactForm +from .models import Author, Category, Post, ContactForm, RegisterForm from django.core.mail import send_mail # Create your views here. @@ -74,5 +74,6 @@ def impressum(request): return render(request, 'impressum.html') def anmeldung(request): - context = {} + register_form = RegisterForm() + context = {"register_form": register_form} return render(request, 'anmeldung.html', context)