diff --git a/impuls/__pycache__/settings.cpython-311.pyc b/impuls/__pycache__/settings.cpython-311.pyc
index ae507eab..06384d09 100644
Binary files a/impuls/__pycache__/settings.cpython-311.pyc and b/impuls/__pycache__/settings.cpython-311.pyc differ
diff --git a/notes b/notes
new file mode 100644
index 00000000..20d3e58e
--- /dev/null
+++ b/notes
@@ -0,0 +1,2 @@
+interesse grün (oder so) footer
+bisherige Plakate unter homepage
diff --git a/templates/anmeldung.html b/templates/anmeldung.html
index b4f42174..6e5c551d 100644
--- a/templates/anmeldung.html
+++ b/templates/anmeldung.html
@@ -29,9 +29,16 @@
{{ register_form.rate_reduced }}
-{{ register_form.address.errors }}
-
-
{{register_form.address }}
+{{ register_form.address_street.errors }}
+
+{{register_form.address_street }}
+{{ register_form.address_plz.errors }}
+
+{{register_form.address_plz }}
+
+{{ register_form.address_town.errors }}
+
+
{{register_form.address_town }}
{{ register_form.birthdate.errors }}
diff --git a/templates/navbar.html b/templates/navbar.html
index 1eb25ef9..2c78c076 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -3,10 +3,6 @@
Home
News
Über uns
-
diff --git a/website/__pycache__/admin.cpython-311.pyc b/website/__pycache__/admin.cpython-311.pyc
index 59a49482..325c36b5 100644
Binary files a/website/__pycache__/admin.cpython-311.pyc and b/website/__pycache__/admin.cpython-311.pyc differ
diff --git a/website/__pycache__/models.cpython-311.pyc b/website/__pycache__/models.cpython-311.pyc
index fc621c9c..57f96491 100644
Binary files a/website/__pycache__/models.cpython-311.pyc and b/website/__pycache__/models.cpython-311.pyc differ
diff --git a/website/admin.py b/website/admin.py
index abe46b51..c7e84e48 100644
--- a/website/admin.py
+++ b/website/admin.py
@@ -1,4 +1,12 @@
from django.contrib import admin
-from .models import Registrant
+from .models import Registrant, Author, Category, Post, Contact
# Register your models here.
-admin.site.register(Registrant)
+class RegistrantAdmin(admin.ModelAdmin):
+ list_display = ('name',)
+ list_filter = ['payed']
+
+admin.site.register(Registrant, RegistrantAdmin)
+admin.site.register(Author)
+admin.site.register(Category)
+admin.site.register(Post)
+admin.site.register(Contact)
diff --git a/website/migrations/0005_alter_registrant_address_plz_alter_registrant_food_and_more.py b/website/migrations/0005_alter_registrant_address_plz_alter_registrant_food_and_more.py
new file mode 100644
index 00000000..407d386e
--- /dev/null
+++ b/website/migrations/0005_alter_registrant_address_plz_alter_registrant_food_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2.6 on 2023-10-28 09:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('website', '0004_rename_address_registrant_address_street_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='registrant',
+ name='address_plz',
+ field=models.CharField(max_length=12),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='food',
+ field=models.CharField(choices=[('Vegetarisch', 'Vegetarisch'), ('Vegan', 'Vegan'), ('Glutenfrei', 'Glutenfrei')], max_length=33),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='gender',
+ field=models.CharField(choices=[('Männlich', 'Männlich'), ('Weiblich', 'Weiblich'), ('Andere', 'Andere')], max_length=33),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='phone',
+ field=models.CharField(max_length=33),
+ ),
+ ]
diff --git a/website/migrations/0006_alter_registrant_message.py b/website/migrations/0006_alter_registrant_message.py
new file mode 100644
index 00000000..78ccf6cf
--- /dev/null
+++ b/website/migrations/0006_alter_registrant_message.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.6 on 2023-10-28 09:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('website', '0005_alter_registrant_address_plz_alter_registrant_food_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='registrant',
+ name='message',
+ field=models.TextField(max_length=2100),
+ ),
+ ]
diff --git a/website/migrations/0007_alter_registrant_address_plz_and_more.py b/website/migrations/0007_alter_registrant_address_plz_and_more.py
new file mode 100644
index 00000000..c545c161
--- /dev/null
+++ b/website/migrations/0007_alter_registrant_address_plz_and_more.py
@@ -0,0 +1,48 @@
+# Generated by Django 4.2.6 on 2023-10-28 10:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('website', '0006_alter_registrant_message'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='registrant',
+ name='address_plz',
+ field=models.CharField(blank=True, max_length=12),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='address_street',
+ field=models.CharField(blank=True, max_length=256),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='address_town',
+ field=models.CharField(blank=True, max_length=33),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='info',
+ field=models.CharField(blank=True, max_length=777),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='mail',
+ field=models.EmailField(blank=True, max_length=254),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='message',
+ field=models.TextField(blank=True, max_length=2100),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='music',
+ field=models.CharField(blank=True, max_length=128),
+ ),
+ ]
diff --git a/website/migrations/0008_alter_registrant_mail.py b/website/migrations/0008_alter_registrant_mail.py
new file mode 100644
index 00000000..1cce14e2
--- /dev/null
+++ b/website/migrations/0008_alter_registrant_mail.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.6 on 2023-10-28 10:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('website', '0007_alter_registrant_address_plz_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='registrant',
+ name='mail',
+ field=models.CharField(blank=True, max_length=77),
+ ),
+ ]
diff --git a/website/migrations/0009_remove_registrant_slug_alter_registrant_birthdate_and_more.py b/website/migrations/0009_remove_registrant_slug_alter_registrant_birthdate_and_more.py
new file mode 100644
index 00000000..0d7a051f
--- /dev/null
+++ b/website/migrations/0009_remove_registrant_slug_alter_registrant_birthdate_and_more.py
@@ -0,0 +1,42 @@
+# Generated by Django 4.2.6 on 2023-10-28 10:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('website', '0008_alter_registrant_mail'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='registrant',
+ name='slug',
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='birthdate',
+ field=models.DateField(blank=True),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='food',
+ field=models.CharField(blank=True, choices=[('Vegetarisch', 'Vegetarisch'), ('Vegan', 'Vegan'), ('Glutenfrei', 'Glutenfrei')], max_length=33),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='gender',
+ field=models.CharField(blank=True, choices=[('Männlich', 'Männlich'), ('Weiblich', 'Weiblich'), ('Andere', 'Andere')], max_length=33),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='name',
+ field=models.CharField(blank=True, max_length=64),
+ ),
+ migrations.AlterField(
+ model_name='registrant',
+ name='phone',
+ field=models.CharField(blank=True, max_length=33),
+ ),
+ ]
diff --git a/website/migrations/0010_alter_registrant_birthdate.py b/website/migrations/0010_alter_registrant_birthdate.py
new file mode 100644
index 00000000..f9f4e006
--- /dev/null
+++ b/website/migrations/0010_alter_registrant_birthdate.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.6 on 2023-10-28 10:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('website', '0009_remove_registrant_slug_alter_registrant_birthdate_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='registrant',
+ name='birthdate',
+ field=models.CharField(blank=True, max_length=33),
+ ),
+ ]
diff --git a/website/migrations/0011_alter_registrant_payed.py b/website/migrations/0011_alter_registrant_payed.py
new file mode 100644
index 00000000..b072fa35
--- /dev/null
+++ b/website/migrations/0011_alter_registrant_payed.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.6 on 2023-10-28 10:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('website', '0010_alter_registrant_birthdate'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='registrant',
+ name='payed',
+ field=models.BooleanField(default=False),
+ ),
+ ]
diff --git a/website/migrations/__pycache__/0004_rename_address_registrant_address_street_and_more.cpython-311.pyc b/website/migrations/__pycache__/0004_rename_address_registrant_address_street_and_more.cpython-311.pyc
new file mode 100644
index 00000000..77505d3e
Binary files /dev/null and b/website/migrations/__pycache__/0004_rename_address_registrant_address_street_and_more.cpython-311.pyc differ
diff --git a/website/migrations/__pycache__/0005_alter_registrant_address_plz_alter_registrant_food_and_more.cpython-311.pyc b/website/migrations/__pycache__/0005_alter_registrant_address_plz_alter_registrant_food_and_more.cpython-311.pyc
new file mode 100644
index 00000000..640b4936
Binary files /dev/null and b/website/migrations/__pycache__/0005_alter_registrant_address_plz_alter_registrant_food_and_more.cpython-311.pyc differ
diff --git a/website/migrations/__pycache__/0006_alter_registrant_message.cpython-311.pyc b/website/migrations/__pycache__/0006_alter_registrant_message.cpython-311.pyc
new file mode 100644
index 00000000..eda11880
Binary files /dev/null and b/website/migrations/__pycache__/0006_alter_registrant_message.cpython-311.pyc differ
diff --git a/website/migrations/__pycache__/0007_alter_registrant_address_plz_and_more.cpython-311.pyc b/website/migrations/__pycache__/0007_alter_registrant_address_plz_and_more.cpython-311.pyc
new file mode 100644
index 00000000..add64cb8
Binary files /dev/null and b/website/migrations/__pycache__/0007_alter_registrant_address_plz_and_more.cpython-311.pyc differ
diff --git a/website/migrations/__pycache__/0008_alter_registrant_mail.cpython-311.pyc b/website/migrations/__pycache__/0008_alter_registrant_mail.cpython-311.pyc
new file mode 100644
index 00000000..fdac6996
Binary files /dev/null and b/website/migrations/__pycache__/0008_alter_registrant_mail.cpython-311.pyc differ
diff --git a/website/migrations/__pycache__/0009_remove_registrant_slug_alter_registrant_birthdate_and_more.cpython-311.pyc b/website/migrations/__pycache__/0009_remove_registrant_slug_alter_registrant_birthdate_and_more.cpython-311.pyc
new file mode 100644
index 00000000..a3d48eb3
Binary files /dev/null and b/website/migrations/__pycache__/0009_remove_registrant_slug_alter_registrant_birthdate_and_more.cpython-311.pyc differ
diff --git a/website/migrations/__pycache__/0010_alter_registrant_birthdate.cpython-311.pyc b/website/migrations/__pycache__/0010_alter_registrant_birthdate.cpython-311.pyc
new file mode 100644
index 00000000..6ef835f3
Binary files /dev/null and b/website/migrations/__pycache__/0010_alter_registrant_birthdate.cpython-311.pyc differ
diff --git a/website/migrations/__pycache__/0011_alter_registrant_payed.cpython-311.pyc b/website/migrations/__pycache__/0011_alter_registrant_payed.cpython-311.pyc
new file mode 100644
index 00000000..ef1fabe2
Binary files /dev/null and b/website/migrations/__pycache__/0011_alter_registrant_payed.cpython-311.pyc differ
diff --git a/website/models.py b/website/models.py
index 01e5aae6..7291060e 100644
--- a/website/models.py
+++ b/website/models.py
@@ -49,27 +49,25 @@ class ContactForm(forms.ModelForm):
GESCHLECHTER = [("Männlich", "Männlich"), ("Weiblich","Weiblich"),("Andere","Andere")]
ERNÄHRUNG = [("Vegetarisch","Vegetarisch"),("Vegan","Vegan"),("Glutenfrei","Glutenfrei")]
class Registrant(models.Model):
- name = models.CharField(max_length=64)
- mail = models.EmailField()
- phone = models.CharField(max_length=21)
+ name = models.CharField(max_length=64,blank=True)
+ mail = models.CharField(max_length=77,blank=True)
+ phone = models.CharField(max_length=33,blank=True)
rate_reduced = models.BooleanField()
- address_street = models.CharField(max_length=256)
- address_plz = models.CharField(max_length=7)
- address_town = models.CharField(max_length=33)
- birthdate = models.DateField()
- gender = models.CharField(max_length=32, blank=False, choices=GESCHLECHTER)
- food = models.CharField(max_length=32, blank=False, choices=ERNÄHRUNG)
- music = models.CharField(max_length=128)
+ address_street = models.CharField(max_length=256,blank=True)
+ address_plz = models.CharField(max_length=12,blank=True)
+ address_town = models.CharField(max_length=33,blank=True)
+ birthdate = models.CharField(max_length=33,blank=True)
+ gender = models.CharField(max_length=33, blank=True, choices=GESCHLECHTER)
+ food = models.CharField(max_length=33, blank=True, choices=ERNÄHRUNG)
+ music = models.CharField(max_length=128,blank=True)
cake = models.BooleanField()
publish_address = models.BooleanField()
publish_phone = models.BooleanField()
- info = models.CharField(max_length=777)
- message = models.TextField(2100)
+ info = models.CharField(max_length=777,blank=True)
+ message = models.TextField(max_length=2100,blank=True)
timestamp = models.DateTimeField(auto_now_add=True)
- payed = models.BooleanField()
- slug = models.SlugField()
-
+ payed = models.BooleanField(default=False)
class RegisterForm(ModelForm):
class Meta: